git-gui: Always disable the Tcl EOF character when reading

diff --git a/lib/shortcut.tcl b/lib/shortcut.tcl
index 64ced9d801d879a7c8bde1340834b7296dff82a2..c36be2f3cd29b4b0426c312536dca6f697593305 100644 (file)
--- a/lib/shortcut.tcl
+++ b/lib/shortcut.tcl
@@ -54,7 +54,7 @@ proc do_cygwin_shortcut {} {
                                set sh [exec cygpath \
                                        --windows \
                                        --absolute \
-                                       /bin/sh]
+                                       /bin/sh.exe]
                                set me [exec cygpath \
                                        --unix \
                                        --absolute \
@@ -66,9 +66,9 @@ proc do_cygwin_shortcut {} {
                                puts $fd "@ECHO Entering [reponame]"
                                puts $fd "@ECHO Starting git-gui... please wait..."
                                puts -nonewline $fd "@\"$sh\" --login -c \""
-                               puts -nonewline $fd "GIT_DIR=[sq [$gd]]"
+                               puts -nonewline $fd "GIT_DIR=[sq $gd]"
                                puts -nonewline $fd " [sq $me]"
-                               puts $fd "&\""
+                               puts $fd " &\""
                                close $fd
                        } err]} {
                        error_popup "Cannot write script:\n\n$err"