From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 21 Jan 2007 00:03:26 +0000 (-0500)
Subject: git-gui: Work around odd cygpath bug on Windows.
X-Git-Tag: gitgui-0.6.0~139
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bdadecbae5b9f7317994bf2f521bb15068823a1d;p=git.git

git-gui: Work around odd cygpath bug on Windows.

There appears to be a bug on one of my test systems where cygpath with
the --long-name option is generating a corrupt string that does not
actually refer to sh.exe.  This breaks any desktop icon created by
git-gui as the executable we are trying to invoke does not exist.
Since Cygwin is typically installed as C:\cygwin long path names is
probably not actually necessary to link to the shell.

I also added a small echo to the start of the icon script, as it can
take one of my test systems several seconds to startup git-gui.  This
way the user knows we're starting git-gui, and was politely asked to
wait for the action to complete.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui b/git-gui
index ade64dcd1..c5120cc1a 100755
--- a/git-gui
+++ b/git-gui
@@ -2742,7 +2742,6 @@ proc do_windows_shortcut {} {
 				set sh [exec cygpath \
 					--windows \
 					--absolute \
-					--long-name \
 					/bin/sh]
 				set me [exec cygpath \
 					--unix \
@@ -2754,6 +2753,7 @@ proc do_windows_shortcut {} {
 					$gitdir]
 				regsub -all ' $me "'\\''" me
 				regsub -all ' $gd "'\\''" gd
+				puts $fd "@ECHO Starting git-gui... Please wait..."
 				puts -nonewline $fd "\"$sh\" --login -c \""
 				puts -nonewline $fd "GIT_DIR='$gd'"
 				puts -nonewline $fd " '$me'"