Fix bug in git-active-branches where it would error if branch name cl…

…ashes with file/directory/tag name Fixes #64
nvie · May 23, 2024 · 0ad4a9a · 0ad4a9a
1 parent bc7e81f
commit 0ad4a9a
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/git-active-branches b/git-active-branches
@@ -26,10 +26,22 @@ while [ $# -gt 0 ]; do
     shift
 done
 
-( git local-branches; git remote-branches ) | while read branch; do
+git local-branches | while read branch; do
     # '--no-patch' = suppress diff output (long form of '-s')
     maybebranch=$(
-        git log -1 --since="$since" --no-patch "$branch"
+        git log -1 --since="$since" --no-patch "refs/heads/$branch" --
     )
-    [ -n "$maybebranch" ] && echo "$branch"
+    if [ -n "$maybebranch" ]; then
+        echo "$branch"
+    fi
+done
+
+git remote-branches | while read branch; do
+    # '--no-patch' = suppress diff output (long form of '-s')
+    maybebranch=$(
+        git log -1 --since="$since" --no-patch "$branch" --
+    )
+    if [ -n "$maybebranch" ]; then
+        echo "$branch"
+    fi
 done