From: Johannes Sixt <j6t@kdbg.org>
Date: Wed, 14 May 2025 19:06:37 +0000 (+0200)
Subject: git-gui: sanitize 'exec' arguments: convert new 'cygpath' calls
X-Git-Tag: v2.43.7~4^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a437f5bc93330a70b42a230e52f3bd036ca1b1da;p=thirdparty%2Fgit.git

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>
---

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 {