Pass -- to diff-tree for branch/filename disambiguation

[topgit.git] / tg.sh

diff --git a/tg.sh b/tg.sh
index 3af2cd8bbbfa78b0f7826192cffab929b4b54586..43d1c9f69c6ab3dc7639598568ca7ccec9411ae0 100644 (file)
--- a/tg.sh
+++ b/tg.sh
@@ -226,7 +226,7 @@ needs_update()
 # branch_empty NAME
 branch_empty()
 {
 # branch_empty NAME
 branch_empty()
 {

-       [ -z "$(git diff-tree "refs/top-bases/$1" "$1" | fgrep -v "     .top")" ]
+       [ -z "$(git diff-tree "refs/top-bases/$1" "$1" -- | fgrep -v "  .top")" ]

 }
 
 # switch_to_base NAME [SEED]
 }
 
 # switch_to_base NAME [SEED]