Skip to content

Rebase shears/main: 1 conflict(s) (0 skipped, 1 resolved) (#24168314048)#108

Open
gitforwindowshelper[bot] wants to merge 284 commits intobase/shears/main-24168314048from
shears/main-24168314048
Open

Rebase shears/main: 1 conflict(s) (0 skipped, 1 resolved) (#24168314048)#108
gitforwindowshelper[bot] wants to merge 284 commits intobase/shears/main-24168314048from
shears/main-24168314048

Conversation

@gitforwindowshelper
Copy link
Copy Markdown

@gitforwindowshelper gitforwindowshelper bot commented Apr 9, 2026

Workflow run

Rebase Summary: main

From: 8aeb81fa23 (Detect number of cores better on multi-socket systems (git-for-windows#6108), 2026-04-06) (fffb57cf82..8aeb81fa23)

Resolved: 8aeb81f (Detect number of cores better on multi-socket systems (git-for-windows#6108), 2026-04-06)

resolved all 5 files by taking HEAD's version, matching original merge's resolution pattern of preserving first parent's content

Range-diff

  • 1: 8aeb81f ! 1: 14b0fc7 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)

    @@ Commit message
     but I don't have access to such hardware and the hypervisor I use
     apparently can't emulate that either.
 
- ## 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 babccfe50f..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;
+-<<<<<<< 8d2750ec78 (Merge 'readme' into HEAD)
+ 	struct interactive_options interactive_opts = INTERACTIVE_OPTIONS_INIT;
+-=======
+-	struct add_p_opt add_p_opt = ADD_P_OPT_INIT;
+->>>>>>> 5ce2b45bb3 (win32: thread-utils: handle multi-socket systems)
+ 	int nul_term_line = 0, read_from_stdin = 0;
+ 	const struct option options[] = {
+ 		OPT__QUIET(&quiet, N_("be quiet, only report errors")),
 
- ## git-svn.perl ##
-@@ git-svn.perl: sub term_init {
- 			: new Term::ReadLine 'git-svn';
- }
+ ## git-curl-compat.h ##
+ remerge CONFLICT (content): Merge conflict in git-curl-compat.h
+ index 4cce34ed64..5c8ceb076a 100644
+ --- git-curl-compat.h
+ +++ git-curl-compat.h
+@@
+ #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."
-+);
-+
- my $cmd;
- for (my $i = 0; $i < @ARGV; $i++) {
- 	if (defined $cmd{$ARGV[$i]}) {
-
- ## 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
- 	'
+ /**
+-<<<<<<< 8d2750ec78 (Merge 'readme' into HEAD)
+  * CURLINFO_RETRY_AFTER was added in 7.66.0, released in September 2019.
+  * It allows curl to automatically parse Retry-After headers.
+  */
+@@
+ #endif
  
- test_done
+ /**
+-=======
+->>>>>>> 5ce2b45bb3 (win32: thread-utils: handle multi-socket systems)
+  * CURLSSLOPT_AUTO_CLIENT_CERT was added in 7.77.0, released in May
+  * 2021.
+  */
 
- ## 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
- 	'
+ ## http.c ##
+ remerge CONFLICT (content): Merge conflict in http.c
+ index 22612259d4..5bc2ad8b87 100644
+ --- http.c
+ +++ http.c
+@@ http.c: static long http_schannel_check_revoke_mode =
+ 	CURLSSLOPT_NO_REVOKE;
+ #endif
  
- test_done
-
- ## 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
- 	'
+-<<<<<<< 8d2750ec78 (Merge 'readme' into HEAD)
+ static long http_retry_after = 0;
+ static long http_max_retries = 0;
+ static long http_max_retry_time = 300;
  
- test_done
+-=======
+->>>>>>> 5ce2b45bb3 (win32: thread-utils: handle multi-socket systems)
+ /*
+  * 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
 
- ## thread-utils.c ##
-@@ thread-utils.c: int online_cpus(void)
- #endif
+ ## refs/reftable-backend.c ##
+ remerge CONFLICT (content): Merge conflict in refs/reftable-backend.c
+ index 2a3e72a8f6..2f438385da 100644
+ --- refs/reftable-backend.c
+ +++ refs/reftable-backend.c
+@@ refs/reftable-backend.c: static struct ref_store *reftable_be_init(struct repository *repo,
+ 	umask(mask);
  
- #ifdef GIT_WINDOWS_NATIVE
--	SYSTEM_INFO info;
--	GetSystemInfo(&info);
--
--	if ((int)info.dwNumberOfProcessors > 0)
--		return (int)info.dwNumberOfProcessors;
-+	DWORD len = 0;
-+	if (!GetLogicalProcessorInformationEx(RelationProcessorCore, NULL, &len) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
-+		uint8_t *buf = malloc(len);
-+		if (buf) {
-+			if (GetLogicalProcessorInformationEx(RelationProcessorCore, (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX) buf, &len)) {
-+				DWORD offset = 0;
-+				int n_cores = 0;
-+				while (offset < len) {
-+					PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX info = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX) (buf + offset);
-+					offset += info->Size;
-+					/* The threads within a core always share a single group. We need to count the bits in the mask to get a thread count. */
-+					for (KAFFINITY mask = info->Processor.GroupMask[0].Mask; mask; mask >>= 1)
-+						n_cores += mask &1;
-+				}
-+				if (n_cores) {
-+					free(buf);
-+					return n_cores;
-+				}
-+			}
-+			free(buf);
-+		}
-+	}
- #elif defined(hpux) || defined(__hpux) || defined(_hpux)
- 	struct pst_dynamic psd;
+ 	reftable_set_alloc(malloc, realloc, free);
+-<<<<<<< 8d2750ec78 (Merge 'readme' into HEAD)
  
+ 	refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir,
+ 					 &ref_common_dir);
+ 
+ 	base_ref_store_init(&refs->base, repo, refdir.buf, &refs_be_reftable);
+-=======
+-	base_ref_store_init(&refs->base, repo, gitdir, &refs_be_reftable);
+->>>>>>> 5ce2b45bb3 (win32: thread-utils: handle multi-socket systems)
+ 	strmap_init(&refs->worktree_backends);
+ 	refs->store_flags = store_flags;
+ 	refs->log_all_ref_updates = repo_settings_get_log_all_ref_updates(repo);
+
+ ## t/meson.build ##
+ remerge CONFLICT (content): Merge conflict in t/meson.build
+ index e2b790bc8f..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',
+-<<<<<<< 8d2750ec78 (Merge 'readme' into HEAD)
+   't7425-submodule-gitdir-path-extension.sh',
+   't7426-submodule-get-default-remote.sh',
+-=======
+->>>>>>> 5ce2b45bb3 (win32: thread-utils: handle multi-socket systems)
+   't7429-submodule-long-path.sh',
+   't7450-bad-git-dotfiles.sh',
+   't7500-commit-template-squash-signoff.sh',

To: 14b0fc702f (Detect number of cores better on multi-socket systems (git-for-windows#6108), 2026-04-06) (4316ce596a..14b0fc702f)

Statistics

Metric Count
Total conflicts 1
Skipped (upstreamed) 0
Resolved surgically 1
Range-diff (click to expand)

PhilipOakley and others added 30 commits April 9, 2026 02:03
@PhilipOakley
CMakeLists: add default "x64-windows" arch for Visual Studio
ddff42e 
In Git-for-Windows, work on using ARM64 has progressed. The
commit 2d94b77 (cmake: allow building for Windows/ARM64, 2020-12-04)
failed to notice that /compat/vcbuild/vcpkg_install.bat will default to
using the "x64-windows" architecture for the vcpkg installation if not set,
but CMake is not told of this default. Commit 635b6d9 (vcbuild: install
ARM64 dependencies when building ARM64 binaries, 2020-01-31) later updated
vcpkg_install.bat to accept an arch (%1) parameter, but retained the default.

This default is neccessary for the use case where the project directory is
opened directly in Visual Studio, which will find and build a CMakeLists.txt
file without any parameters, thus expecting use of the default setting.

Also Visual studio will generate internal .sln solution and .vcxproj project
files needed for some extension tools. Inform users of the additional
.sln/.vcxproj generation.

** How to test:
 rm -rf '.vs' # remove old visual studio settings
 rm -rf 'compat/vcbuild/vcpkg' # remove any vcpkg downloads
 rm -rf 'contrib/buildsystems/out' # remove builds & CMake artifacts
 with a fresh Visual Studio Community Edition, File>>Open>>(git *folder*)
   to load the project (which will take some time!).
 check for successful compilation.
The implicit .sln (etc.) are in the hidden .vs directory created by
Visual Studio.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
@PhilipOakley
hash-object: add another >4GB/LLP64 test case
752c364 
To complement the `--stdin` and `--literally` test cases that verify
that we can hash files larger than 4GB on 64-bit platforms using the
LLP64 data model, here is a test case that exercises `hash-object`
_without_ any options.

Just as before, we use the `big` file from the previous test case if it
exists to save on setup time, otherwise generate it.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@derrickstolee
setup: properly use "%(prefix)/" when in WSL
60ec10f 
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
@dscho
mingw: include the Python parts in the build
d1f8c87 
While Git for Windows does not _ship_ Python (in order to save on
bandwidth), MSYS2 provides very fine Python interpreters that users can
easily take advantage of, by using Git for Windows within its SDK.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
mingw: use mimalloc
e90e8a2 
Thorough benchmarking with repacking a subset of linux.git (the commit
history reachable from 93a6fef ([PATCH] fix the SYSCTL=n compilation,
2007-02-28), to be precise) suggest that this allocator is on par, in
multi-threaded situations maybe even better than nedmalloc:

`git repack -adfq` with mimalloc, 8 threads:

31.166991900 27.576763800 28.712311000 27.373859000 27.163141900

`git repack -adfq` with nedmalloc, 8 threads:

31.915032900 27.149883100 28.244933700 27.240188800 28.580849500

In a different test using GitHub Actions build agents (probably
single-threaded, a core-strength of nedmalloc)):

`git repack -q -d -l -A --unpack-unreachable=2.weeks.ago` with mimalloc:

943.426 978.500 939.709 959.811 954.605

`git repack -q -d -l -A --unpack-unreachable=2.weeks.ago` with nedmalloc:

995.383 952.179 943.253 963.043 980.468

While these measurements were not executed with complete scientific
rigor, as no hardware was set aside specifically for these benchmarks,
it shows that mimalloc and nedmalloc perform almost the same, nedmalloc
with a bit higher variance and also slightly higher average (further
testing suggests that nedmalloc performs worse in multi-threaded
situations than in single-threaded ones).

In short: mimalloc seems to be slightly better suited for our purposes
than nedmalloc.

Seeing that mimalloc is developed actively, while nedmalloc ceased to
see any updates in eight years, let's use mimalloc on Windows instead.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@t-b
transport: optionally disable side-band-64k
110c415 
Since commit 0c499ea (send-pack: demultiplex a sideband stream with
status data, 2010-02-05) the send-pack builtin uses the side-band-64k
capability if advertised by the server.

Unfortunately this breaks pushing over the dump git protocol if used
over a network connection.

The detailed reasons for this breakage are (by courtesy of Jeff Preshing,
quoted from https://groups.google.com/d/msg/msysgit/at8D7J-h7mw/eaLujILGUWoJ):

	MinGW wraps Windows sockets in CRT file descriptors in order to
	mimic the functionality of POSIX sockets. This causes msvcrt.dll
	to treat sockets as Installable File System (IFS) handles,
	calling ReadFile, WriteFile, DuplicateHandle and CloseHandle on
	them. This approach works well in simple cases on recent
	versions of Windows, but does not support all usage patterns. In
	particular, using this approach, any attempt to read & write
	concurrently on the same socket (from one or more processes)
	will deadlock in a scenario where the read waits for a response
	from the server which is only invoked after the write. This is
	what send_pack currently attempts to do in the use_sideband
	codepath.

The new config option `sendpack.sideband` allows to override the
side-band-64k capability of the server, and thus makes the dumb git
protocol work.

Other transportation methods like ssh and http/https still benefit from
the sideband channel, therefore the default value of `sendpack.sideband`
is still true.

Signed-off-by: Thomas Braun <thomas.braun@byte-physics.de>
Signed-off-by: Oliver Schneider <oliver@assarbad.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@bmueller84
mingw: fix fatal error working on mapped network drives on Windows
684729d 
In 1e64d18 (mingw: do resolve symlinks in `getcwd()`) a problem was
introduced that causes git for Windows to stop working with certain
mapped network drives (in particular, drives that are mapped to
locations with long path names). Error message was "fatal: Unable to
read current working directory: No such file or directory". Present
change fixes this issue as discussed in
git-for-windows#2480

Signed-off-by: Bjoern Mueller <bjoernm@gmx.de>
@jeffhostetler
clink.pl: fix MSVC compile script to handle libcurl-d.lib
9c3cb62 
Update clink.pl to link with either libcurl.lib or libcurl-d.lib
depending on whether DEBUG=1 is set.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
mingw: implement a platform-specific strbuf_realpath()
22baded 
There is a Win32 API function to resolve symbolic links, and we can use
that instead of resolving them manually. Even better, this function also
resolves NTFS junction points (which are somewhat similar to bind
mounts).

This fixes git-for-windows#2481.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
http: use new "best effort" strategy for Secure Channel revoke checking
87de6d0 
The native Windows HTTPS backend is based on Secure Channel which lets
the caller decide how to handle revocation checking problems caused by
missing information in the certificate or offline CRL distribution
points.

Unfortunately, cURL chose to handle these problems differently than
OpenSSL by default: while OpenSSL happily ignores those problems
(essentially saying "¯\_(ツ)_/¯"), the Secure Channel backend will error
out instead.

As a remedy, the "no revoke" mode was introduced, which turns off
revocation checking altogether. This is a bit heavy-handed. We support
this via the `http.schannelCheckRevoke` setting.

In curl/curl#4981, we contributed an opt-in
"best effort" strategy that emulates what OpenSSL seems to do.

In Git for Windows, we actually want this to be the default. This patch
makes it so, introducing it as a new value for the
`http.schannelCheckRevoke" setting, which now becmes a tristate: it
accepts the values "false", "true" or "best-effort" (defaulting to the
last one).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
t5505/t5516: fix white-space around redirectors
8dd0fee 
The convention in Git project's shell scripts is to have white-space
_before_, but not _after_ the `>` (or `<`).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
t3701: verify that we can add *lots* of files interactively
98fd173 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@lbonanomi
commit: accept "scissors" with CR/LF line endings
7574c91 
This change enhances `git commit --cleanup=scissors` by detecting
scissors lines ending in either LF (UNIX-style) or CR/LF (DOS-style).

Regression tests are included to specifically test for trailing
comments after a CR/LF-terminated scissors line.

Signed-off-by: Luke Bonanomi <lbonanomi@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@jglathe
t0014: fix indentation
b53656f 
For some reason, this test case was indented with 4 spaces instead of 1
horizontal tab. The other test cases in the same test script are fine.

Signed-off-by: Jens Glathe <jens.glathe@oldschoolsolutions.biz>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
git-gui: accommodate for intent-to-add files
c1b4dd4 
As of Git v2.28.0, the diff for files staged via `git add -N` marks them
as new files. Git GUI was ill-prepared for that, and this patch teaches
Git GUI about them.

Please note that this will not even fix things with v2.28.0, as the
`rp/apply-cached-with-i-t-a` patches are required on Git's side, too.

This fixes git-for-windows#2779

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
@PhilipOakley
vcpkg_install: add comment regarding slow network connections
4cc6a3f 
The vcpkg downloads may not succeed. Warn careful readers of the time out.

A simple retry will usually resolve the issue.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dennisameling
Add schannel to curl installation
7d44229 
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
@dennisameling
cmake(): allow setting HOST_CPU for cross-compilation
01fe138 
Git's regular Makefile mentions that HOST_CPU should be defined when cross-compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L438-L439

This is then used to set the GIT_HOST_CPU variable when compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L1337-L1341

Then, when the user runs `git version --build-options`, it returns that value: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/help.c#L658

This commit adds the same functionality to the CMake configuration. Users can now set -DHOST_CPU= to set the target architecture.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
@dscho
mingw: allow for longer paths in parse_interpreter()
0652d00 
As reported in newren/git-filter-repo#225, it
looks like 99 bytes is not really sufficient to represent e.g. the full
path to Python when installed via Windows Store (and this path is used
in the hasb bang line when installing scripts via `pip`).

Let's increase it to what is probably the maximum sensible path size:
MAX_PATH. This makes `parse_interpreter()` in line with what
`lookup_prog()` handles.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Vilius Šumskas <vilius@sumskas.eu>
@dscho
compat/vcbuild: document preferred way to build in Visual Studio
b807d1b 
We used to have that `make vcxproj` hack, but a hack it is. In the
meantime, we have a much cleaner solution: using CMake, either
explicitly, or even more conveniently via Visual Studio's built-in CMake
support (simply open Git's top-level directory via File>Open>Folder...).

Let's let the `README` reflect this.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@pascalmuller
http: optionally send SSL client certificate
1af3dec 
This adds support for a new http.sslAutoClientCert config value.

In cURL 7.77 or later the schannel backend does not automatically send
client certificates from the Windows Certificate Store anymore.

This config value is only used if http.sslBackend is set to "schannel",
and can be used to opt in to the old behavior and force cURL to send
client certificates.

This fixes git-for-windows#3292

Signed-off-by: Pascal Muller <pascalmuller@gmail.com>
@vdye
ci: run contrib/subtree tests in CI builds
7eb85a4 
Because `git subtree` (unlike most other `contrib` modules) is included as
part of the standard release of Git for Windows, its stability should be
verified as consistently as it is for the rest of git. By including the
`git subtree` tests in the CI workflow, these tests are as much of a gate to
merging and indicator of stability as the standard test suite.

Signed-off-by: Victoria Dye <vdye@github.com>
@PhilipOakley
CMake: show Win32 and Generator_platform build-option values
f98f30f 
Ensure key CMake option values are part of the CMake output to
facilitate user support when tool updates impact the wider CMake
actions, particularly ongoing 'improvements' in Visual Studio.

These CMake displays perform the same function as the build-options.txt
provided in the main Git for Windows. CMake is already chatty.
The setting of CMAKE_EXPORT_COMPILE_COMMANDS is also reported.

Include the environment's CMAKE_EXPORT_COMPILE_COMMANDS value which
may have been propogated to CMake's internal value.

Testing the CMAKE_EXPORT_COMPILE_COMMANDS processing can be difficult
in the Visual Studio environment, as it may be cached in many places.
The 'environment' may include the OS, the user shell, CMake's
own environment, along with the Visual Studio presets and caches.

See previous commit for arefacts that need removing for a clean test.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
@PhilipOakley
hash-object: add a >4GB/LLP64 test case using filtered input
58bccec 
To verify that the `clean` side of the `clean`/`smudge` filter code is
correct with regards to LLP64 (read: to ensure that `size_t` is used
instead of `unsigned long`), here is a test case using a trivial filter,
specifically _not_ writing anything to the object store to limit the
scope of the test case.

As in previous commits, the `big` file from previous test cases is
reused if available, to save setup time, otherwise re-generated.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@derrickstolee
compat/mingw.c: do not warn when failing to get owner
d3a4eae 
In the case of Git for Windows (say, in a Git Bash window) running in a
Windows Subsystem for Linux (WSL) directory, the GetNamedSecurityInfoW()
call in is_path_owned_By_current_side() returns an error code other than
ERROR_SUCCESS. This is consistent behavior across this boundary.

In these cases, the owner would always be different because the WSL
owner is a different entity than the Windows user.

The change here is to suppress the error message that looks like this:

  error: failed to get owner for '//wsl.localhost/...' (1)

Before this change, this warning happens for every Git command,
regardless of whether the directory is marked with safe.directory.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
@rkitover
mingw: $env:TERM="xterm-256color" for newer OSes
bbb1fa4 
For Windows builds >= 15063 set $env:TERM to "xterm-256color" instead of
"cygwin" because they have a more capable console system that supports
this. Also set $env:COLORTERM="truecolor" if unset.

$env:TERM is initialized so that ANSI colors in color.c work, see
29a3963 (Win32: patch Windows environment on startup, 2012-01-15).

See git-for-windows#3629 regarding problems caused by always setting
$env:TERM="cygwin".

This is the same heuristic used by the Cygwin runtime.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@1480c1
winansi: check result and Buffer before using Name
b7f0184 
NtQueryObject under Wine can return a success but fill out no name.
In those situations, Wine will set Buffer to NULL, and set result to
the sizeof(OBJECT_NAME_INFORMATION).

Running a command such as

echo "$(git.exe --version 2>/dev/null)"

will crash due to a NULL pointer dereference when the code attempts to
null terminate the buffer, although, weirdly, removing the subshell or
redirecting stdout to a file will not trigger the crash.

Code has been added to also check Buffer and Length to ensure the check
is as robust as possible due to the current behavior being fragile at
best, and could potentially change in the future

This code is based on the behavior of NtQueryObject under wine and
reactos.

Signed-off-by: Christopher Degawa <ccom@randomderp.com>
@sunzhuoshi @dscho
Add config option windows.appendAtomically
d150ca2 
Atomic append on windows is only supported on local disk files, and it may
cause errors in other situations, e.g. network file system. If that is the
case, this config option should be used to turn atomic append off.

Co-Authored-By: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: 孙卓识 <sunzhuoshi@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
mingw: change core.fsyncObjectFiles = 1 by default
4f06f5d 
From the documentation of said setting:

	This boolean will enable fsync() when writing object files.

	This is a total waste of time and effort on a filesystem that
	orders data writes properly, but can be useful for filesystems
	that do not use journalling (traditional UNIX filesystems) or
	that only journal metadata and not file contents (OS X’s HFS+,
	or Linux ext3 with "data=writeback").

The most common file system on Windows (NTFS) does not guarantee that
order, therefore a sudden loss of power (or any other event causing an
unclean shutdown) would cause corrupt files (i.e. files filled with
NULs). Therefore we need to change the default.

Note that the documentation makes it sound as if this causes really bad
performance. In reality, writing loose objects is something that is done
only rarely, and only a handful of files at a time.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@rimrul
MinGW: link as terminal server aware
7b8d8b5 
Whith Windows 2000, Microsoft introduced a flag to the PE header to mark executables as
"terminal server aware". Windows terminal servers provide a redirected Windows directory and
redirected registry hives when launching legacy applications without this flag set. Since we
do not use any INI files in the Windows directory and don't write to the registry, we don't
need  this additional preparation. Telling the OS that we don't need this should provide
slightly improved startup times in terminal server environments.

When building for supported Windows Versions with MSVC the /TSAWARE linker flag is
automatically set, but MinGW requires us to set the --tsaware flag manually.

This partially addresses git-for-windows#3935.

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
dscho and others added 30 commits April 9, 2026 02:03
@dscho
Describe Git for Windows' architecture [no ci]
7d441d2 
The Git for Windows project has grown quite complex over the years,
certainly much more complex than during the first years where the
`msysgit.git` repository was abusing Git for package management purposes
and the `git/git` fork was called `4msysgit.git`.

Let's describe the status quo in a thorough way.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
t5605: special-case hardlink test for BusyBox-w32
6e381c0 
When t5605 tries to verify that files are hardlinked (or that they are
not), it uses the `-links` option of the `find` utility.

BusyBox' implementation does not support that option, and BusyBox-w32's
lstat() does not even report the number of hard links correctly (for
performance reasons).

So let's just switch to a different method that actually works on
Windows.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge 'docker-volumes-are-no-symlinks'
51f879f 
This was pull request git-for-windows#1645 from ZCube/master

Support windows container.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Modify the Code of Conduct for Git for Windows
111284e 
The Git project followed Git for Windows' lead and added their Code of
Conduct, based on the Contributor Covenant v1.4, later updated to v2.0.

We adapt it slightly to Git for Windows.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
t5813: allow for $PWD to be a Windows path
f0d4781 
Git for Windows uses MSYS2's Bash to run the test suite, which comes
with benefits but also at a heavy price: on the plus side, MSYS2's
POSIX emulation layer allows us to continue pretending that we are on a
Unix system, e.g. use Unix paths instead of Windows ones, yet this is
bought at a rather noticeable performance penalty.

There *are* some more native ports of Unix shells out there, though,
most notably BusyBox-w32's ash. These native ports do not use any POSIX
emulation layer (or at most a *very* thin one, choosing to avoid
features such as fork() that are expensive to emulate on Windows), and
they use native Windows paths (usually with forward slashes instead of
backslashes, which is perfectly legal in almost all use cases).

And here comes the problem: with a $PWD looking like, say,
C:/git-sdk-64/usr/src/git/t/trash directory.t5813-proto-disable-ssh
Git's test scripts get quite a bit confused, as their assumptions have
been shattered. Not only does this path contain a colon (oh no!), it
also does not start with a slash.

This is a problem e.g. when constructing a URL as t5813 does it:
ssh://remote$PWD. Not only is it impossible to separate the "host" from
the path with a $PWD as above, even prefixing $PWD by a slash won't
work, as /C:/git-sdk-64/... is not a valid path.

As a workaround, detect when $PWD does not start with a slash on
Windows, and simply strip the drive prefix, using an obscure feature of
Windows paths: if an absolute Windows path starts with a slash, it is
implicitly prefixed by the drive prefix of the current directory. As we
are talking about the current directory here, anyway, that strategy
works.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
mingw: try resetting the read-only bit if rename fails (git-for-windo…
f1f8aff 
…ws#4527)

With this patch, Git for Windows works as intended on mounted APFS
volumes (where renaming read-only files would fail).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@derrickstolee
CONTRIBUTING.md: add guide for first-time contributors
16f119d 
Getting started contributing to Git can be difficult on a Windows
machine. CONTRIBUTING.md contains a guide to getting started, including
detailed steps for setting up build tools, running tests, and
submitting patches to upstream.

[includes an example by Pratik Karki how to submit v2, v3, v4, etc.]

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
@dscho
t9200: skip tests when $PWD contains a colon
d2e9190 
On Windows, the current working directory is pretty much guaranteed to
contain a colon. If we feed that path to CVS, it mistakes it for a
separator between host and port, though.

This has not been a problem so far because Git for Windows uses MSYS2's
Bash using a POSIX emulation layer that also pretends that the current
directory is a Unix path (at least as long as we're in a shell script).

However, that is rather limiting, as Git for Windows also explores other
ports of other Unix shells. One of those is BusyBox-w32's ash, which is
a native port (i.e. *not* using any POSIX emulation layer, and certainly
not emulating Unix paths).

So let's just detect if there is a colon in $PWD and punt in that case.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge pull request git-for-windows#1897 from piscisaureus/symlink-attr
8f40f8f 
Specify symlink type in .gitattributes
@dscho
README.md: Add a Windows-specific preamble
d79353f 
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
mingw: kill child processes in a gentler way
87d4396 
The TerminateProcess() function does not actually leave the child
processes any chance to perform any cleanup operations. This is bad
insofar as Git itself expects its signal handlers to run.

A symptom is e.g. a left-behind .lock file that would not be left behind
if the same operation was run, say, on Linux.

To remedy this situation, we use an obscure trick: we inject a thread
into the process that needs to be killed and to let that thread run the
ExitProcess() function with the desired exit status. Thanks J Wyman for
describing this trick.

The advantage is that the ExitProcess() function lets the atexit
handlers run. While this is still different from what Git expects (i.e.
running a signal handler), in practice Git sets up signal handlers and
atexit handlers that call the same code to clean up after itself.

In case that the gentle method to terminate the process failed, we still
fall back to calling TerminateProcess(), but in that case we now also
make sure that processes spawned by the spawned process are terminated;
TerminateProcess() does not give the spawned process a chance to do so
itself.

Please note that this change only affects how Git for Windows tries to
terminate processes spawned by Git's own executables. Third-party
software that *calls* Git and wants to terminate it *still* need to make
sure to imitate this gentle method, otherwise this patch will not have
any effect.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@swigger
mingw: optionally enable wsl compability file mode bits
8d9b9dc 
The Windows Subsystem for Linux (WSL) version 2 allows to use `chmod` on
NTFS volumes provided that they are mounted with metadata enabled (see
https://devblogs.microsoft.com/commandline/chmod-chown-wsl-improvements/
for details), for example:

	$ chmod 0755 /mnt/d/test/a.sh

In order to facilitate better collaboration between the Windows
version of Git and the WSL version of Git, we can make the Windows
version of Git also support reading and writing NTFS file modes
in a manner compatible with WSL.

Since this slightly slows down operations where lots of files are
created (such as an initial checkout), this feature is only enabled when
`core.WSLCompat` is set to true. Note that you also have to set
`core.fileMode=true` in repositories that have been initialized without
enabling WSL compatibility.

There are several ways to enable metadata loading for NTFS volumes
in WSL, one of which is to modify `/etc/wsl.conf` by adding:

```
[automount]
enabled = true
options = "metadata,umask=027,fmask=117"
```

And reboot WSL.

It can also be enabled temporarily by this incantation:

	$ sudo umount /mnt/c &&
	  sudo mount -t drvfs C: /mnt/c -o metadata,uid=1000,gid=1000,umask=22,fmask=111

It's important to note that this modification is compatible with, but
does not depend on WSL. The helper functions in this commit can operate
independently and functions normally on devices where WSL is not
installed or properly configured.

Signed-off-by: xungeng li <xungeng@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge branch 'busybox-w32'
3520f1d 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@shiftkey
Add an issue template
45fc8ea 
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and
Philip Oakley.

Helped-by: Clive Chan <cc@clive.io>
Helped-by: Adric Norris <landstander668@gmail.com>
Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
Helped-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Brendan Forster <brendan@github.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
mingw: really handle SIGINT
995c08f 
Previously, we did not install any handler for Ctrl+C, but now we really
want to because the MSYS2 runtime learned the trick to call the
ConsoleCtrlHandler when Ctrl+C was pressed.

With this, hitting Ctrl+C while `git log` is running will only terminate
the Git process, but not the pager. This finally matches the behavior on
Linux and on macOS.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge branch 'wsl-file-mode-bits'
59c1ffc 
This patch introduces support to set special NTFS attributes that are
interpreted by the Windows Subsystem for Linux as file mode bits, UID
and GID.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho @rimrul
Add a GitHub workflow to monitor component updates
1520609 
Rather than using private IFTTT Applets that send mails to this
maintainer whenever a new version of a Git for Windows component was
released, let's use the power of GitHub workflows to make this process
publicly visible.

This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a
new version was released.

Note: Bash sometimes releases multiple patched versions within a few
minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The
MSYS2 runtime also has a similar system. We can address those patches as
a group, so we shouldn't get multiple issues about them.

Note further: We're not acting on newlib releases, OpenSSL alphas, Perl
release candidates or non-stable Perl releases. There's no need to open
issues about them.

Co-authored-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Modify the GitHub Pull Request template (to reflect Git for Windows)
df218c9 
Git for Windows accepts pull requests; Core Git does not. Therefore we
need to adjust the template (because it only matches core Git's
project management style, not ours).

Also: direct Git for Windows enhancements to their contributions page,
space out the text for easy reading, and clarify that the mailing list
is plain text, not HTML.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Partially un-revert "editor: save and reset terminal after calling ED…
d8a1d3d 
…ITOR"

In e3f7e01 (Revert "editor: save and reset terminal after calling
EDITOR", 2021-11-22), we reverted the commit wholesale where the
terminal state would be saved and restored before/after calling an
editor.

The reverted commit was intended to fix a problem with Windows Terminal
where simply calling `vi` would cause problems afterwards.

To fix the problem addressed by the revert, but _still_ keep the problem
with Windows Terminal fixed, let's revert the revert, with a twist: we
restrict the save/restore _specifically_ to the case where `vi` (or
`vim`) is called, and do not do the same for any other editor.

This should still catch the majority of the cases, and will bridge the
time until the original patch is re-done in a way that addresses all
concerns.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge pull request git-for-windows#1170 from dscho/mingw-kill-process
7b4132a 
Handle Ctrl+C in Git Bash nicely

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
reset: reinstate support for the deprecated --stdin option
1e363b5 
The `--stdin` option was a well-established paradigm in other commands,
therefore we implemented it in `git reset` for use by Visual Studio.

Unfortunately, upstream Git decided that it is time to introduce
`--pathspec-from-file` instead.

To keep backwards-compatibility for some grace period, we therefore
reinstate the `--stdin` option on top of the `--pathspec-from-file`
option, but mark it firmly as deprecated.

Helped-by: Victoria Dye <vdye@github.com>
Helped-by: Matthew John Cheetham <mjcheetham@outlook.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@vdye
fsmonitor: reintroduce core.useBuiltinFSMonitor
e343e65 
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added
in 0a756b2 (fsmonitor: config settings are repository-specific,
2021-03-05)) after its removal from the upstream version of FSMonitor.

Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by
"overloading" the 'core.fsmonitor' setting to take a boolean value. However,
several applications (e.g., 'scalar') utilize the original config setting,
so it should be preserved for a deprecation period before complete removal:

* if 'core.fsmonitor' is a boolean, the user is correctly using the new
  config syntax; do not use 'core.useBuiltinFSMonitor'.
* if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'.
* if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if
  'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook
  indicated by the path.

Additionally, for this deprecation period, advise users to switch to using
'core.fsmonitor' to specify their use of the builtin FSMonitor.

Signed-off-by: Victoria Dye <vdye@github.com>
@dscho
dependabot: help keeping GitHub Actions versions up to date
f7e9e42 
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
SECURITY.md: document Git for Windows' policies
290bfd1 
This is the recommended way on GitHub to describe policies revolving around
security issues and about supported versions.

Helped-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge branch 'un-revert-editor-save-and-reset'
72c4900 
A fix for calling `vim` in Windows Terminal caused a regression and was
reverted. We partially un-revert this, to get the fix again.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge branch 'phase-out-reset-stdin'
f4b8f7b 
This topic branch re-adds the deprecated --stdin/-z options to `git
reset`. Those patches were overridden by a different set of options in
the upstream Git project before we could propose `--stdin`.

We offered this in MinGit to applications that wanted a safer way to
pass lots of pathspecs to Git, and these applications will need to be
adjusted.

Instead of `--stdin`, `--pathspec-from-file=-` should be used, and
instead of `-z`, `--pathspec-file-nul`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge branch 'deprecate-core.useBuiltinFSMonitor'
0b97d7e 
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows
and developed, improved and stabilized there, the built-in FSMonitor
only made it into upstream Git (after unnecessarily long hemming and
hawing and throwing overly perfectionist style review sticks into the
spokes) as `core.fsmonitor = true`.

In Git for Windows, with this topic branch, we re-introduce the
now-obsolete config setting, with warnings suggesting to existing users
how to switch to the new config setting, with the intention to
ultimately drop the patch at some stage.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge pull request git-for-windows#2837 from dscho/monitor-component-…
3e72712 
…updates

Start monitoring updates of Git for Windows' component in the open
@dscho
Merge 'readme' into HEAD
8d2750e 
Add a README.md for GitHub goodness.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Detect number of cores better on multi-socket systems (git-for-window…
14b0fc7 
…s#6108)

While the currently used way to detect the number of CPU cores ond
Windows is nice and straight-forward, GetSystemInfo() only [gives us
access to the number of processors within the current
group.](https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-system_info#members)

While that is usually fine for systems with a single physical CPU,
separate physical sockets are typically separate groups.

Switch to using GetLogicalProcessorInformationEx() to handle
multi-socket
systems better.

I've tested this on a physical single-socket x86-64 and a physical
dual-socket x86-64 system, and on a virtual single-socket ARM64 system.
Physical [multi-socket ARM64 systems seem to
exist](https://cloudbase.it/ampere-altra-industry-leading-arm64-server/),
but I don't have access to such hardware and the hypervisor I use
apparently can't emulate that either.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.