From: Johannes Sixt <j6t@kdbg.org>
Date: Tue, 22 Jul 2025 15:37:33 +0000 (+0200)
Subject: Merge branch 'ml/abandon-old-versions'
X-Git-Tag: v2.51.0-rc0~46^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=436dad00c5a717d56bf4feb8a1f5d39126579fe6;p=thirdparty%2Fgit.git

Merge branch 'ml/abandon-old-versions'

* ml/abandon-old-versions:
  git-gui: eliminate _search_exe
  git-gui: remove procs gitexec and _git_cmd
  git-gui: use dashless 'git cmd' form for read/write
  git-gui: default to full copy for linked worktrees
  git-gui: use git-clone
  git-gui: remove unused git-version
  git-gui: use git_init to create new repository dir
  git-gui: git-remote is always available
  git-gui: git merge understands --strategy=recursive
  git-gui: git-diff knows submodules and textconv
  git-gui: git-blame understands -w and textconv
  git-gui: git rev-parse knows show_toplevel
  git-gui: use git-branch --show-current
  git-gui: git-diff-index always knows submodules
  git-gui: git ls-files knows --exclude-standard
  git-gui: require git >= 2.36

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---

436dad00c5a717d56bf4feb8a1f5d39126579fe6
diff --cc git-gui.sh
index 9bb16ea00b,b361d8c8ae..8bb121db4f
--- a/git-gui.sh
+++ b/git-gui.sh
@@@ -1259,9 -1123,11 +1112,9 @@@ citool 
  ##
  ## execution environment
  
 -set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
 -
  # Suggest our implementation of askpass, if none is set
  if {![info exists env(SSH_ASKPASS)]} {
- 	set env(SSH_ASKPASS) [gitexec git-gui--askpass]
+ 	set env(SSH_ASKPASS) [file join [git --exec-path] git-gui--askpass]
  }
  
  ######################################################################