summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Peter Krefting <peter@softwolves.pp.se>2010-01-21 13:15:17 +0100
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2010-01-23 14:46:12 -0800
commite27d106ec4b2f68c210703e4bfa3a0a0cf2550a4 (patch)
tree02cf3b8a955c0852f14c1cb0a87cc8afdc98cd17
parentgit-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync (diff)
downloadtgif-e27d106ec4b2f68c210703e4bfa3a0a0cf2550a4.tar.xz
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>
-rwxr-xr-xgit-gui.sh2
1 files changed, 1 insertions, 1 deletions
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)