[v6,0/3]

Message

Nickolai Belakovski Jan. 22, 2019, 11:22 p.m. UTC

From: Nickolai Belakovski <[e-mail]>

From the latest round of comments:
-Added a check in populate_value to only do the hashmap lookup for refs of type branch,
since other types would not be checked out in a worktree
-Reworded the commit message on 2/3 to make it clearer that the change in output is meant
to inform users that the colored/marked branches will behave differently from the others
upon attempts to delete or check out
-Removed the extra verbose check on 3/3 and added the worktree path to the output if it exists
-Set 'worktrees' variable to NULL after free-ing, to allow for ref-filter to be reentrant

Travis-CI results: https://travis-ci.org/nbelakovski/git/builds/483134182

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       | 22 +++++++-----
 Documentation/git-for-each-ref.txt |  5 +++
 builtin/branch.c                   | 16 ++++++---
 ref-filter.c                       | 74 ++++++++++++++++++++++++++++++++++++++
 t/t3200-branch.sh                  |  8 ++---
 t/t3203-branch-output.sh           | 21 +++++++++++
 t/t6302-for-each-ref-filter.sh     | 15 ++++++++
 7 files changed, 144 insertions(+), 17 deletions(-)