aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2025-05-14 21:06:37 +0200
committerTaylor Blau <me@ttaylorr.com>2025-05-23 17:04:30 -0400
commita437f5bc93330a70b42a230e52f3bd036ca1b1da (patch)
treecf7db72078a7d4a5a722a917ff27ff4ba9201f32
parentMerge branch 'ml/replace-auto-execok' into js/fix-open-exec (diff)
downloadgit-a437f5bc93330a70b42a230e52f3bd036ca1b1da.tar.gz
git-a437f5bc93330a70b42a230e52f3bd036ca1b1da.zip
git-gui: sanitize 'exec' arguments: convert new 'cygpath' calls
The side branch merged in the previous commit introduces new 'exec' calls. Convert these in the same way we did earlier for existing 'exec' calls. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Taylor Blau <me@ttaylorr.com>
-rwxr-xr-xgit-gui.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-gui.sh b/git-gui.sh
index 0355c0c836..2c446c2784 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -393,7 +393,7 @@ if {[string match @@* $_shellpath]} {
}
if {[is_Windows]} {
- set _shellpath [exec cygpath -m $_shellpath]
+ set _shellpath [safe_exec [list cygpath -m $_shellpath]]
}
if {![file executable $_shellpath] || \
@@ -2778,7 +2778,7 @@ if {![is_bare]} {
if {[is_Windows]} {
# Use /git-bash.exe if available
- set _git_bash [exec cygpath -m /git-bash.exe]
+ set _git_bash [safe_exec [list cygpath -m /git-bash.exe]]
if {[file executable $_git_bash]} {
set _bash_cmdline [list "Git Bash" $_git_bash]
} else {