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

When developing/testing we run git-gui.sh directly and the makefile
configured variables are not properly set. Configure the new shellpath
accessor to handle this case.

On Windows we may not find the shell so in this case revert to simply
executing the filter command without the shell intermediate.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

1 files changed, 8 insertions, 1 deletions

diff --git a/git-gui.sh b/git-gui.sh
index 8ade423eb4..0d5c5e389e 100755
--- 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
 }