Merge branch 'maint' of git://repo.or.cz/git-gui into maint

Junio C Hamano · Junio C Hamano · commit 53a58245863e · 2007-05-07T14:46:15.000-07:00
* 'maint' of git://repo.or.cz/git-gui:
  git-gui: Allow spaces in path to 'wish'
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
@@ -4134,7 +4134,7 @@ proc do_gitk {revs} {
 	# -- Always start gitk through whatever we were loaded with.  This
 	#    lets us bypass using shell process on Windows systems.
 	#
-	set cmd [info nameofexecutable]
+	set cmd [list [info nameofexecutable]]
 	lappend cmd [gitexec gitk]
 	if {$revs ne {}} {
 		append cmd { }

Original file line number	Diff line number	Diff line change
`@@ -4134,7 +4134,7 @@ proc do_gitk {revs} {`
`4134`	`4134`	`# -- Always start gitk through whatever we were loaded with. This`
`4135`	`4135`	`# lets us bypass using shell process on Windows systems.`
`4136`	`4136`	`#`
`4137`		`- set cmd [info nameofexecutable]`
	`4137`	`+ set cmd [list [info nameofexecutable]]`
`4138`	`4138`	`lappend cmd [gitexec gitk]`
`4139`	`4139`	`if {$revs ne {}} {`
`4140`	`4140`	`append cmd { }`