aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Levedahl <mlevedahl@gmail.com>2025-04-02 11:23:03 -0400
committerTaylor Blau <me@ttaylorr.com>2025-05-23 17:04:23 -0400
commitc5c32781c99bfa9d8b7c51b4a1ad66a9fa1e6bfe (patch)
tree6fb93b93ac55978f16acfa9dbde319caa761bf77
parentgit-gui: _which, only add .exe suffix if not present (diff)
downloadgit-c5c32781c99bfa9d8b7c51b4a1ad66a9fa1e6bfe.tar.gz
git-c5c32781c99bfa9d8b7c51b4a1ad66a9fa1e6bfe.zip
git-gui: use [is_Windows], not bad _shellpath
Commit 7d076d56757c (git-gui: handle shell script text filters when loading for blame, 2011-12-09) added open_cmd_pipe, with special handling for Windows detected by seeing that _shellpath does not point to an executable shell. That is bad practice, and is broken by the next commit that assures _shellpath is valid on all platforms. Fix this by using [is_Windows] as done for all Windows specific code. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Taylor Blau <me@ttaylorr.com>
-rwxr-xr-xgit-gui.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh
index 2e079b6ab1..3135116169 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -543,7 +543,7 @@ proc is_shellscript {filename} {
# scripts specifically otherwise just call the filter command.
proc open_cmd_pipe {cmd path} {
global env
- if {![file executable [shellpath]]} {
+ if {[is_Windows]} {
set exe [auto_execok [lindex $cmd 0]]
if {[is_shellscript [lindex $exe 0]]} {
set run [linsert [auto_execok sh] end -c "$cmd \"\$0\"" $path]