From: Nickolai Belakovski <nbelakovski@xxxxxxxxx> Replying to my original email to try to clean up the email chain > Thanks for keeping with this. I think we're getting quite close Thanks to you as well for continuing to review the change set and provide feedback! It does feel rather close, I'm getting exciting about following it through, even if we just end up merging the worktreepath commit and not the ones to modify the branch output, since I can always just make a local alias that uses the worktreepath atom. The last set of changes all made sense, very non-controversial, so I've simply implemented them. Beyond that, I moved where the structures for the ref<->worktree map are defined now that they're no longer associated with used_atom. They still feel a little awkwardly placed to me; I couldn't quite find a way I liked of arranging them together while also sticking to the style in the rest of the code but I think it's a little better that all of the relevant structs and the cmpfnc are all in the same place. Travis-CI results: https://travis-ci.org/nbelakovski/git/builds/475825245 Nickolai Belakovski (3): ref-filter: add worktreepath atom branch: Mark and color a branch differently if it is checked out in a linked worktree branch: Add an extra verbose output displaying worktree path for refs checked out in a linked worktree Documentation/git-branch.txt | 20 ++++++----- Documentation/git-for-each-ref.txt | 5 +++ builtin/branch.c | 16 ++++++--- ref-filter.c | 71 ++++++++++++++++++++++++++++++++++++++ t/t3200-branch.sh | 8 ++--- t/t3203-branch-output.sh | 21 +++++++++++ t/t6302-for-each-ref-filter.sh | 15 ++++++++ 7 files changed, 140 insertions(+), 16 deletions(-) -- 2.14.2
