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

diff --cc Documentation/config/credential.txt
Simple merge

diff --cc compat/mingw.c
Simple merge

diff --cc credential.c
Simple merge

diff --cc strbuf.c
Simple merge

diff --cc strbuf.h
Simple merge

diff --cc t/t0300-credentials.sh
index 400f6bdbca13c2a93cb8521e21e08fbd4e1eb3bd,be29e1e1110d49ae56f99401ffb532b68a475999..a59de170392ce76cd2e0976650ae100a865e5964
--- 1/t/t0300-credentials.sh
--- 2/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/t5541-http-push-smart.sh
Simple merge

diff --cc t/t5550-http-fetch-dumb.sh
Simple merge

diff --cc t/t5551-http-fetch-smart.sh
Simple merge

diff --cc t/t7300-clean.sh
index 1a310a45fd35765167c8f2c06ea85dca8cab9749,50de052b827a85cf314b3ad0bdf3d7b3d27a4b13..e610610414c3f8144077273f554383ae1a38bdab
--- 1/t/t7300-clean.sh
--- 2/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' '