Skip to content

Commit

Permalink
git-gui: Fix gitk for branch whose name matches local file
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Krefting authored and Shawn O. Pearce committed Jan 23, 2010
1 parent 3c6a287 commit e27d106
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-gui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit e27d106

Please sign in to comment.