From a20892979b7eebb2218a2744747d68964e1cd48f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Sat, 7 Mar 2009 21:01:30 +0100 Subject: [PATCH] Pass -- to diff-tree for branch/filename disambiguation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Script to show the need of this patch: mkdir ty; cd ty; git init-db; touch a; git add a; git commit -m "..."; tg create bla; git commit -m "..."; mkdir bla; touch bla/blub; git add bla/blub; git commit -m "..."; tg export --quilt tt; Reported-by: "Bernhard R. Link" Signed-off-by: Uwe Kleine-König --- tg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tg.sh b/tg.sh index 3af2cd8..43d1c9f 100644 --- a/tg.sh +++ b/tg.sh @@ -226,7 +226,7 @@ needs_update() # 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] -- 2.11.4.GIT