From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 30 Oct 2024 00:12:41 +0000 (+0100)
Subject: Sync with 2.46.3
X-Git-Tag: v2.47.2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fad508c3f5d51c017c9ab5760ef492c11668313;p=thirdparty%2Fgit.git

Sync with 2.46.3

* maint-2.46:
  Git 2.46.3
  Git 2.45.3
  Git 2.44.3
  Git 2.43.6
  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
---

3fad508c3f5d51c017c9ab5760ef492c11668313
diff --cc credential.c
index 6dea3859ec,eb0d394c03..7eca479c71
--- a/credential.c
+++ b/credential.c
@@@ -12,9 -10,7 +12,9 @@@
  #include "sigchain.h"
  #include "strbuf.h"
  #include "urlmatch.h"
- #include "git-compat-util.h"
+ #include "environment.h"
 +#include "trace2.h"
 +#include "repository.h"
  
  void credential_init(struct credential *c)
  {