X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-gui%2Fwindows%2Fgit-gui.sh;h=66bbb2f8faaf83bc87819a9e288a0592f400e147;hb=3ba4f3a9fc68ba4c5a0064107e8993c5fc5b684f;hp=98f32c0a071146a202b3d8589576db26974ccbfa;hpb=bd8ff616c998da8b08bd59b47644408048b3016d;p=git.git

diff --git a/git-gui/windows/git-gui.sh b/git-gui/windows/git-gui.sh
index 98f32c0a0..66bbb2f8f 100644
--- a/git-gui/windows/git-gui.sh
+++ b/git-gui/windows/git-gui.sh
@@ -3,14 +3,22 @@
 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 bindir [file dirname \
+            [file dirname \
+             [file dirname [info script]]]]
+set bindir [file join $bindir bin]
+regsub -all ";" $bindir "\\;" bindir
+set env(PATH) "$bindir;$env(PATH)"
+unset bindir
 
 source [file join [file dirname [info script]] git-gui.tcl]