From: Peter Krefting <peter@softwolves.pp.se>
Date: Thu, 21 Jan 2010 12:15:17 +0000 (+0100)
Subject: git-gui: Fix gitk for branch whose name matches local file
X-Git-Tag: v1.7.0-rc0~3^2^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e27d106ec4b2f68c210703e4bfa3a0a0cf2550a4;p=git.git

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 <peter@softwolves.pp.se>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui.sh b/git-gui.sh
index 822d59867..211494587 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)