Rebase shears/main: 2 conflict(s) (0 skipped, 2 resolved) (#23916656090)

[gitforwindowshelper]

Workflow run

Rebase Summary: main

From: 8279c02a0f (Don't traverse mount points in remove_dir_recurse() (git-for-windows#6151), 2026-03-31) (30ae3040ec..8279c02a0f)

Resolved: 72f281a (Merge branch 'disallow-ntlm-auth-by-default', 2026-02-12)

kept both sides: HEAD's retry settings + NTLM branch's auth method init in http.c; both install_script lines in lib-httpd.sh

Range-diff

• 1: 72f281a ! 1: 6c29d74 Merge branch 'disallow-ntlm-auth-by-default'

  @@ Commit message
   
       Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
   
  - ## Documentation/config/http.adoc ##
  -@@ Documentation/config/http.adoc: http.sslKeyType::
  - 	See also libcurl `CURLOPT_SSLKEYTYPE`. Can be overridden by the
  - 	`GIT_SSL_KEY_TYPE` environment variable.
  - 
  -+http.allowNTLMAuth::
  -+	Whether or not to allow NTLM authentication. While very convenient to set
  -+	up, and therefore still used in many on-prem scenarios, NTLM is a weak
  -+	authentication method and therefore deprecated. Defaults to "false".
  -+
  - http.schannelCheckRevoke::
  - 	Used to enforce or disable certificate revocation checks in cURL
  - 	when http.sslBackend is set to "schannel" via "true" and "false",
  -
  - ## credential.c ##
  -@@ credential.c: int credential_read(struct credential *c, FILE *fp,
  - 				credential_set_capability(&c->capa_authtype, op_type);
  - 			else if (!strcmp(value, "state"))
  - 				credential_set_capability(&c->capa_state, op_type);
  -+		} else if (!strcmp(key, "ntlm")) {
  -+			if (!strcmp(value, "allow"))
  -+				c->ntlm_allow = 1;
  - 		} else if (!strcmp(key, "continue")) {
  - 			c->multistage = !!git_config_bool("continue", value);
  - 		} else if (!strcmp(key, "password_expiry_utc")) {
  -@@ credential.c: void credential_write(const struct credential *c, FILE *fp,
  - 		if (c->ephemeral)
  - 			credential_write_item(c, fp, "ephemeral", "1", 0);
  - 	}
  -+	if (c->ntlm_suppressed)
  -+		credential_write_item(c, fp, "ntlm", "suppressed", 0);
  - 	credential_write_item(c, fp, "protocol", c->protocol, 1);
  - 	credential_write_item(c, fp, "host", c->host, 1);
  - 	credential_write_item(c, fp, "path", c->path, 0);
  -
  - ## credential.h ##
  -@@ credential.h: struct credential {
  - 	struct credential_capability capa_authtype;
  - 	struct credential_capability capa_state;
  - 
  -+	unsigned ntlm_suppressed:1,
  -+		 ntlm_allow:1;
  -+
  - 	char *username;
  - 	char *password;
  - 	char *credential;
  -
    ## http.c ##
  -@@ http.c: enum http_follow_config http_follow_config = HTTP_FOLLOW_INITIAL;
  - 
  - static struct credential cert_auth = CREDENTIAL_INIT;
  - static int ssl_cert_password_required;
  --static unsigned long http_auth_methods = CURLAUTH_ANY;
  -+static unsigned long http_auth_any = CURLAUTH_ANY & ~CURLAUTH_NTLM;
  -+static unsigned long http_auth_methods;
  - static int http_auth_methods_restricted;
  - /* Modes for which empty_auth cannot actually help us. */
  - static unsigned long empty_auth_useless =
  -@@ http.c: static int http_options(const char *var, const char *value,
  - 		return 0;
  - 	}
  - 
  -+	if (!strcmp("http.allowntlmauth", var)) {
  -+		if (git_config_bool(var, value)) {
  -+			http_auth_any |= CURLAUTH_NTLM;
  -+		} else {
  -+			http_auth_any &= ~CURLAUTH_NTLM;
  -+		}
  -+		return 0;
  -+	}
  -+
  - 	if (!strcmp("http.schannelcheckrevoke", var)) {
  - 		if (value && !strcmp(value, "best-effort")) {
  - 			http_schannel_check_revoke_mode =
  -@@ http.c: static void init_curl_http_auth(CURL *result)
  - 
  - 	credential_fill(the_repository, &http_auth, 1);
  - 
  -+	if (http_auth.ntlm_allow && !(http_auth_methods & CURLAUTH_NTLM)) {
  -+		http_auth_methods |= CURLAUTH_NTLM;
  -+		curl_easy_setopt(result, CURLOPT_HTTPAUTH, http_auth_methods);
  -+	}
  -+
  - 	if (http_auth.password) {
  - 		if (always_auth_proactively()) {
  - 			/*
  -@@ http.c: static void init_curl_proxy_auth(CURL *result)
  - 		if (i == ARRAY_SIZE(proxy_authmethods)) {
  - 			warning("unsupported proxy authentication method %s: using anyauth",
  - 					http_proxy_authmethod);
  --			curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
  -+			curl_easy_setopt(result, CURLOPT_PROXYAUTH, http_auth_any);
  - 		}
  - 	}
  - 	else
  --		curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
  -+		curl_easy_setopt(result, CURLOPT_PROXYAUTH, http_auth_any);
  - }
  - 
  - static int has_cert_password(void)
  -@@ http.c: static CURL *get_curl_handle(void)
  -     }
  - 
  - 	curl_easy_setopt(result, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
  --	curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
  -+	curl_easy_setopt(result, CURLOPT_HTTPAUTH, http_auth_any);
  - 
  - #ifdef CURLGSSAPI_DELEGATION_FLAG
  - 	if (curl_deleg) {
  + remerge CONFLICT (content): Merge conflict in http.c
  + index f76f5aaede..1688aa89ca 100644
  + --- http.c
  + +++ http.c
   @@ http.c: void http_init(struct remote *remote, const char *url, int proactive_auth)
  + 	set_long_from_env(&curl_tcp_keepintvl, "GIT_TCP_KEEPINTVL");
  + 	set_long_from_env(&curl_tcp_keepcnt, "GIT_TCP_KEEPCNT");
  + 
  +-<<<<<<< 752df9a565 (Merge 'readme' into HEAD)
  + 	set_long_from_env(&http_retry_after, "GIT_HTTP_RETRY_AFTER");
    	set_long_from_env(&http_max_retries, "GIT_HTTP_MAX_RETRIES");
    	set_long_from_env(&http_max_retry_time, "GIT_HTTP_MAX_RETRY_TIME");
  +-=======
  + 	http_auth_methods = http_auth_any;
  +->>>>>>> 816db62d10 (credential: advertise NTLM suppression and allow helpers to re-enable)
    
  -+	http_auth_methods = http_auth_any;
  -+
    	curl_default = get_curl_handle();
    }
  - 
  -@@ http.c: static int handle_curl_result(struct slot_results *results)
  - 	} else if (missing_target(results))
  - 		return HTTP_MISSING_TARGET;
  - 	else if (results->http_code == 401) {
  -+		http_auth.ntlm_suppressed = (results->auth_avail & CURLAUTH_NTLM) &&
  -+					    !(http_auth_any & CURLAUTH_NTLM);
  -+		if (http_auth.ntlm_suppressed && http_auth.ntlm_allow) {
  -+			http_auth_methods |= CURLAUTH_NTLM;
  -+			return HTTP_REAUTH;
  -+		}
  - 		if ((http_auth.username && http_auth.password) ||\
  - 		    (http_auth.authtype && http_auth.credential)) {
  - 			if (http_auth.multistage) {
  -@@ http.c: static int handle_curl_result(struct slot_results *results)
  - 			credential_reject(the_repository, &http_auth);
  - 			if (always_auth_proactively())
  - 				http_proactive_auth = PROACTIVE_AUTH_NONE;
  -+			if (http_auth.ntlm_suppressed) {
  -+				warning(_("Due to its cryptographic weaknesses, "
  -+					  "NTLM authentication has been\n"
  -+					  "disabled in Git by default. You can "
  -+					  "re-enable it for trusted servers\n"
  -+					  "by running:\n\n"
  -+					  "git config set "
  -+					  "http.%s://%s.allowNTLMAuth true"),
  -+					http_auth.protocol, http_auth.host);
  -+			}
  - 			return HTTP_NOAUTH;
  - 		} else {
  - 			http_auth_methods &= ~CURLAUTH_GSSNEGOTIATE;
   
    ## t/lib-httpd.sh ##
  + remerge CONFLICT (content): Merge conflict in t/lib-httpd.sh
  + index d1358d66cd..7150a2a2f2 100644
  + --- t/lib-httpd.sh
  + +++ t/lib-httpd.sh
   @@ t/lib-httpd.sh: prepare_httpd() {
  + 	install_script error.sh
    	install_script apply-one-time-script.sh
    	install_script nph-custom-auth.sh
  +-<<<<<<< 752df9a565 (Merge 'readme' into HEAD)
    	install_script http-429.sh
  -+	install_script ntlm-handshake.sh
  +-=======
  + 	install_script ntlm-handshake.sh
  +->>>>>>> 816db62d10 (credential: advertise NTLM suppression and allow helpers to re-enable)
    
    	ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules"
    
  -
  - ## t/lib-httpd/apache.conf ##
  -@@ t/lib-httpd/apache.conf: SetEnv PERL_PATH ${PERL_PATH}
  - 	CGIPassAuth on
  - 	</IfDefine>
  - </LocationMatch>
  -+<LocationMatch /ntlm_auth/>
  -+	SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
  -+	SetEnv GIT_HTTP_EXPORT_ALL
  -+	<IfDefine USE_CGIPASSAUTH>
  -+	CGIPassAuth on
  -+	</IfDefine>
  -+</LocationMatch>
  - ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/
  - ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/
  - ScriptAlias /smart/no_report/git-receive-pack error-no-report.sh/
  -@@ t/lib-httpd/apache.conf: ScriptAlias /error/ error.sh/
  - ScriptAliasMatch /one_time_script/(.*) apply-one-time-script.sh/$1
  - ScriptAliasMatch /http_429/(.*) http-429.sh/$1
  - ScriptAliasMatch /custom_auth/(.*) nph-custom-auth.sh/$1
  -+ScriptAliasMatch /ntlm_auth/(.*) ntlm-handshake.sh/$1
  - <Directory ${GIT_EXEC_PATH}>
  - 	Options FollowSymlinks
  - </Directory>
  -
  - ## t/lib-httpd/ntlm-handshake.sh (new) ##
  -@@
  -+#!/bin/sh
  -+
  -+case "$HTTP_AUTHORIZATION" in
  -+'')
  -+	# No Authorization header -> send NTLM challenge
  -+	echo "Status: 401 Unauthorized"
  -+	echo "WWW-Authenticate: NTLM"
  -+	echo
  -+	;;
  -+"NTLM TlRMTVNTUAAB"*)
  -+	# Type 1 -> respond with Type 2 challenge (hardcoded)
  -+	echo "Status: 401 Unauthorized"
  -+	# Base64-encoded version of the Type 2 challenge:
  -+	# signature: 'NTLMSSP\0'
  -+	# message_type: 2
  -+	# target_name: 'NTLM-GIT-SERVER'
  -+	# flags: 0xa2898205 =
  -+	#   NEGOTIATE_UNICODE, REQUEST_TARGET, NEGOTIATE_NT_ONLY,
  -+	#   TARGET_TYPE_SERVER, TARGET_TYPE_SHARE, REQUEST_NON_NT_SESSION_KEY,
  -+	#   NEGOTIATE_VERSION, NEGOTIATE_128, NEGOTIATE_56
  -+	# challenge: 0xfa3dec518896295b
  -+	# context: '0000000000000000'
  -+	# target_info_present: true
  -+	# target_info_len: 128
  -+	# version: '10.0 (build 19041)'
  -+	echo "WWW-Authenticate: NTLM TlRMTVNTUAACAAAAHgAeADgAAAAFgomi+j3sUYiWKVsAAAAAAAAAAIAAgABWAAAACgBhSgAAAA9OAFQATABNAC0ARwBJAFQALQBTAEUAUgBWAEUAUgACABIAVwBPAFIASwBHAFIATwBVAFAAAQAeAE4AVABMAE0ALQBHAEkAVAAtAFMARQBSAFYARQBSAAQAEgBXAE8AUgBLAEcAUgBPAFUAUAADAB4ATgBUAEwATQAtAEcASQBUAC0AUwBFAFIAVgBFAFIABwAIAACfOcZKYNwBAAAAAA=="
  -+	echo
  -+	;;
  -+"NTLM TlRMTVNTUAAD"*)
  -+	# Type 3 -> accept without validation
  -+	exec "$GIT_EXEC_PATH"/git-http-backend
  -+	;;
  -+*)
  -+	echo "Status: 500 Unrecognized"
  -+	echo
  -+	echo "Unhandled auth: '$HTTP_AUTHORIZATION'"
  -+	;;
  -+esac
  -
  - ## t/t5563-simple-http-auth.sh ##
  -@@ t/t5563-simple-http-auth.sh: test_expect_success 'access using three-legged auth' '
  - 	EOF
  - '
  - 
  -+test_lazy_prereq NTLM 'curl --version | grep -q NTLM'
  -+
  -+test_expect_success NTLM 'access using NTLM auth' '
  -+	test_when_finished "per_test_cleanup" &&
  -+
  -+	set_credential_reply get <<-EOF &&
  -+	username=user
  -+	password=pwd
  -+	EOF
  -+
  -+	test_config_global credential.helper test-helper &&
  -+	test_must_fail env GIT_TRACE_CURL=1 git \
  -+		ls-remote "$HTTPD_URL/ntlm_auth/repo.git" 2>err &&
  -+	test_grep "allowNTLMAuth" err &&
  -+
  -+	# Can be enabled via config
  -+	GIT_TRACE_CURL=1 git -c http.$HTTPD_URL.allowNTLMAuth=true \
  -+		ls-remote "$HTTPD_URL/ntlm_auth/repo.git" &&
  -+
  -+	# Or via credential helper responding with ntlm=allow
  -+	set_credential_reply get <<-EOF &&
  -+	username=user
  -+	password=pwd
  -+	ntlm=allow
  -+	EOF
  -+
  -+	git ls-remote "$HTTPD_URL/ntlm_auth/repo.git"
  -+'
  -+
  - test_done

Resolved: 53737c7 (mingw: use strftime() directly in UCRT builds (git-for-windows#6130), 2026-03-25)

resolved all 5 conflicts by keeping HEAD (upstream) side: interactive_options rename in reset.c, CURLINFO_RETRY_AFTER and retry variables in git-curl-compat.h/http.c, refs_compute_filesystem_location in reftable-backend.c, new test entries in meson.build

Range-diff

• 1: 53737c7 ! 1: cd0c27a mingw: use strftime() directly in UCRT builds (mingw: use strftime() directly in UCRT builds git#6130)

  @@ Commit message
       since ec47a33fd2c3b679c3d8cbd440752414adb56ce9, i.e. for a _really_ long
       time.
   
  - ## Documentation/git-svn.adoc ##
  -@@ Documentation/git-svn.adoc: SYNOPSIS
  - --------
  - [verse]
  - 'git svn' <command> [<options>] [<arguments>]
  -+(UNSUPPORTED!)
  - 
  - DESCRIPTION
  - -----------
  + ## builtin/reset.c ##
  + remerge CONFLICT (content): Merge conflict in builtin/reset.c
  + index 842e2ae85a..1cd7e61fe4 100644
  + --- builtin/reset.c
  + +++ builtin/reset.c
  +@@ builtin/reset.c: int cmd_reset(int argc,
  + 	struct object_id oid;
  + 	struct pathspec pathspec;
  + 	int intent_to_add = 0;
  +-<<<<<<< ff1dd0957b (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142))
  + 	struct interactive_options interactive_opts = INTERACTIVE_OPTIONS_INIT;
  +-=======
  +-	struct add_p_opt add_p_opt = ADD_P_OPT_INIT;
  +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds)
  + 	int nul_term_line = 0, read_from_stdin = 0;
  + 	const struct option options[] = {
  + 		OPT__QUIET(&quiet, N_("be quiet, only report errors")),
   
  - ## compat/mingw.c ##
  -@@ compat/mingw.c: int mingw_utime (const char *file_name, const struct utimbuf *times)
  - size_t mingw_strftime(char *s, size_t max,
  - 		      const char *format, const struct tm *tm)
  - {
  -+#ifdef _UCRT
  -+	size_t ret = strftime(s, max, format, tm);
  -+#else
  - 	/* a pointer to the original strftime in case we can't find the UCRT version */
  - 	static size_t (*fallback)(char *, size_t, const char *, const struct tm *) = strftime;
  - 	size_t ret;
  -@@ compat/mingw.c: size_t mingw_strftime(char *s, size_t max,
  - 		ret = strftime(s, max, format, tm);
  - 	else
  - 		ret = fallback(s, max, format, tm);
  -+#endif
  + ## git-curl-compat.h ##
  + remerge CONFLICT (content): Merge conflict in git-curl-compat.h
  + index f12a6eb9bb..5c8ceb076a 100644
  + --- git-curl-compat.h
  + +++ git-curl-compat.h
  +@@
  + #endif
  + 
  + /**
  +-<<<<<<< ff1dd0957b (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142))
  +  * CURLINFO_RETRY_AFTER was added in 7.66.0, released in September 2019.
  +  * It allows curl to automatically parse Retry-After headers.
  +  */
  +@@
  + #endif
    
  - 	if (!ret && errno == EINVAL)
  - 		die("invalid strftime format: '%s'", format);
  + /**
  +-=======
  +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds)
  +  * CURLSSLOPT_AUTO_CLIENT_CERT was added in 7.77.0, released in May
  +  * 2021.
  +  */
   
  - ## git-svn.perl ##
  -@@ git-svn.perl: sub term_init {
  - 			: new Term::ReadLine 'git-svn';
  - }
  + ## http.c ##
  + remerge CONFLICT (content): Merge conflict in http.c
  + index 9a5c8e7fd4..0b20b08e67 100644
  + --- http.c
  + +++ http.c
  +@@ http.c: static long http_schannel_check_revoke_mode =
  + 	CURLSSLOPT_NO_REVOKE;
  + #endif
    
  -+sub deprecated_warning {
  -+    my @lines = @_;
  -+    if (-t STDERR) {
  -+        @lines = map { "\e[33m$_\e[0m" } @lines;
  -+    }
  -+    warn join("\n", @lines), "\n";
  -+}
  -+
  -+deprecated_warning(
  -+	"WARNING: \`git svn\` is no longer supported by the Git for Windows project.",
  -+	"See https://github.com/git-for-windows/git/issues/5405 for details."
  -+);
  +-<<<<<<< ff1dd0957b (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142))
  + static long http_retry_after = 0;
  + static long http_max_retries = 0;
  + static long http_max_retry_time = 300;
  + 
  +-=======
  +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds)
   +
  - my $cmd;
  - for (my $i = 0; $i < @ARGV; $i++) {
  - 	if (defined $cmd{$ARGV[$i]}) {
  + /*
  +  * With the backend being set to `schannel`, setting sslCAinfo would override
  +  * the Certificate Store in cURL v7.60.0 and later, which is not what we want
   
  - ## t/t9108-git-svn-glob.sh ##
  -@@ t/t9108-git-svn-glob.sh: test_expect_success 'test disallow multi-globs' '
  - 		svn_cmd commit -m "try to try"
  - 	) &&
  - 	test_must_fail git svn fetch three 2> stderr.three &&
  --	test_cmp expect.three stderr.three
  -+	sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean &&
  -+	test_cmp expect.three stderr.three.clean
  - 	'
  + ## refs/reftable-backend.c ##
  + remerge CONFLICT (content): Merge conflict in refs/reftable-backend.c
  + index 7f8f41d153..23b18837c8 100644
  + --- refs/reftable-backend.c
  + +++ refs/reftable-backend.c
  +@@ refs/reftable-backend.c: static struct ref_store *reftable_be_init(struct repository *repo,
  + 	mask = umask(0);
  + 	umask(mask);
    
  - test_done
  -
  - ## t/t9109-git-svn-multi-glob.sh ##
  -@@ t/t9109-git-svn-multi-glob.sh: test_expect_success 'test disallow multiple globs' '
  - 		svn_cmd commit -m "try to try"
  - 	) &&
  - 	test_must_fail git svn fetch three 2> stderr.three &&
  --	test_cmp expect.three stderr.three
  -+	sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean &&
  -+	test_cmp expect.three stderr.three.clean
  - 	'
  +-<<<<<<< ff1dd0957b (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142))
  + 	refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir,
  + 					 &ref_common_dir);
    
  - test_done
  + 	reftable_set_alloc(malloc, realloc, free);
  + 	base_ref_store_init(&refs->base, repo, refdir.buf, &refs_be_reftable);
  +-=======
  +-	reftable_set_alloc(malloc, realloc, free);
  +-	base_ref_store_init(&refs->base, repo, gitdir, &refs_be_reftable);
  +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds)
  + 	strmap_init(&refs->worktree_backends);
  + 	refs->store_flags = store_flags;
  + 	refs->log_all_ref_updates = repo_settings_get_log_all_ref_updates(repo);
   
  - ## t/t9168-git-svn-partially-globbed-names.sh ##
  -@@ t/t9168-git-svn-partially-globbed-names.sh: test_expect_success 'test disallow prefixed multi-globs' '
  - 		svn_cmd commit -m "try to try"
  - 	) &&
  - 	test_must_fail git svn fetch four 2>stderr.four &&
  --	test_cmp expect.four stderr.four &&
  -+	sed "/^WARNING.*no.* supported/{N;d}" <stderr.four >stderr.four.clean &&
  -+	test_cmp expect.four stderr.four.clean &&
  - 	git config --unset svn-remote.four.branches &&
  - 	git config --unset svn-remote.four.tags
  - 	'
  -@@ t/t9168-git-svn-partially-globbed-names.sh: test_expect_success 'test disallow multiple asterisks in one word' '
  - 		svn_cmd commit -m "try to try"
  - 	) &&
  - 	test_must_fail git svn fetch six 2>stderr.six &&
  --	test_cmp expect.six stderr.six
  -+	sed "/^WARNING.*no.* supported/{N;d}" <stderr.six >stderr.six.clean &&
  -+	test_cmp expect.six stderr.six.clean
  - 	'
  - 
  - test_done
  + ## t/meson.build ##
  + remerge CONFLICT (content): Merge conflict in t/meson.build
  + index 45796f8a0f..81591f64bf 100644
  + --- t/meson.build
  + +++ t/meson.build
  +@@ t/meson.build: integration_tests = [
  +   't7422-submodule-output.sh',
  +   't7423-submodule-symlinks.sh',
  +   't7424-submodule-mixed-ref-formats.sh',
  +-<<<<<<< ff1dd0957b (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142))
  +   't7425-submodule-gitdir-path-extension.sh',
  +   't7426-submodule-get-default-remote.sh',
  +-=======
  +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds)
  +   't7429-submodule-long-path.sh',
  +   't7450-bad-git-dotfiles.sh',
  +   't7500-commit-template-squash-signoff.sh',

To: 81cfb41a72 (Don't traverse mount points in remove_dir_recurse() (git-for-windows#6151), 2026-03-31) (0880f969da..81cfb41a72)

Statistics

Metric	Count
Total conflicts	2
Skipped (upstreamed)	0
Resolved surgically	2

Range-diff (click to expand)

• 1: 4df7813 = 1: 2154d0a sideband: mask control characters

• 2: 643223b = 2: d186bc6 sideband: introduce an "escape hatch" to allow control characters

• 3: 5191e76 = 3: 9d166b3 sideband: do allow ANSI color sequences by default

• 4: 35481d3 = 4: 15c8fd4 unix-socket: avoid leak when initialization fails

• 5: e28c386 = 5: e96c1e2 Merge branch 'disallow-control-characters-in-sideband-channel'

• 6: 6912f6c = 6: d49c638 grep: prevent ^$ false match at end of file

• 7: 09fa3dc = 7: fe9339f Merge branch 'fixes-from-the-git-mailing-list'

• 8: 05305fc = 8: c20522a t9350: point out that refs are not updated correctly

• 13: b8813f3 = 9: 75f06ce mingw: include the Python parts in the build

• 9: 650d961 = 10: b57926d transport-helper: add trailing --

• 14: 3d26099 = 11: 093ead6 win32/pthread: avoid name clashes with winpthread

• 10: a256bd3 = 12: db17357 remote-helper: check helper status after import/export

• 20: e6c13f7 = 13: 04a62e9 clean: do not traverse mount points

• 15: 9892398 = 14: 3e55b87 git-compat-util: avoid redeclaring _DEFAULT_SOURCE

• 11: 9c89255 = 15: 2b3b7d9 Always auto-gc after calling a fast-import transport

• 12: b8eaef7 = 16: 6329629 mingw: prevent regressions with "drive-less" absolute paths

• 23: 9a1e238 = 17: 1884c17 clean: remove mount points when possible

• 28: d9d69b0 = 18: 4bc74bc vcpkg_install: detect lack of Git

• 29: e1881cd = 19: c9074e6 vcpkg_install: add comment regarding slow network connections

• 30: 83adec3 = 20: de736f0 vcbuild: install ARM64 dependencies when building ARM64 binaries

• 31: f16a561 = 21: 6cca6ac vcbuild: add an option to install individual 'features'

• 16: 20f53f3 = 22: 29148e6 Import the source code of mimalloc v2.2.7

• 32: 9639d1d = 23: b1a327f cmake: allow building for Windows/ARM64

• 17: 0b93212 = 24: c3db639 mimalloc: adjust for building inside Git

• 33: 2905579 = 25: b4ba157 ci(vs-build) also build Windows/ARM64 artifacts

• 19: de727d4 = 26: 57b530f mimalloc: offer a build-time option to enable it

• 34: 31660a4 = 27: ca6b1b5 Add schannel to curl installation

• 53: c82e935 = 28: 1693b48 hash-object: demonstrate a >4GB/LLP64 problem

• 22: 7af6844 = 29: 2b63ddb mingw: use mimalloc

• 36: e3da4eb = 30: f694d3f cmake(): allow setting HOST_CPU for cross-compilation

• 55: 899f9d6 = 31: 3ca1ffe object-file.c: use size_t for header lengths

• 45: ee20269 = 32: a6e1fb6 windows: skip linking git-<command> for built-ins

• 57: 26de923 = 33: c8c4a3c CMake: default Visual Studio generator has changed

• 58: 0571cfd = 34: f52613d hash algorithms: use size_t for section lengths

• 46: acf54ff = 35: 58638af mingw: stop hard-coding CC = gcc

• 18: 1c7438a = 36: 73e83d8 mingw: demonstrate a git add issue with NTFS junctions

• 60: a20a9f7 = 37: abd1841 .gitignore: add Visual Studio CMakeSetting.json file

• 61: 64703af = 38: ce63dfd hash-object --stdin: verify that it works with >4GB/LLP64

• 47: 047a47f = 39: 352998e mingw: drop the -D_USE_32BIT_TIME_T option

• 35: 8bfbac6 = 40: 7d67e5b t5505/t5516: allow running without .git/branches/ in the templates

• 21: 3a06dcc = 41: 7734d49 strbuf_realpath(): use platform-dependent API if available

• 37: 45ce214 = 42: 186e2ba http: use new "best effort" strategy for Secure Channel revoke checking

• 63: ebcb1d0 = 43: 2b822df subtree: update contrib/subtree test target

• 64: c226356 = 44: 32d7da5 CMakeLists: add default "x64-windows" arch for Visual Studio

• 65: c223726 = 45: d361762 hash-object: add another >4GB/LLP64 test case

• 66: 9c75830 = 46: c36f40c setup: properly use "%(prefix)/" when in WSL

• 67: 99f22d8 = 47: 0319277 Add config option windows.appendAtomically

• 48: 1531076 = 48: d394ccb mingw: only use -Wl,--large-address-aware for 32-bit builds

• 38: ad8aee4 = 49: f2fada8 t5505/t5516: fix white-space around redirectors

• 69: 3e31b6e = 50: d022639 MinGW: link as terminal server aware

• 24: 47d3fe5 = 51: aab9a97 transport: optionally disable side-band-64k

• 25: 9a1d5b7 = 52: 8af6d23 mingw: fix fatal error working on mapped network drives on Windows

• 26: 68b6bc3 = 53: c16707e clink.pl: fix MSVC compile script to handle libcurl-d.lib

• 27: 6de9a58 = 54: f84cf3c mingw: implement a platform-specific strbuf_realpath()

• 39: e05e9c8 = 55: 226a3b1 t3701: verify that we can add lots of files interactively

• 40: de9505d = 56: d141ce6 commit: accept "scissors" with CR/LF line endings

• 41: ccc251e = 57: a0ca887 t0014: fix indentation

• 42: dffbc0c = 58: 5a51831 git-gui: accommodate for intent-to-add files

• 43: b2c6a76 = 59: 6cd8178 mingw: allow for longer paths in parse_interpreter()

• 44: ef18515 = 60: 0663d55 compat/vcbuild: document preferred way to build in Visual Studio

• 70: ae83585 = 61: bd1349e http: optionally send SSL client certificate

• 71: 44158f5 = 62: 1114dda ci: run contrib/subtree tests in CI builds

• 72: 8d51b08 = 63: 84f5ad0 CMake: show Win32 and Generator_platform build-option values

• 73: 8daa700 = 64: 9caab70 hash-object: add a >4GB/LLP64 test case using filtered input

• 74: 2903f0f = 65: 3eaeb3e compat/mingw.c: do not warn when failing to get owner

• 75: 16daa17 = 66: e4e29c4 mingw: $env:TERM="xterm-256color" for newer OSes

• 76: e05f6b6 = 67: 47cd6c3 winansi: check result and Buffer before using Name

• 77: 85162a1 = 68: e8978b7 mingw: change core.fsyncObjectFiles = 1 by default

• 78: 66c705a = 69: 207da7a Fix Windows version resources

• 79: 62adc10 = 70: 9f544dc status: fix for old-style submodules with commondir

• 49: 420730f = 71: 996949b mingw: avoid over-specifying --pic-executable

• 50: ae2f1ce = 72: 51b47a5 mingw: set the prefix and HOST_CPU as per MSYS2's settings

• 51: 83433e9 = 73: 0b35dfd mingw: only enable the MSYS2-specific stuff when compiling in MSYS2

• 52: 3436439 = 74: 6a98acb mingw: rely on MSYS2's metadata instead of hard-coding it

• 54: 2d51790 = 75: 4bc7157 mingw: always define ETC_* for MSYS2 environments

• 56: f60a692 = 76: c371aa5 max_tree_depth: lower it for clang builds in general on Windows

• 59: 9dde989 = 77: 2cc72a3 mingw: ensure valid CTYPE

• 80: a839f6a = 78: 37481c7 ci: work around a problem with HTTP/2 vs libcurl v8.10.0

• 62: 7f9c76e = 79: d1b060c mingw: allow git.exe to be used instead of the "Git wrapper"

• 81: 50296f7 = 80: 7430763 revision: create mark_trees_uninteresting_dense()

• 68: 5433864 = 81: 71be58f mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory

• 82: 0cabb06 = 82: ccf0ff1 survey: stub in new experimental 'git-survey' command

• 84: 78e29ec = 83: 2d8d785 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'

• 85: 7e579e7 = 84: fe1aa57 survey: add command line opts to select references

• 87: 25d6a54 = 85: 0e88248 clink.pl: fix libexpatd.lib link error when using MSVC

• 88: fc69d51 = 86: a2f22b2 survey: start pretty printing data in table form

• 90: a9617c7 = 87: bf51dfb Makefile: clean up .ilk files when MSVC=1

• 91: d97fc43 = 88: 30915bf survey: add object count summary

• 83: 31c41be = 89: 7d442d5 Merge 'remote-hg-prerequisites' into HEAD

• 93: 0ddf082 = 90: 85c6c51 vcbuild: add support for compiling Windows resource files

• 94: 684eb3a = 91: d2fd20c survey: summarize total sizes by object type

• 86: 1df9a0a = 92: 27ac62c Merge branch 'drive-prefix'

• 96: 224278d = 93: 6b1ba35 config.mak.uname: add git.rc to MSVC builds

• 97: f6706b9 = 94: 2e55e94 survey: show progress during object walk

• 98: d944b7a = 95: d410cae mingw: make sure errno is set correctly when socket operations fail

• 89: 6eba6c3 = 96: c99e60c Merge branch 'dont-clean-junctions'

• 100: bc20f68 = 97: fd78e15 clink.pl: ignore no-stack-protector arg on MSVC=1 builds

• 101: 60b0475 = 98: fb88cb8 http: optionally load libcurl lazily

• 102: 55344cc = 99: 801e3b2 survey: add ability to track prioritized lists

• 103: f0ee0dd = 100: e5bb4e6 compat/mingw: handle WSA errors in strerror

• 92: 32c5de2 = 101: 2a378bc Merge branch 'msys2-python'

• 105: 48e2877 = 102: 33cc42d clink.pl: move default linker options for MSVC=1 builds

• 106: bbe4daa = 103: 8df8897 http: support lazy-loading libcurl also on Windows

• 107: 4dcd725 = 104: 1125e00 survey: add report of "largest" paths

• 108: 7300fc2 = 105: 28159f5 compat/mingw: drop outdated comment

• 95: b5f5fc0 = 106: 9b23cfc Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)

• 110: cbdd617 = 107: 90e8794 cmake: install headless-git.

• 111: 1f288b8 = 108: 0232c31 http: when loading libcurl lazily, allow for multiple SSL backends

• 112: 7dd0b24 = 109: 99c3ca1 survey: add --top= option and config

• 113: 3fc7f4b = 110: 735a2af t0301: actually test credential-cache on Windows

• 99: 44c060a = 111: c75b5ef Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config

• 115: 32ba2e1 = 112: 6be40a1 git.rc: include winuser.h

• 116: 70516df = 113: db8f006 mingw: do load libcurl dynamically by default

• 117: 7b33200 = 114: 0f48df3 Add a GitHub workflow to verify that Git/Scalar work in Nano Server

• 118: 06669e3 = 115: 39f42f8 mingw: suggest windows.appendAtomically in more cases

• 119: c047c41 = 116: 4aad375 win32: use native ANSI sequence processing, if possible

• 120: e84dac8 = 117: 15054b9 common-main.c: fflush stdout buffer upon exit

• 121: f38e9cd = 118: 11e2673 t5601/t7406(mingw): do run tests with symlink support

• 122: 630680b = 119: bb5cb57 win32: ensure that localtime_r() is declared even in i686 builds

• 123: 8617eee = 120: 3648dfd Fallback to AppData if XDG_CONFIG_HOME is unset

• 124: 59dd026 = 121: 420e796 run-command: be helpful with Git LFS fails on Windows 7

• 125: 18c5cac = 122: b52dccc survey: clearly note the experimental nature in the output

• 126: d3bfec7 = 123: bc24d83 credential-cache: handle ECONNREFUSED gracefully

• 127: 722e0af = 124: a5fb0b3 reftable: do make sure to use custom allocators

• 128: 4d905d6 = 125: 775d944 check-whitespace: avoid alerts about upstream commits

• 129: 3defbf4 = 126: 5097829 t/t5571-prep-push-hook.sh: Add test with writing to stderr

• 104: d0a11b9 = 127: 283d58a Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master

• 109: 938f5e3 = 128: a74b000 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl

• 114: 80643ae = 129: 8546191 Merge pull request Handle git add <file> where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction

• 130: c3cbfa2 = 130: 1fa15cb Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort

• 131: 730dd6a = 131: f219e64 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master

• 132: 72a1fef = 132: 5dc3886 Merge 'add-p-many-files'

• 133: 680314c = 133: 0437b65 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors

• 134: 2235182 = 134: 8b17bd1 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info

• 135: be2c53c = 135: f8c88c0 Merge 'git-gui/js/intent-to-add'

• 136: 29cceca = 136: 8753484 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip

• 137: 0a6c5a9 = 137: e37951c Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support

• 138: 9f13220 = 138: 9859fe3 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu

• 139: 91716c7 = 139: 6355280 Merge pull request mingw: allow for longer paths in parse_interpreter() git#3165 from dscho/increase-allowed-length-of-interpreter-path

• 140: eaef64f = 140: 2576f5b Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore

• 141: d66a051 = 141: c6e95f0 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate

• 142: 1ad3527 = 142: 16ed8ab Merge pull request Add contrib/subtree test execution to CI builds git#3349 from vdye/feature/ci-subtree-tests

• 143: a691d3a = 143: dc6bcc7 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln

• 144: 541c595 = 144: 9663f2d Merge pull request Begin unsigned long->size_t conversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t

• 145: 032bfd6 = 145: 1e4bc80 Merge pull request Various fixes around safe.directory git#3791: Various fixes around safe.directory

• 146: f20e360 = 146: ef10d72 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term

• 147: a65e6cc = 147: 52be839 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty

• 148: b3aa4cf = 148: e4a0cd8 Merge branch 'optionally-dont-append-atomically-on-windows'

• 149: fb8ae10 = 149: d7e02f3 Merge branch 'fsync-object-files-always'

• 150: 9afc948 = 150: 28b0455 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware

• 151: 09c8241 = 151: 7809c23 Fix Windows version resources (Fix Windows version resources git#4092)

• 152: c390fef = 152: 8e55cdf Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)

• 153: 6225c60 = 153: 1540fb9 Skip linking the "dashed" git-<command>s for built-ins (Skip linking the "dashed" git-<command>s for built-ins git#4252)

• 154: 17c2bce = 154: 557a350 Add full mingw-w64-git (i.e. regular MSYS2 ecosystem) support (Add full mingw-w64-git (i.e. regular MSYS2 ecosystem) support git#5971)

• 155: b6757af = 155: 50d9aed Merge pull request Allow running Git directly from C:\Program Files\Git\mingw64\bin\git.exe git#2506 from dscho/issue-2283

• 156: 3f31d12 = 156: 0f00409 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless

• 157: b695747 = 157: e777433 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)

• 158: a9e9485 = 158: 4a4052a Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)

• 159: 70160df = 159: a95be67 Merge branch 'nano-server'

• 160: fabd190 = 160: 146129f Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)

• 161: 55542cd = 161: 059f840 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)

• 162: 5271e4c = 162: 07f065b common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)

• 163: 2bc9ce2 = 163: a8aa9b5 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'

• 164: 11723f0 = 164: c8e634d Merge branch 'Fix-i686-build-with-GCC-v14'

• 165: b8f3466 = 165: ed30cd3 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'

• 166: b749132 = 166: 32d749e Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'

• 167: 75fda9e = 167: 303e1cd pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)

• 168: a7ab9cd = 168: fd49ee7 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)

• 169: 843c85c = 169: 1a1277f Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)

• 170: a999e2f = 170: 3192156 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)

• 171: ad08373 = 171: 889b9dc Merge branch 'reftable-vs-custom-allocators'

• 172: 6b39840 = 172: 5c8e7fc Merge branch 'check-whitespace-only-downstream'

• 173: 6016ae8 = 173: f22e7a8 t/t5571-prep-push-hook.sh: Add test with writing to stderr (t/t5571-prep-push-hook.sh: Add test with writing to stderr git#6063)

• 174: 0677846 = 174: 21ede64 Merge branch 'ready-for-upstream'

• 175: c1ea1f1 = 175: 4479ac2 git-svn: mark it as unsupported by the Git for Windows project

• 176: 24f56b5 = 176: fb5033d ci(macos): skip the git p4 tests

• 177: 32ae80e = 177: 7c66bd4 git-svn: mark it as unsupported by the Git for Windows project (git-svn: mark it as unsupported by the Git for Windows project git#5923)

• 178: e4468f0 = 178: c37acc8 ci(macos): skip the git p4 tests (ci(macos): skip the git p4 tests git#5954)

• 179: 0dc4fc1 = 179: e6917da Win32: make FILETIME conversion functions public

• 180: 79271c8 = 180: 3351a3b Win32: dirent.c: Move opendir down

• 181: 4a4e5da = 181: 6ff85e4 mingw: make the dirent implementation pluggable

• 182: 0cd6278 = 182: 930d43f Win32: make the lstat implementation pluggable

• 183: 2f1470e = 183: c28e1c4 mingw: add infrastructure for read-only file system level caches

• 184: 8aaf417 = 184: d5035fe mingw: add a cache below mingw's lstat and dirent implementations

• 185: 762e205 = 185: 074c9a7 fscache: load directories only once

• 199: 1fc58ae = 186: 81ff99a git-gui--askyesno: fix funny text wrapping

• 186: 6a21019 = 187: 67751a9 fscache: add key for GIT_TRACE_FSCACHE

• 201: 5c59a8c = 188: 3384766 git-gui--askyesno (mingw): use Git for Windows' icon, if available

• 187: ba1f659 = 189: 4b5bee4 fscache: remember not-found directories

• 203: 7a4a287 = 190: a418b11 Merge branch 'git-gui-askyesno'

• 188: 8d4c4b8 = 191: 670d4f1 fscache: add a test for the dir-not-found optimization

• 189: 28576b1 = 192: 67f66fa add: use preload-index and fscache for performance

• 190: 8b865e7 = 193: 03b4636 dir.c: make add_excludes aware of fscache during status

• 191: bd8c47b = 194: 6af5dcf fscache: make fscache_enabled() public

• 192: eb1085d = 195: 014ba27 dir.c: regression fix for add_excludes with fscache

• 193: 0e8eace = 196: db564a5 fetch-pack.c: enable fscache for stats under .git/objects

• 194: 7ce18f0 = 197: 965225d checkout.c: enable fscache for checkout again

• 195: d492c46 = 198: 7071edd Enable the filesystem cache (fscache) in refresh_index().

• 196: 6f7d37b = 199: 854de71 fscache: use FindFirstFileExW to avoid retrieving the short name

• 197: 1cdc5c6 = 200: b13202c fscache: add GIT_TEST_FSCACHE support

• 198: 1a6b7d8 = 201: 116b1f1 fscache: add fscache hit statistics

• 200: ca04e13 = 202: 99b1ed4 unpack-trees: enable fscache for sparse-checkout

• 202: 7cc5cee = 203: 5601047 status: disable and free fscache at the end of the status command

• 204: 49d2e49 = 204: ffca416 mem_pool: add GIT_TRACE_MEMPOOL support

• 205: 0758e55 = 205: ca80ba4 fscache: fscache takes an initial size

• 206: 48c54ac = 206: 98fc9d5 fscache: update fscache to be thread specific instead of global

• 207: 78b55e2 = 207: 81ac682 fscache: teach fscache to use mempool

• 208: 3c391a2 = 208: a8788b4 fscache: make fscache_enable() thread safe

• 209: c9950f4 = 209: d28e59c fscache: teach fscache to use NtQueryDirectoryFile

• 210: 82b2aa0 = 210: a6a873c fscache: remember the reparse tag for each entry

• 211: d2205bd = 211: d832b89 Merge branch 'fscache'

• 212: 2da6c79 = 212: 02de0a9 fscache: implement an FSCache-aware is_mount_point()

• 213: 6a9cc7f = 213: 8daa441 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw

• 214: 14dd191 = 214: bdc58cd clean: make use of FSCache

• 215: 3003071 = 215: bff2fee Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'

• 216: 154c3a4 = 216: e7bf4a3 Merge branch 'dont-clean-junctions-fscache'

• 217: 6d9829b = 217: 2a1508d pack-objects (mingw): demonstrate a segmentation fault with large deltas

• 218: 06388ff = 218: 2611757 mingw: support long paths

• 219: a85ce6d = 219: 555b1d6 win32(long path support): leave drive-less absolute paths intact

• 220: aa3bd9c = 220: c85a240 compat/fsmonitor/fsm-*-win32: support long paths

• 221: 4b5baf4 = 221: 0ae46e3 clean: suggest using core.longPaths if paths are too long to remove

• 222: 8a76add = 222: 6fb26d0 mingw: Support git_terminal_prompt with more terminals

• 223: cc40de8 = 223: eadf0cf compat/terminal.c: only use the Windows console if bash 'read -r' fails

• 224: 418d374 = 224: 45c3497 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method

• 225: 584ff29 = 225: b29629a Win32: symlink: move phantom symlink creation to a separate function

• 226: 7b09fda = 226: 2acc53f Introduce helper to create symlinks that knows about index_state

• 227: e14c1c0 = 227: 72df00c mingw: allow to specify the symlink type in .gitattributes

• 228: 8bbbaf1 = 228: 82b5285 Win32: symlink: add test for symlink attribute

• 229: 8ba7f77 = 229: fad3a4f mingw: explicitly specify with which cmd to prefix the cmdline

• 230: c38a0fb = 230: 3cd6990 mingw: when path_lookup() failed, try BusyBox

• 231: 34224b3 = 231: 92d14e8 test-tool: learn to act as a drop-in replacement for iconv

• 232: cd88360 = 232: 1fb09d0 tests(mingw): if iconv is unavailable, use test-helper --iconv

• 233: 01de596 = 233: d828185 gitattributes: mark .png files as binary

• 234: cd00396 = 234: 0f2509f tests: move test PNGs into t/lib-diff/

• 235: b61edd2 = 235: d2b7237 tests: only override sort & find if there are usable ones in /usr/bin/

• 236: 0059657 = 236: 81c8e77 tests: use the correct path separator with BusyBox

• 237: 7e947fc = 237: 299b11c mingw: only use Bash-ism builtin pwd -W when available

• 238: d3405e1 = 238: 5e8f8a0 tests (mingw): remove Bash-specific pwd option

• 241: ffb7f02 = 239: 5daaa4e mingw: introduce code to detect whether we're inside a Windows container

• 239: 4f552c8 = 240: 2ef0e1a test-lib: add BUSYBOX prerequisite

• 243: b3e7b11 = 241: 0f39299 mingw: when running in a Windows container, try to rename() harder

• 240: f4b86a7 = 242: c55479c t5003: use binary file from t/lib-diff/

• 245: 1dda4c2 = 243: f687771 mingw: move the file_attr_to_st_mode() function definition

• 242: d9c6dbb = 244: 60bcf0d t5532: workaround for BusyBox on Windows

• 247: f3b2049 = 245: d15f606 mingw: Windows Docker volumes are not symbolic links

• 244: a9d52c6 = 246: 6b21b04 t5605: special-case hardlink test for BusyBox-w32

• 249: fdbfde7 = 247: d70cefc mingw: work around rename() failing on a read-only file

• 252: f69ddac = 248: 90944ed Merge branch 'gitk-and-git-gui-patches'

• 253: f7faeea = 249: 2a96dc9 Merge branch 'long-paths'

• 254: c65d223 = 250: c3a5c8d Merge branch 'msys2'

• 255: 2531965 = 251: 5cb0743 Merge 'docker-volumes-are-no-symlinks'

• 246: b2a5fca = 252: ddb8290 t5813: allow for $PWD to be a Windows path

• 256: 0c6b525 = 253: 9998d1e mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)

• 248: d2354f0 = 254: 0ff3b1d t9200: skip tests when $PWD contains a colon

• 257: 6e73d79 = 255: 5f50bce Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr

• 258: a81d827 = 256: c828ba7 Describe Git for Windows' architecture [no ci]

• 250: 9e164de = 257: e3a1d4a mingw: kill child processes in a gentler way

• 251: 27d34c3 = 258: e50a822 mingw: optionally enable wsl compability file mode bits

• 259: 10e0f13 = 259: 01e69db Merge branch 'busybox-w32'

• 260: 26d41ee = 260: 9acc816 Modify the Code of Conduct for Git for Windows

• 261: e383ea6 = 261: 6ab1758 mingw: really handle SIGINT

• 262: cf3f116 = 262: 848aadd Merge branch 'wsl-file-mode-bits'

• 263: db839f4 = 263: 9e8827f CONTRIBUTING.md: add guide for first-time contributors

• 264: e21cde5 = 264: 7be891d Partially un-revert "editor: save and reset terminal after calling EDITOR"

• 265: 6f2fbe9 = 265: daf49d5 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process

• 266: 31bf452 = 266: be6d9c7 README.md: Add a Windows-specific preamble

• 267: a0428c8 = 267: 36388cc reset: reinstate support for the deprecated --stdin option

• 268: 6c3cc8c = 268: 9789163 Merge branch 'un-revert-editor-save-and-reset'

• 269: 1862ddb = 269: 8c6c119 Add an issue template

• 270: 1b168ab = 270: 782e404 Add a GitHub workflow to monitor component updates

• 271: db909d8 = 271: 314ebcc fsmonitor: reintroduce core.useBuiltinFSMonitor

• 272: bddc774 = 272: b7384be Merge branch 'phase-out-reset-stdin'

• 273: cc1b5bf = 273: f5e2f0f Modify the GitHub Pull Request template (to reflect Git for Windows)

• 274: f5a8891 = 274: 7aed7ac dependabot: help keeping GitHub Actions versions up to date

• 275: 36bfc3b = 275: 1163ac5 Merge branch 'deprecate-core.useBuiltinFSMonitor'

• 276: 710ef1a = 276: 6f82964 SECURITY.md: document Git for Windows' policies

• 277: d434e98 = 277: 9c2cdac Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates

• 278: cfdc713 = 278: 752df9a Merge 'readme' into HEAD

• 279: 72f281a ! 279: 6c29d74 Merge branch 'disallow-ntlm-auth-by-default'

  @@ http.c: static CURL *get_curl_handle(void)
    #ifdef CURLGSSAPI_DELEGATION_FLAG
    	if (curl_deleg) {
   @@ http.c: void http_init(struct remote *remote, const char *url, int proactive_auth)
  + 	set_long_from_env(&http_retry_after, "GIT_HTTP_RETRY_AFTER");
    	set_long_from_env(&http_max_retries, "GIT_HTTP_MAX_RETRIES");
    	set_long_from_env(&http_max_retry_time, "GIT_HTTP_MAX_RETRY_TIME");
  - 
   +	http_auth_methods = http_auth_any;
  -+
  + 
    	curl_default = get_curl_handle();
    }
  - 
   @@ http.c: static int handle_curl_result(struct slot_results *results)
    	} else if (missing_target(results))
    		return HTTP_MISSING_TARGET;

• 280: 4dea3d5 = 280: 65a6ef1 osx-clang: work around Homebrew's clang lacking REG_ENHANCED

• 281: 2f6e61a = 281: 9fa7afe http: fix bug in ntlm_allow=1 handling

• 282: 9d7773b = 282: 68266f0 http: fix bug in ntlm_allow=1 handling (http: fix bug in ntlm_allow=1 handling git#6136)

• 283: be7a575 = 283: 2f25634 fixup! git-svn: mark it as unsupported by the Git for Windows project

• 284: 973552e = 284: ff1dd09 git svn: remove deprecation note (since it is no longer included in Git for Windows, anyway) (git svn: remove deprecation note (since it is no longer included in Git for Windows, anyway) git#6142)

• 285: 53737c7 ! 285: cd0c27a mingw: use strftime() directly in UCRT builds (mingw: use strftime() directly in UCRT builds git#6130)

  @@ git-svn.perl: sub term_init {
    for (my $i = 0; $i < @ARGV; $i++) {
    	if (defined $cmd{$ARGV[$i]}) {
   
  + ## http.c ##
  +@@ http.c: static long http_retry_after = 0;
  + static long http_max_retries = 0;
  + static long http_max_retry_time = 300;
  + 
  ++
  + /*
  +  * With the backend being set to `schannel`, setting sslCAinfo would override
  +  * the Certificate Store in cURL v7.60.0 and later, which is not what we want
  +
    ## t/t9108-git-svn-glob.sh ##
   @@ t/t9108-git-svn-glob.sh: test_expect_success 'test disallow multi-globs' '
    		svn_cmd commit -m "try to try"

• 286: 3b6235f = 286: 90176b1 dir: do not traverse mount points

• 287: 8279c02 = 287: 81cfb41 Don't traverse mount points in remove_dir_recurse() (Don't traverse mount points in remove_dir_recurse() git#6151)