From: Taylor Blau <me@ttaylorr.com>
Date: Wed, 28 May 2025 19:17:05 +0000 (-0400)
Subject: Sync with 2.47.3
X-Git-Tag: v2.48.2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=856b515a4612e41f00b80b64b6504422a8d8bba1;p=thirdparty%2Fgit.git

Sync with 2.47.3

* maint-2.47:
  Git 2.47.3
  Git 2.46.4
  Git 2.45.4
  Git 2.44.4
  Git 2.43.7
  wincred: avoid buffer overflow in wcsncat()
  bundle-uri: fix arbitrary file writes via parameter injection
  config: quote values containing CR character
  git-gui: sanitize 'exec' arguments: convert new 'cygpath' calls
  git-gui: do not mistake command arguments as redirection operators
  git-gui: introduce function git_redir for git calls with redirections
  git-gui: pass redirections as separate argument to git_read
  git-gui: pass redirections as separate argument to _open_stdout_stderr
  git-gui: convert git_read*, git_write to be non-variadic
  git-gui: override exec and open only on Windows
  gitk: sanitize 'open' arguments: revisit recently updated 'open' calls
  git-gui: use git_read in githook_read
  git-gui: sanitize $PATH on all platforms
  git-gui: break out a separate function git_read_nice
  git-gui: assure PATH has only absolute elements.
  git-gui: remove option --stderr from git_read
  git-gui: cleanup git-bash menu item
  git-gui: sanitize 'exec' arguments: background
  git-gui: avoid auto_execok in do_windows_shortcut
  git-gui: sanitize 'exec' arguments: simple cases
  git-gui: avoid auto_execok for git-bash menu item
  git-gui: treat file names beginning with "|" as relative paths
  git-gui: remove unused proc is_shellscript
  git-gui: remove git config --list handling for git < 1.5.3
  git-gui: remove special treatment of Windows from open_cmd_pipe
  git-gui: remove HEAD detachment implementation for git < 1.5.3
  git-gui: use only the configured shell
  git-gui: remove Tcl 8.4 workaround on 2>@1 redirection
  git-gui: make _shellpath usable on startup
  git-gui: use [is_Windows], not bad _shellpath
  git-gui: _which, only add .exe suffix if not present
  gitk: encode arguments correctly with "open"
  gitk: sanitize 'open' arguments: command pipeline
  gitk: collect construction of blameargs into a single conditional
  gitk: sanitize 'open' arguments: simple commands, readable and writable
  gitk: sanitize 'open' arguments: simple commands with redirections
  gitk: sanitize 'open' arguments: simple commands
  gitk: sanitize 'exec' arguments: redirect to process
  gitk: sanitize 'exec' arguments: redirections and background
  gitk: sanitize 'exec' arguments: redirections
  gitk: sanitize 'exec' arguments: 'eval exec'
  gitk: sanitize 'exec' arguments: simple cases
  gitk: have callers of diffcmd supply pipe symbol when necessary
  gitk: treat file names beginning with "|" as relative paths
---

856b515a4612e41f00b80b64b6504422a8d8bba1
diff --cc git-gui/lib/console.tcl
index fafafb81f1,4715ce91e6..a017cfeadd
--- a/git-gui/lib/console.tcl
+++ b/git-gui/lib/console.tcl
@@@ -92,12 -92,11 +92,11 @@@ method _init {} 
  
  method exec {cmd {after {}}} {
  	if {[lindex $cmd 0] eq {git}} {
- 		set fd_f [eval git_read --stderr [lrange $cmd 1 end]]
+ 		set fd_f [git_read [lrange $cmd 1 end] [list 2>@1]]
  	} else {
- 		lappend cmd 2>@1
- 		set fd_f [_open_stdout_stderr $cmd]
+ 		set fd_f [safe_open_command $cmd [list 2>@1]]
  	}
 -	fconfigure $fd_f -blocking 0 -translation binary
 +	fconfigure $fd_f -blocking 0 -translation binary -encoding [encoding system]
  	fileevent $fd_f readable [cb _read $fd_f $after]
  }