From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 29 Oct 2024 23:52:16 +0000 (+0100)
Subject: Sync with 2.42.4
X-Git-Tag: v2.47.2~1^2~1^2~1^2~1^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c39c2d29e62d5bd13f390ca20f6e756aced681b1;p=thirdparty%2Fgit.git

Sync with 2.42.4

* maint-2.42:
  Git 2.42.4
  Git 2.41.3
  Git 2.40.4
  credential: disallow Carriage Returns in the protocol by default
  credential: sanitize the user prompt
  credential_format(): also encode <host>[:<port>]
  t7300: work around platform-specific behaviour with long paths on MinGW
  compat/regex: fix argument order to calloc(3)
  mingw: drop bogus (and unneeded) declaration of `_pgmptr`
  ci: remove 'Upload failed tests' directories' step from linux32 jobs
---

c39c2d29e62d5bd13f390ca20f6e756aced681b1
diff --cc t/t0300-credentials.sh
index 400f6bdbca,be29e1e111..a59de17039
--- a/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@@ -827,7 -860,23 +860,23 @@@ test_expect_success 'credential config 
  	git -c credential.$partial.helper=yep \
  		-c credential.with%0anewline.username=uh-oh \
  		credential fill <stdin 2>stderr &&
 -	test_i18ngrep "skipping credential lookup for key" stderr
 +	test_grep "skipping credential lookup for key" stderr
  '
  
+ BEL="$(printf '\007')"
+ 
+ test_expect_success 'interactive prompt is sanitized' '
+ 	check fill cntrl-in-username <<-EOF
+ 	protocol=https
+ 	host=example.org
+ 	--
+ 	protocol=https
+ 	host=example.org
+ 	username=${BEL}latrix Lestrange
+ 	password=askpass-password
+ 	--
+ 	askpass: Password for ${SQ}https://%07latrix%20Lestrange@example.org${SQ}:
+ 	EOF
+ '
+ 
  test_done
diff --cc t/t7300-clean.sh
index 1a310a45fd,50de052b82..e610610414
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@@ -735,7 -735,7 +735,7 @@@ test_expect_success MINGW 'handle clea
  	test_must_fail git clean -xdf 2>.git/err &&
  	# grepping for a strerror string is unportable but it is OK here with
  	# MINGW prereq
- 	test_grep "too long" .git/err
 -	test_i18ngrep -e "too long" -e "No such file or directory" .git/err
++	test_grep -e "too long" -e "No such file or directory" .git/err
  '
  
  test_expect_success 'clean untracked paths by pathspec' '