X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-gui%2Flib%2Fshortcut.tcl;h=79c1888e11d210eed962eebdf67793a7367dff5a;hb=6d816301cd53e54af3398b634d47588a6f184be4;hp=38c3151b05c732d919943e44629bfc0a8c9fb617;hpb=521ae135b7dcae27fb78e1b941f50158558108e6;p=git.git

diff --git a/git-gui/lib/shortcut.tcl b/git-gui/lib/shortcut.tcl
index 38c3151b0..79c1888e1 100644
--- a/git-gui/lib/shortcut.tcl
+++ b/git-gui/lib/shortcut.tcl
@@ -2,6 +2,7 @@
 # Copyright (C) 2006, 2007 Shawn Pearce
 
 proc do_windows_shortcut {} {
+	global _gitworktree
 	set fn [tk_getSaveFile \
 		-parent . \
 		-title [append "[appname] ([reponame]): " [mc "Create Desktop Icon"]] \
@@ -15,7 +16,7 @@ proc do_windows_shortcut {} {
 					[info nameofexecutable] \
 					[file normalize $::argv0] \
 					] \
-					[file dirname [file normalize [gitdir]]]
+					[file normalize [$_gitworktree]]
 			} err]} {
 			error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"]
 		}
@@ -23,7 +24,7 @@ proc do_windows_shortcut {} {
 }
 
 proc do_cygwin_shortcut {} {
-	global argv0
+	global argv0 _gitworktree
 
 	if {[catch {
 		set desktop [exec cygpath \
@@ -54,9 +55,9 @@ proc do_cygwin_shortcut {} {
 					$argv0]
 				win32_create_lnk $fn [list \
 					$sh -c \
-					"CHERE_INVOKING=1 source /etc/profile;[sq $me]" \
+					"CHERE_INVOKING=1 source /etc/profile;[sq $me] &" \
 					] \
-					[file dirname [file normalize [gitdir]]]
+					[file normalize [$_gitworktree]]
 			} err]} {
 			error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"]
 		}