Skip to content

Rebase shears/main: 1 conflict(s) (0 skipped, 1 resolved) (#24153509453)#105

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

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

Conversation

@gitforwindowshelper
Copy link
Copy Markdown

@gitforwindowshelper gitforwindowshelper bot commented Apr 8, 2026

Workflow run

Rebase Summary: main

From: 54f6cd69da (Detect number of cores better on multi-socket systems (git-for-windows#6108), 2026-04-06) (879b511cc7..54f6cd69da)

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

resolved all 5 conflicts by keeping HEAD side (upstream renames and downstream additions already present in rebased main)

Range-diff

  • 1: 54f6cd6 ! 1: 8aeb81f 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 7f897e0065..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;
+-<<<<<<< dc1a52ccdd (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 1987a8878e..5c8ceb076a 100644
+ --- git-curl-compat.h
+ +++ git-curl-compat.h
+@@
+ #endif
+ 
+ /**
+-<<<<<<< dc1a52ccdd (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
  
-+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]}) {
+ /**
+-=======
+->>>>>>> 5ce2b45bb3 (win32: thread-utils: handle multi-socket systems)
+  * CURLSSLOPT_AUTO_CLIENT_CERT was added in 7.77.0, released in May
+  * 2021.
+  */
 
  ## http.c ##
-@@ http.c: static long http_retry_after = 0;
+ remerge CONFLICT (content): Merge conflict in http.c
+ index 1bd97c0ce7..5bc2ad8b87 100644
+ --- http.c
+ +++ http.c
+@@ http.c: static long http_schannel_check_revoke_mode =
+ 	CURLSSLOPT_NO_REVOKE;
+ #endif
+ 
+-<<<<<<< dc1a52ccdd (Merge 'readme' into HEAD)
+ static long http_retry_after = 0;
  static long http_max_retries = 0;
  static long http_max_retry_time = 300;
  
-+
+-=======
+->>>>>>> 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
 
- ## 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 bd2ec4221d..732c8fe103 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);
  
- 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
- 	'
+ 	reftable_set_alloc(malloc, realloc, free);
+-<<<<<<< dc1a52ccdd (Merge 'readme' into HEAD)
  
- 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
- 	'
+ 	refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir,
+ 					 &ref_common_dir);
  
- test_done
+ 	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);
 
- ## thread-utils.c ##
-@@ thread-utils.c: int online_cpus(void)
- #endif
- 
- #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;
- 
+ ## t/meson.build ##
+ remerge CONFLICT (content): Merge conflict in t/meson.build
+ index 24672527dc..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',
+-<<<<<<< dc1a52ccdd (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: 8aeb81fa23 (Detect number of cores better on multi-socket systems (git-for-windows#6108), 2026-04-06) (fffb57cf82..8aeb81fa23)

Statistics

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

dscho and others added 30 commits April 8, 2026 19:18
@dscho
mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
5b3e283 
The tell-tale is the presence of the `MSYSTEM` value while compiling, of
course. In that case, we want to ensure that `MSYSTEM` is set when
running `git.exe`, and also enable the magic MSYS2 tty detection.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
mingw: demonstrate a git add issue with NTFS junctions
bc17fbf 
NTFS junctions are somewhat similar in spirit to Unix bind mounts: they
point to a different directory and are resolved by the filesystem
driver. As such, they appear to `lstat()` as if they are directories,
not as if they are symbolic links.

_Any_ user can create junctions, while symbolic links can only be
created by non-administrators in Developer Mode on Windows 10. Hence
NTFS junctions are much more common "in the wild" than NTFS symbolic
links.

It was reported in git-for-windows#2481
that adding files via an absolute path that traverses an NTFS junction:
since 1e64d18 (mingw: do resolve symlinks in `getcwd()`), we resolve not
only symbolic links but also NTFS junctions when determining the
absolute path of the current directory. The same is not true for `git
add <file>`, where symbolic links are resolved in `<file>`, but not NTFS
junctions.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dennisameling
cmake: allow building for Windows/ARM64
77e2077 
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@PhilipOakley
.gitignore: add Visual Studio CMakeSetting.json file
62736c8 
The CMakeSettings.json file is tool generated. Developers may track it
should they provide additional settings.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
@PhilipOakley
hash-object --stdin: verify that it works with >4GB/LLP64
181ac39 
Just like the `hash-object --literally` code path, the `--stdin` code
path also needs to use `size_t` instead of `unsigned long` to represent
memory sizes, otherwise it would cause problems on platforms using the
LLP64 data model (such as Windows).

To limit the scope of the test case, the object is explicitly not
written to the object store, nor are any filters applied.

The `big` file from the previous test case is reused to save setup time;
To avoid relying on that side effect, it is generated if it does not
exist (e.g. when running via `sh t1007-*.sh --long --run=1,41`).

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
mingw: rely on MSYS2's metadata instead of hard-coding it
d947f84 
MSYS2 defines some helpful environment variables, e.g. `MSYSTEM`. There
is code in Git for Windows to ensure that that `MSYSTEM` variable is
set, hard-coding a default.

However, the existing solution jumps through hoops to reconstruct the
proper default, and is even incomplete doing so, as we found out when we
extended it to support CLANGARM64.

This is absolutely unnecessary because there is already a perfectly
valid `MSYSTEM` value we can use at build time. This is even true when
building the MINGW32 variant on a MINGW64 system because `makepkg-mingw`
will override the `MSYSTEM` value as per the `MINGW_ARCH` array.

The same is equally true for the `/mingw64`, `/mingw32` and
`/clangarm64` prefix: those values are already available via the
`MINGW_PREFIX` environment variable, and we just need to pass that
setting through.

Only when `MINGW_PREFIX` is not set (as is the case in Git for Windows'
minimal SDK, where only `MSYSTEM` is guaranteed to be set correctly), we
use as fall-back the top-level directory whose name is the down-cased
value of the `MSYSTEM` variable.

Incidentally, this also broadens the support to all the configurations
supported by the MSYS2 project, i.e. clang64 & ucrt64, too.

Note: This keeps the same, hard-coded MSYSTEM platform support for CMake
as before, but drops it for Meson (because it is unclear how Meson could
do this in a more flexible manner).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
strbuf_realpath(): use platform-dependent API if available
387fddb 
Some platforms (e.g. Windows) provide API functions to resolve paths
much quicker. Let's offer a way to short-cut `strbuf_realpath()` on
those platforms.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
t5505/t5516: allow running without .git/branches/ in the templates
5b7673a 
When we commit the template directory as part of `make vcxproj`, the
`branches/` directory is not actually commited, as it is empty.

Two tests were not prepared for that situation.

This developer tried to get rid of the support for `.git/branches/` a
long time ago, but that effort did not bear fruit, so the best we can do
is work around in these here tests.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@PhilipOakley
vcpkg_install: detect lack of Git
4a58345 
The vcpkg_install batch file depends on the availability of a
working Git on the CMD path. This may not be present if the user
has selected the 'bash only' option during Git-for-Windows install.

Detect and tell the user about their lack of a working Git in the CMD
window.

Fixes git-for-windows#2348.
A separate PR git-for-windows/build-extra#258
now highlights the recommended path setting during install.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
@dennisameling
ci(vs-build) also build Windows/ARM64 artifacts
a77638f 
There are no Windows/ARM64 agents in GitHub Actions yet, therefore we
just skip adjusting the `vs-test` job for now.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@vdye
subtree: update contrib/subtree test target
45ae486 
The intention of this change is to align with how the top-level git
`Makefile` defines its own test target (which also internally calls
`$(MAKE) -C t/ all`). This change also ensures the consistency of
`make -C contrib/subtree test` with other testing in CI executions
(which rely on `$DEFAULT_TEST_TARGET` being defined as `prove`).

Signed-off-by: Victoria Dye <vdye@github.com>
@PhilipOakley
CMakeLists: add default "x64-windows" arch for Visual Studio
159956b 
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
338b393 
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
dfc86ee 
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
@dscho
mingw: always define ETC_* for MSYS2 environments
6482eba 
Special-casing even more configurations simply does not make sense.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@jeffhostetler
clink.pl: fix MSVC compile script to handle libcurl-d.lib
118638a 
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()
d4c6542 
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
a9a7f69 
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
7a4dc61 
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
7f1e949 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@lbonanomi
commit: accept "scissors" with CR/LF line endings
b502904 
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
a5357aa 
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
f86230f 
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
7dac108 
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
bfc39b2 
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
@dennisameling
cmake(): allow setting HOST_CPU for cross-compilation
e2d5326 
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()
1b7ff99 
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
4757200 
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
71a0ce5 
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
3f5413c 
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>
dscho and others added 30 commits April 8, 2026 19:18
@dscho
t5605: special-case hardlink test for BusyBox-w32
769b098 
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'
487bf86 
This was pull request git-for-windows#1645 from ZCube/master

Support windows container.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
t5813: allow for $PWD to be a Windows path
8e7e368 
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…
f2a2d85 
…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>
@dscho
t9200: skip tests when $PWD contains a colon
afdb8c4 
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
fa61be6 
Specify symlink type in .gitattributes
@dscho
Describe Git for Windows' architecture [no ci]
bff51a2 
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
mingw: kill child processes in a gentler way
b3f2c1b 
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
ce8c8e6 
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'
716b8bf 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Modify the Code of Conduct for Git for Windows
2f1e3c4 
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
mingw: really handle SIGINT
4c8d628 
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'
233b242 
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>
@derrickstolee
CONTRIBUTING.md: add guide for first-time contributors
c97b2d4 
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
Partially un-revert "editor: save and reset terminal after calling ED…
5562cfd 
…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
07b690b 
Handle Ctrl+C in Git Bash nicely

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
README.md: Add a Windows-specific preamble
74114b7 
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
reset: reinstate support for the deprecated --stdin option
8d191c5 
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>
@dscho
Merge branch 'un-revert-editor-save-and-reset'
554896c 
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>
@shiftkey
Add an issue template
6066dd4 
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 @rimrul
Add a GitHub workflow to monitor component updates
85b9fa8 
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>
@vdye
fsmonitor: reintroduce core.useBuiltinFSMonitor
a898107 
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
Merge branch 'phase-out-reset-stdin'
2d3eb8a 
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>
Modify the GitHub Pull Request template (to reflect Git for Windows)
13c1678 
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
dependabot: help keeping GitHub Actions versions up to date
e1e208c 
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
Merge branch 'deprecate-core.useBuiltinFSMonitor'
d095c10 
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
SECURITY.md: document Git for Windows' policies
1363c96 
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 pull request git-for-windows#2837 from dscho/monitor-component-…
68b1244 
…updates

Start monitoring updates of Git for Windows' component in the open
@dscho
Merge 'readme' into HEAD
dc1a52c 
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…
8aeb81f 
…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.