From e27d106ec4b2f68c210703e4bfa3a0a0cf2550a4 Mon Sep 17 00:00:00 2001 From: Peter Krefting Date: Thu, 21 Jan 2010 13:15:17 +0100 Subject: [PATCH] git-gui: Fix gitk for branch whose name matches local file When trying to run gitk on a branch name whose name matches a local file, it will toss an error saying that the name is ambiguous. Adding a pair of dashes will make gitk parse the options to the left of it as branch names. Since wish eats the first pair of dashes we throw at it, we need to add a second one to ensure they get through. Signed-off-by: Peter Krefting Signed-off-by: Shawn O. Pearce --- git-gui.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-gui.sh b/git-gui.sh index 822d59867b..211494587e 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1941,7 +1941,7 @@ proc do_gitk {revs} { cd [file dirname [gitdir]] set env(GIT_DIR) [file tail [gitdir]] - eval exec $cmd $revs & + eval exec $cmd $revs "--" "--" & if {$old_GIT_DIR eq {}} { unset env(GIT_DIR) -- 2.11.4.GIT