Merge 'origin/main' into v2.40.1.windows.1

By necessity, the patches leading up to an embargoed Git for Windows
release deviate from its public `main` branch, as was the case for
v2.40.1, too.

Here, I merge the `main` branch onto the tagged Git for Windows v2.40.1
(as opposed to the opposite direction, which intuition would suggest),
to make sure that `git show HEAD^{/Start.the.merging-rebase}` will find
the latest merging-rebase on the first-parent ancestry.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

git-gui/git-gui.sh

@@ -108,6 +108,9 @@ proc _which {what args} {
 
 	if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
 		set suffix {}
+	} elseif {[string match *$_search_exe $what]} {
+		# The search string already has the file extension
+		set suffix {}
 	} else {
 		set suffix $_search_exe
 	}

path.c

@@ -739,12 +739,6 @@ char *interpolate_path(const char *path, int real_home)
 	if (skip_prefix(path, "%(prefix)/", &path))
 		return system_path(path);
 
-#ifdef __MINGW32__
-	if (path[0] == '/') {
-		warning(_("encountered old-style '%s' that should be '%%(prefix)/%s'"), path, path);
-		return system_path(path + 1);
-	}
-#endif
 	if (path[0] == '~') {
 		const char *first_slash = strchrnul(path, '/');
 		const char *username = path + 1;