X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=windows%2Fgit-gui.sh;h=b1845c505500a0f079b2299de07d481c6b2550c4;hb=9cb268c426ccb2bb836418caad669476b5dd1933;hp=98f32c0a071146a202b3d8589576db26974ccbfa;hpb=f4e9996b77415707a20a139463c3e3782e2fa48f;p=git.git

diff --git a/windows/git-gui.sh b/windows/git-gui.sh
index 98f32c0a0..b1845c505 100644
--- a/windows/git-gui.sh
+++ b/windows/git-gui.sh
@@ -3,14 +3,23 @@
 exec wish "$0" -- "$@"
 
 if { $argc >=2 && [lindex $argv 0] == "--working-dir" } {
-	cd [lindex $argv 1]
+	set workdir [lindex $argv 1]
+	cd $workdir
+	if {[lindex [file split $workdir] end] eq {.git}} {
+		# Workaround for Explorer right click "Git GUI Here" on .git/
+		cd ..
+	}
 	set argv [lrange $argv 2 end]
 	incr argc -2
 }
 
-set gitguidir [file dirname [info script]]
-regsub -all ";" $gitguidir "\\;" gitguidir
-set env(PATH) "$gitguidir;$env(PATH)"
-unset gitguidir
+set basedir [file dirname \
+            [file dirname \
+             [file dirname [info script]]]]
+set bindir [file join $basedir bin]
+set bindir "$bindir;[file join $basedir mingw bin]"
+regsub -all ";" $bindir "\\;" bindir
+set env(PATH) "$bindir;$env(PATH)"
+unset bindir
 
 source [file join [file dirname [info script]] git-gui.tcl]