Merge branch 'maint'

* maint:
git-gui: Allow spaces in path to 'wish'

diff --git a/git-gui.sh b/git-gui.sh
index 3f41bd72433d41dca0f568ca263d470efe615144..0ad2815d1086d3843fbb093cc3d984aee4f63e3f 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -4143,7 +4143,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 { }