aboutsummaryrefslogtreecommitdiffstats
path: root/git-gui/lib/tools.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-07-07 15:08:10 -0700
committerJunio C Hamano <gitster@pobox.com>2025-07-07 15:08:10 -0700
commit038143def708a65455172a87432aee27da2d80c4 (patch)
treea6271d7824fe36b364f6f19f2437de785820aab8 /git-gui/lib/tools.tcl
parentThe seventh batch (diff)
parentGit 2.50.1 (diff)
downloadgit-038143def708a65455172a87432aee27da2d80c4.tar.gz
git-038143def708a65455172a87432aee27da2d80c4.zip
Sync with Git 2.50.1
Diffstat (limited to 'git-gui/lib/tools.tcl')
-rw-r--r--git-gui/lib/tools.tcl7
1 files changed, 3 insertions, 4 deletions
diff --git a/git-gui/lib/tools.tcl b/git-gui/lib/tools.tcl
index 413f1a1700..48fddfd814 100644
--- a/git-gui/lib/tools.tcl
+++ b/git-gui/lib/tools.tcl
@@ -110,14 +110,14 @@ proc tools_exec {fullname} {
set cmdline $repo_config(guitool.$fullname.cmd)
if {[is_config_true "guitool.$fullname.noconsole"]} {
- tools_run_silent [list sh -c $cmdline] \
+ tools_run_silent [list [shellpath] -c $cmdline] \
[list tools_complete $fullname {}]
} else {
regsub {/} $fullname { / } title
set w [console::new \
[mc "Tool: %s" $title] \
[mc "Running: %s" $cmdline]]
- console::exec $w [list sh -c $cmdline] \
+ console::exec $w [list [shellpath] -c $cmdline] \
[list tools_complete $fullname $w]
}
@@ -130,8 +130,7 @@ proc tools_exec {fullname} {
}
proc tools_run_silent {cmd after} {
- lappend cmd 2>@1
- set fd [_open_stdout_stderr $cmd]
+ set fd [safe_open_command $cmd [list 2>@1]]
fconfigure $fd -blocking 0 -translation binary
fileevent $fd readable [list tools_consume_input $fd $after]