git-gui: handle textconv filter on Windows and in development

diff --git a/git-gui.sh b/git-gui.sh
index 8ade423eb46006025e56ee68e49230a8e8efb579..0d5c5e389e53dde25b6022321bb7c548d59a8d8d 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -139,7 +139,14 @@ if {$_trace >= 0} {
 }
 
 proc shellpath {} {
-       global _shellpath
+       global _shellpath env
+       if {[string match @@* $_shellpath]} {
+               if {[info exists env(SHELL)]} {
+                       return $env(SHELL)
+               } else {
+                       return /bin/sh
+               }
+       }
        return $_shellpath
 }