Merge branch 'maint'

diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 94067cc5f73388f33722d52ae02f44692bc07490..677c5393fdf3447ab2221e2096d75f5286ec0e45 100755 (executable)
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -4137,7 +4137,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 { }