]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Sync with 2.46.3
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 30 Oct 2024 00:12:41 +0000 (01:12 +0100)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 26 Nov 2024 21:15:02 +0000 (22:15 +0100)
* 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

1  2 
Documentation/config/credential.txt
credential.c
t/t5541-http-push-smart.sh
t/t5550-http-fetch-dumb.sh
t/t5551-http-fetch-smart.sh

Simple merge
diff --cc credential.c
index 6dea3859ece3389c97dc773a2466eb291a1617e8,eb0d394c03ccc716bac9062e29086790f916336e..7eca479c71f0cefae129cc69a7f189fb76b68672
@@@ -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)
  {
Simple merge
Simple merge
Simple merge