From: Nickolai Belakovski <nbelakov...@gmail.com>

Moved initialization of ref_to_worktree_map outside of atom parser. Other minor 
fixes.

Put the hashmap and the worktree struct in the same struct, to make it more 
obvious that
they are to be initialized and free'd together.

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

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

-- 
2.14.2

Reply via email to