[Enhancement] Provide better indication and context-commands for worktree-linked local branch

[goran-w]

This behavior confused me a lot and I had to look in the SourceGit code to understand it:

• I was no longer able to use the 'Fast forward to origin/master' context-command on my local master (tracking) branch.
• The reason was that I had added (and forgotten) a separate worktree for that branch, while I was working on the develop branch in the original repo-clone (while also having master checked-out there since earlier on).
• When there's a worktree for a local branch, the mentioned Fast forward context-command is simply hidden from the context-menu.
• I found this very confusing, and I don't see why I shouldn't be able to fast-forward a local branch EVEN THOUGH there's also a separate worktree for it?
• Also, there was no visible indication to explain why the context-command was hidden from the menu on that specific branch.

Suggestions:

• Allow the 'Fast forward to origin/master' context-command on local branches regardless of worktree associations, since it should be a harmless command to use in any case.
• Also, add an extra context-command rename Checkout to 'Switch to linked worktree' on local branches that are checked out in linked worktrees.
• Finally, add some visual indication, or at the very least an indication in the tooltip on such a branch, that it is "special" by being checked out in a linked worktree.

BONUS-feature: Add more explicit ahead/behind-indicators in the tooltip for local branches, to help us remember which of the up/down arrows means which direction. 😉

[love-linger]

You can not run git merge <upstream> --ff-only on a local branch (not the current branch) with a separate worktree.

The target branch of git merge command is always the current branch. The master branch in your case, is current active branch only when the git command runs in the separate worktree.

[love-linger]

You can not move branch force using git branch -f <local_worktree_branch> <upstream> in main repo, because it is used by worktree

[love-linger]

Also, add an extra context-command 'Switch to associated worktree' on local branches that have a worktree associated.

• You can open the worktree by double-clicking the local branch which is used by that worktree
• You can open the worktree by double-clicking it in WORKTREES list

[goran-w]

I see - then I'll revise my suggestions as follows:

• Rename the context-command 'Checkout <branch>' to 'Switch to associated worktree' (or similar) for, local branches that are used by another worktree.
• Add some visual indication (ideally a different icon, similarly to the current/HEAD icon already used there), or at the very least an indication in the tooltip on such a branch, that it is "special" by being used in another worktree.

Without these changes, I find it confusing that I'm suddenly jumping to a new/other tab (when what I was trying to do was an ordinary Checkout). If the Checkout command is aptly renamed, this will become much clearer, and a visual indication for any local worktree-branches would be super-helpful to the user!

[goran-w]

BTW, adding a visual indication for local workspace-branches would actually be more consistent with the git-branch command itself, which (for the default --list option) adds a + char and blueish/cyan color for these (similar to the * char and greenish color for the current/HEAD branch) :

From the docs: "If --list is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign."

When adding the --vv flag, it also lists the associated workspace paths, and these could conveniently be displayed in the local-branch tooltip:

[goran-w]

Additionally, to again address my initial confusion around Fast-forward :

• What initially happened, was that I had just done a Fetch and the master branch was then indicated with a "behind" arrow-badge, so doing a fast-forward seemed like a trivial thing to do on that branch.
• However, the master branch was (unbeknownst to me) linked to another worktree, while I was sitting on the develop branch in the current worktree, which made the fast-forward command unavailable.
• To fix this, once I understood the reasons, I could of course jump/switch to the linked worktree repo-tab, do a Fast-forward there, and then jump/switch back.
• However, it would have made sense here to have a shortcut for this operation, so I wouldn't have to switch back-and-forth between these tabs to perform such a simple task. (I.e. The Fast-forward command could be changed and renamed to 'Fast-forward in linked worktree' or similar, for worktree-linked branches.)

[goran-w]

@love-linger Thanks, this is better, but we should also have a new cyan-colored icon for these workspace-linked branches, to match the + indicator and the colored text in the output of git branch. 😉

[goran-w]

Nice, thank you! (Ideally, I'd like the icon image to be different as well, to indicate a worktree-link - but this will do!)