Rebase shears/seen: 2 conflict(s) (0 skipped, 2 resolved) (#23879956000)#79
Open
gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/seen-23879956000from
Open
Rebase shears/seen: 2 conflict(s) (0 skipped, 2 resolved) (#23879956000)#79gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/seen-23879956000from
gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/seen-23879956000from
Conversation
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>
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>
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>
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>
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>
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>
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>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
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>
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
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>
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>
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>
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>
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>
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>
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>
These fixes have been sent to the Git mailing list but have not been picked up by the Git project yet. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Start work on a new 'git survey' command to scan the repository for monorepo performance and scaling problems. The goal is to measure the various known "dimensions of scale" and serve as a foundation for adding additional measurements as we learn more about Git monorepo scaling problems. The initial goal is to complement the scanning and analysis performed by the GO-based 'git-sizer' (https://github.com/github/git-sizer) tool. It is hoped that by creating a builtin command, we may be able to take advantage of internal Git data structures and code that is not accessible from GO to gain further insight into potential scaling problems. Co-authored-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
This is no longer true in general, not with supporting Clang out of the box. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
By default we will scan all references in "refs/heads/", "refs/tags/" and "refs/remotes/". Add command line opts let the use ask for all refs or a subset of them and to include a detached HEAD. Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When 'git survey' provides information to the user, this will be presented in one of two formats: plaintext and JSON. The JSON implementation will be delayed until the functionality is complete for the plaintext format. The most important parts of the plaintext format are headers specifying the different sections of the report and tables providing concreted data. Create a custom table data structure that allows specifying a list of strings for the row values. When printing the table, check each column for the maximum width so we can create a table of the correct size from the start. The table structure is designed to be flexible to the different kinds of output that will be implemented in future changes. Signed-off-by: Derrick Stolee <stolee@gmail.com>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib` rather than `libexpat.lib`. It appears that the `vcpkg` package for "libexpat" has changed and now creates `libexpatd.lib` for debug mode builds. Previously, both debug and release builds created a ".lib" with the same basename. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
At the moment, nothing is obvious about the reason for the use of the
path-walk API, but this will become more prevelant in future iterations. For
now, use the path-walk API to sum up the counts of each kind of object.
For example, this is the reachable object summary output for my local repo:
REACHABLE OBJECT SUMMARY
========================
Object Type | Count
------------+-------
Tags | 1343
Commits | 179344
Trees | 314350
Blobs | 184030
Signed-off-by: Derrick Stolee <stolee@gmail.com>
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>
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>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
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>
…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>
Handle Ctrl+C in Git Bash nicely Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
…updates Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This topic branch addresses the following vulnerability: - **CVE-2025-66413**: When a user clones a repository from an attacker-controlled server, Git may attempt NTLM authentication and disclose the user's NTLMv2 hash to the remote server. Since NTLM hashing is weak, the captured hash can potentially be brute-forced to recover the user's credentials. This is addressed by disabling NTLM authentication by default. (GHSA-hv9c-4jm9-jh3x) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In 816db62 (credential: advertise NTLM suppression and allow helpers to re-enable, 2026-02-09), Git learned to advertise that NTLM authentication was suppressed to credential helpers. It also introduced a way to allow credential helpers to opt-back-in to NTLM authentication via the `ntlm_allow=1` credential protocol flag. There is a bug in the logic of 816db62 that means we are responding to the `ntlm_allow=1` signal too late in the auth retry codepath; we've already made the second-attempt request! Move adding of NTLM as a valid auth method to `http_request_reauth` right after the credential helper is consulted following the first request, but (now) before we made the second request. Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com>
As of git-for-windows/MINGW-packages#187, Git for Windows no longer includes `git svn` in its installers and portable Git editions. As a consequence, the deprecation note is no longer necessary. Even worse: Since the recommendation for users who want (or at least need) to continue using `git svn` is to use the MSYS2 package instead, and that MSYS2 package is built from Git for Windows' source code, they would now be bothered by a note that they do not need. So let's drop that deprecation note. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In 816db62 (credential: advertise NTLM suppression and allow helpers to re-enable, 2026-02-09), Git learned to advertise that NTLM authentication was suppressed to credential helpers. It also introduced a way to allow credential helpers to opt-back-in to NTLM authentication via the `ntlm_allow=1` credential protocol flag. There is a bug in the logic of 816db62 that means we are responding to the `ntlm_allow=1` signal too late in the auth retry codepath; we've already made the second-attempt request! Move adding of NTLM as a valid auth method to `http_request_reauth` right after the credential helper is consulted following the first request, but (now) before we made the second request.
… Git for Windows, anyway) (git-for-windows#6142) As of git-for-windows/MINGW-packages#187, Git for Windows no longer includes `git svn` in its installers and portable Git editions. As a consequence, the deprecation note is no longer necessary. Even worse: Since the recommendation for users who want (or at least need) to continue using `git svn` is to use the MSYS2 package instead, and that MSYS2 package is built from Git for Windows' source code, they would now be bothered by a note that they do not need. So let's drop that deprecation note.
Currently, Git for Windows is built off of the MINGW64 tool chain. But this will have to change because [the MSYS2 project deprecated this tool chain in favor of UCRT64](https://www.msys2.org/news/#2026-03-15-deprecating-the-mingw64-environment). Of course, that's only possible because they dropped support for Windows 8.1, which Git for Windows will probably have to do relatively soon. The best time to do that is probably [the Git 3.0 inflection point](git-for-windows#6018) when we already promised to drop support for older Windows versions. To prepare for such a huge change, I investigated what needs to be changed in Git for Windows' source code. And the good news is there's actually not very much. This here patch seems to be the only change that's necessary, and not even _strictly_ necessary: the `mingw_strftime()` wrapper would still do the right thing. It would just uselessly load the same function that's already loaded, dynamically, again. - The `strerror()` override [is guarded by an `#ifndef _UCRT`](https://github.com/git-for-windows/git/blob/v2.53.0.windows.2/compat/mingw-posix.h#L294-L296), - `PRIuMAX` resolves to standard `"llu"` [via `<inttypes.h>`](https://github.com/git-for-windows/git/blob/v2.53.0.windows.2/compat/mingw-posix.h#L449-L454) (note that `__MINGW64_VERSION_MAJOR` is defined both in MINGW64 and UCRT64, by virtue of using the `mingw-w64-headers`), - [`__USE_MINGW_ANSI_STDIO=0`](https://github.com/git-for-windows/git/blob/v2.53.0.windows.2/config.mak.uname#L751C19-L751C33) is irrelevant because [`_UCRT` short-circuits it](https://github.com/git-for-windows/git-sdk-64/blob/08933e673c79b5db48419917a2b02746b390afc4/mingw64/include/inttypes.h#L33), and - `SNPRINTF_RETURNS_BOGUS` hasn't been set for Git for Windows' builds since ec47a33, i.e. for a _really_ long time.
It was already decided in ef22148 (clean: do not traverse mount points, 2018-12-07) that we shouldn't traverse NTFS junctions/bind mounts when using `git clean`, partly because they're sometimes used in worktrees. But the same check wasn't applied to `remove_dir_recurse()` in `dir.c`, which `git worktree remove` uses. So removing a worktree suffers the same problem we had previously with `git clean`. Let's add the same guard from ef22148. Signed-off-by: Maks Kuznia <makskuznia244@gmail.com>
…s#6151) `remove_dir_recurse()` in `dir.c` doesn't check for mount points, even though this check was already added for `git clean` in git-for-windows#2268. So `git worktree remove` (or anything else that calls it) will traverse NTFS junctions and delete whatever is there. Similar to git-for-windows#607. This extends the same check from git-for-windows#2268 but for anything that calls `remove_dir_recurse()`.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: seen
From: 24c3da7b70 (Don't traverse mount points in
remove_dir_recurse()(git-for-windows#6151), 2026-03-31) (68992a01ba..24c3da7b70)Resolved: a40e688 (Merge branch 'disallow-ntlm-auth-by-default', 2026-02-12)
kept both additive changes: retry settings + NTLM auth init in http.c, and both install_script lines in t/lib-httpd.sh
Range-diff
1: a40e688 ! 1: 0c2491c 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 9cc9513028..7abedb3e83 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"); + +-<<<<<<< a59f340d11 (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; +-======= + + http_auth_methods = http_auth_any; +->>>>>>> 816db62d10 (credential: advertise NTLM suppression and allow helpers to re-enable) + 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 525863f82b..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 +-<<<<<<< a59f340d11 (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_doneResolved: 820cdfe (mingw: use strftime() directly in UCRT builds (git-for-windows#6130), 2026-03-25)
resolved all 8 conflicting files by keeping HEAD versions; the merge commit only changes compat/mingw.c and git-svn files, not the conflicting files
Range-diff
1: 820cdfe ! 1: 0a844f5 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 - ----------- + ## Documentation/config/sideband.adoc ## + remerge CONFLICT (add/add): Merge conflict in Documentation/config/sideband.adoc + index 5188280222..ddba93393c 100644 + --- Documentation/config/sideband.adoc + +++ Documentation/config/sideband.adoc +@@ + sideband.allowControlCharacters:: +-<<<<<<< b3f41fef7d (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + ifdef::with-breaking-changes[] + By default, control characters that are delivered via the sideband + are masked, except ANSI color sequences. This prevents potentially +@@ Documentation/config/sideband.adoc: endif::with-breaking-changes[] + sideband.<url>.*:: + Apply the `sideband.*` option selectively to specific URLs. The + same URL matching logic applies as for `http.<url>.*` settings. +-======= +- By default, control characters that are delivered via the sideband +- are masked, except ANSI color sequences. This prevents potentially +- unwanted ANSI escape sequences from being sent to the terminal. Use +- this config setting to override this behavior: +-+ +--- +- color:: +- Allow ANSI color sequences, line feeds and horizontal tabs, +- but mask all other control characters. This is the default. +- false:: +- Mask all control characters other than line feeds and +- horizontal tabs. +- true:: +- Allow all control characters to be sent to the terminal. +--- +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) - ## 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 - - if (!ret && errno == EINVAL) - die("invalid strftime format: '%s'", format); + ## builtin/reset.c ## + remerge CONFLICT (content): Merge conflict in builtin/reset.c + index cadfc0b65a..8e3c8509d7 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; +-<<<<<<< b3f41fef7d (`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")), - ## 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 9b17b0e414..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]}) { + /** +-<<<<<<< b3f41fef7d (`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 + + /** +-======= +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + * CURLSSLOPT_AUTO_CLIENT_CERT was added in 7.77.0, released in May + * 2021. + */ - ## 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 - ' + ## http.c ## + remerge CONFLICT (content): Merge conflict in http.c + index 029fa7d887..54cbf8ed7a 100644 + --- http.c + +++ http.c +@@ http.c: static long http_schannel_check_revoke_mode = + CURLSSLOPT_NO_REVOKE; + #endif - test_done +-<<<<<<< b3f41fef7d (`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) + /* + * 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/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 - ' + ## refs/reftable-backend.c ## + remerge CONFLICT (content): Merge conflict in refs/reftable-backend.c + index 58b48c0e71..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 +-<<<<<<< b3f41fef7d (`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); + + 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 - ' + ## sideband.c ## + remerge CONFLICT (content): Merge conflict in sideband.c + index 705677e53c..26e5bbd4b5 100644 + --- sideband.c + +++ sideband.c +@@ sideband.c: static struct keyword_entry keywords[] = { + }; + + static enum { +-<<<<<<< b3f41fef7d (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + ALLOW_CONTROL_SEQUENCES_UNSET = -1, + ALLOW_NO_CONTROL_CHARACTERS = 0, + ALLOW_ANSI_COLOR_SEQUENCES = 1<<0, +@@ sideband.c: void sideband_apply_url_config(const char *url) + string_list_clear(&config.vars, 1); + urlmatch_config_release(&config); + } +-======= +- ALLOW_NO_CONTROL_CHARACTERS = 0, +- ALLOW_ALL_CONTROL_CHARACTERS = 1, +- ALLOW_ANSI_COLOR_SEQUENCES = 2 +-} allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + + /* Returns a color setting (GIT_COLOR_NEVER, etc). */ + static enum git_colorbool use_sideband_colors(void) +@@ sideband.c: static enum git_colorbool use_sideband_colors(void) + if (use_sideband_colors_cached != GIT_COLOR_UNKNOWN) + return use_sideband_colors_cached; + +-<<<<<<< b3f41fef7d (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + if (allow_control_characters == ALLOW_CONTROL_SEQUENCES_UNSET) { + if (!repo_config_get_value(the_repository, "sideband.allowcontrolcharacters", &value)) + sideband_allow_control_characters_config("sideband.allowcontrolcharacters", value); + + if (allow_control_characters == ALLOW_CONTROL_SEQUENCES_UNSET) + allow_control_characters = ALLOW_DEFAULT_ANSI_SEQUENCES; +-======= +- switch (repo_config_get_maybe_bool(the_repository, "sideband.allowcontrolcharacters", &i)) { +- case 0: /* Boolean value */ +- allow_control_characters = i ? ALLOW_ALL_CONTROL_CHARACTERS : +- ALLOW_NO_CONTROL_CHARACTERS; +- break; +- case -1: /* non-Boolean value */ +- if (repo_config_get_string_tmp(the_repository, "sideband.allowcontrolcharacters", +- &value)) +- ; /* huh? `get_maybe_bool()` returned -1 */ +- else if (!strcmp(value, "color")) +- allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; +- else +- warning(_("unrecognized value for `sideband." +- "allowControlCharacters`: '%s'"), value); +- break; +- default: +- break; /* not configured */ +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + } + + if (!repo_config_get_string_tmp(the_repository, key, &value)) +@@ sideband.c: void list_config_color_sideband_slots(struct string_list *list, const char *pref + list_config_item(list, prefix, keywords[i].keyword); + } + +-<<<<<<< b3f41fef7d (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + static int handle_ansi_sequence(struct strbuf *dest, const char *src, int n) +-======= +-static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int n) +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + { + int i; + +@@ sideband.c: static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int + * Valid ANSI color sequences are of the form + * + * ESC [ [<n> [; <n>]*] m +-<<<<<<< b3f41fef7d (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + * + * These are part of the Select Graphic Rendition sequences which + * contain more than just color sequences, for more details see +@@ sideband.c: static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int + strchr("ABCDEFGHf", src[i])) || + ((allow_control_characters & ALLOW_ANSI_ERASE) && + strchr("JKMPX", src[i]))) { +-======= +- */ +- +- if (allow_control_characters != ALLOW_ANSI_COLOR_SEQUENCES || +- n < 3 || src[0] != '\x1b' || src[1] != '[') +- return 0; +- +- for (i = 2; i < n; i++) { +- if (src[i] == 'm') { +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + strbuf_add(dest, src, i + 1); + return i; + } +@@ sideband.c: static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) + { + int i; + +-<<<<<<< b3f41fef7d (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + if ((allow_control_characters & ALLOW_ALL_CONTROL_CHARACTERS)) { +-======= +- if (allow_control_characters == ALLOW_ALL_CONTROL_CHARACTERS) { +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + strbuf_add(dest, src, n); + return; + } + + strbuf_grow(dest, n); + for (; n && *src; src++, n--) { +-<<<<<<< b3f41fef7d (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + if (!iscntrl(*src) || *src == '\t' || *src == '\n') { + strbuf_addch(dest, *src); + } else if (allow_control_characters != ALLOW_NO_CONTROL_CHARACTERS && + (i = handle_ansi_sequence(dest, src, n))) { +-======= +- if (!iscntrl(*src) || *src == '\t' || *src == '\n') +- strbuf_addch(dest, *src); +- else if ((i = handle_ansi_color_sequence(dest, src, n))) { +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + src += i; + n -= i; + } else { + strbuf_addch(dest, '^'); +-<<<<<<< b3f41fef7d (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + strbuf_addch(dest, *src == 0x7f ? '?' : 0x40 + *src); +-======= +- strbuf_addch(dest, 0x40 + *src); +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + } + } + } + + ## t/meson.build ## + remerge CONFLICT (content): Merge conflict in t/meson.build + index 94c45871f0..25272d7ae4 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', +-<<<<<<< b3f41fef7d (`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', + + ## t/t5409-colorize-remote-messages.sh ## + remerge CONFLICT (content): Merge conflict in t/t5409-colorize-remote-messages.sh + index 8b8f3cbb0f..07cbc62736 100755 + --- t/t5409-colorize-remote-messages.sh + +++ t/t5409-colorize-remote-messages.sh +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'fallback to color.ui' ' + grep "<BOLD;RED>error<RESET>: error" decoded + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< b3f41fef7d (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + if test_have_prereq WITH_BREAKING_CHANGES + then + TURN_ON_SANITIZING=already.turned=on +@@ t/t5409-colorize-remote-messages.sh: else + TURN_ON_SANITIZING=sideband.allowControlCharacters=color + fi + +-================================ +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + test_expect_success 'disallow (color) control sequences in sideband' ' + write_script .git/color-me-surprised <<-\EOF && + printf "error: Have you \\033[31mread\\033[m this?\\a\\n" >&2 + exec "$@" + EOF +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< b3f41fef7d (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + test_config_global uploadPack.packObjectsHook ./color-me-surprised && + test_commit need-at-least-one-commit && + + git -c $TURN_ON_SANITIZING clone --no-local . throw-away 2>stderr && +-================================ +- test_config_global uploadPack.packObjectshook ./color-me-surprised && +- test_commit need-at-least-one-commit && +- +- git clone --no-local . throw-away 2>stderr && +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + test_decode_color <stderr >decoded && + test_grep RED decoded && + test_grep "\\^G" stderr && +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'disallow (color) control sequences in sideband' ' + test_file_not_empty actual + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< b3f41fef7d (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + test_decode_csi() { + awk '{ + while (match($0, /\033/) != 0) { +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'allow all control sequences for a specific URL' ' + test_grep ! "\\^\\[\\[K" decoded + ' +-================================ +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) test_doneTo: 62f91db743 (Don't traverse mount points in
remove_dir_recurse()(git-for-windows#6151), 2026-03-31) (7992b4a775..62f91db743)Statistics
Range-diff (click to expand)
1: 5483ae8 = 1: a48afac unix-socket: avoid leak when initialization fails
2: 14b6f5b = 2: b25f287 grep: prevent
^$false match at end of file3: 8ff1440 = 3: 13d0470 Merge branch 'fixes-from-the-git-mailing-list'
20: 77a0f33 = 4: 54a638b vcpkg_install: detect lack of Git
21: 576134d = 5: 9cd3ea1 vcpkg_install: add comment regarding slow network connections
23: 83da6e0 = 6: 14f086d vcbuild: install ARM64 dependencies when building ARM64 binaries
25: 15c0be4 = 7: 885567c vcbuild: add an option to install individual 'features'
27: 10ab8de = 8: e741da7 cmake: allow building for Windows/ARM64
4: 4ad7dc9 = 9: 603f17e mingw: include the Python parts in the build
29: 8c2cff9 = 10: 63aad73 ci(vs-build) also build Windows/ARM64 artifacts
5: d16806c = 11: e61f295 win32/pthread: avoid name clashes with winpthread
31: 21297d8 = 12: 408b346 Add schannel to curl installation
32: 32c7d13 = 13: ba336a3 hash-object: demonstrate a >4GB/LLP64 problem
6: 3249518 = 14: f15db2e git-compat-util: avoid redeclaring _DEFAULT_SOURCE
34: 14704f5 = 15: 58e355e cmake(): allow setting HOST_CPU for cross-compilation
35: 8ecf028 ! 16: d28edf2 object-file.c: use size_t for header lengths
7: 1279f96 = 17: 8e6ac80 Import the source code of mimalloc v2.2.7
8: 0de781e = 18: 290cb72 t9350: point out that refs are not updated correctly
37: f2cb59e = 19: 2f78422 CMake: default Visual Studio generator has changed
38: 308bf36 = 20: 097dac9 hash algorithms: use size_t for section lengths
9: 55625ba = 21: a8210eb mimalloc: adjust for building inside Git
10: 9010b74 = 22: 60d0f76 transport-helper: add trailing --
40: 34de0fb = 23: a58c520 mingw: demonstrate a
git addissue with NTFS junctions41: efbe899 = 24: 288078c .gitignore: add Visual Studio CMakeSetting.json file
42: b0dfb25 = 25: 88de1fb hash-object --stdin: verify that it works with >4GB/LLP64
11: 1e17242 = 26: 19fffc9 mimalloc: offer a build-time option to enable it
44: 07a601d = 27: 2cc2774 t5505/t5516: allow running without
.git/branches/in the templates12: a788470 = 28: 441d3d3 remote-helper: check helper status after import/export
13: 60fa908 = 29: aed5b4b clean: do not traverse mount points
45: cb7e972 = 30: ab30690 strbuf_realpath(): use platform-dependent API if available
46: d9d0b2e = 31: 24c9773 http: use new "best effort" strategy for Secure Channel revoke checking
47: b107de8 = 32: bb49f40 subtree: update
contrib/subtreetesttarget48: 4af9368 = 33: 5fa1623 CMakeLists: add default "x64-windows" arch for Visual Studio
49: 7331841 = 34: 5435f2f hash-object: add another >4GB/LLP64 test case
14: 375dec1 = 35: 81afb81 mingw: use mimalloc
53: 5c329c6 = 36: 1a999a2 t5505/t5516: fix white-space around redirectors
15: 0b7fa55 = 37: 7e138f9 Always auto-gc after calling a fast-import transport
16: d975e54 = 38: b00ea6c mingw: prevent regressions with "drive-less" absolute paths
17: 626f686 = 39: d0e1719 clean: remove mount points when possible
18: 871ffb9 = 40: b54b19b transport: optionally disable side-band-64k
19: 2b949ca = 41: d465de9 mingw: fix fatal error working on mapped network drives on Windows
55: 573a621 = 42: 7e6138d clink.pl: fix MSVC compile script to handle libcurl-d.lib
56: 7cb6a52 = 43: 970cab4 mingw: implement a platform-specific
strbuf_realpath()57: 566f756 = 44: 1891241 t3701: verify that we can add lots of files interactively
58: 719d315 = 45: b60a7cf commit: accept "scissors" with CR/LF line endings
59: 1b56ee1 = 46: 1caa17a t0014: fix indentation
60: b12fbde = 47: a270da2 git-gui: accommodate for intent-to-add files
61: 43449ec = 48: 8275ca7 mingw: allow for longer paths in
parse_interpreter()62: ce9a8f0 = 49: c8b420d compat/vcbuild: document preferred way to build in Visual Studio
63: 149ade8 = 50: f1d3f73 http: optionally send SSL client certificate
64: 3e3dc75 = 51: 2a96be8 ci: run
contrib/subtreetests in CI builds65: 374f0e0 = 52: 2fdac29 CMake: show Win32 and Generator_platform build-option values
66: 1586726 = 53: ec0ed3a hash-object: add a >4GB/LLP64 test case using filtered input
22: 9e0b5fb = 54: 782c47e windows: skip linking
git-<command>for built-ins24: a7a5099 = 55: 132c2ce mingw: stop hard-coding
CC = gcc26: 07f3b32 = 56: a9d6932 mingw: drop the -D_USE_32BIT_TIME_T option
28: 14bffd0 = 57: 00f7853 mingw: only use -Wl,--large-address-aware for 32-bit builds
30: 8c45607 = 58: 3a62a94 mingw: avoid over-specifying
--pic-executable33: 6b4db50 = 59: 0e255da mingw: set the prefix and HOST_CPU as per MSYS2's settings
36: 33451e2 = 60: 031d3af mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
39: ebabde2 = 61: 58d7082 mingw: rely on MSYS2's metadata instead of hard-coding it
43: 0204f50 = 62: 0ca9ee8 mingw: always define
ETC_*for MSYS2 environments52: a9e9780 = 63: f0c2d88 max_tree_depth: lower it for clang builds in general on Windows
73: a491cec = 64: 4745a30 mingw: ensure valid CTYPE
74: 4f8535f = 65: 792f2ca ci: work around a problem with HTTP/2 vs libcurl v8.10.0
75: 3971ddd = 66: 89a056d mingw: allow
git.exeto be used instead of the "Git wrapper"76: 0fc770d = 67: d80cb7e revision: create mark_trees_uninteresting_dense()
77: 57fab07 = 68: 50ea366 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
78: 40c14cc = 69: d8aca26 survey: stub in new experimental 'git-survey' command
79: f15d929 = 70: fc7577a Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
80: f3a9906 = 71: cfd1940 survey: add command line opts to select references
81: c1da549 = 72: a4c4269 clink.pl: fix libexpatd.lib link error when using MSVC
82: 4aac92b = 73: cc495d3 survey: start pretty printing data in table form
84: 4865caf = 74: 500df47 Makefile: clean up .ilk files when MSVC=1
85: 14414b7 = 75: 706ea31 survey: add object count summary
87: 1df60fe = 76: 1c8fc03 vcbuild: add support for compiling Windows resource files
88: 10a132d = 77: 8088f5f survey: summarize total sizes by object type
90: 6d6d163 = 78: dd3d716 config.mak.uname: add git.rc to MSVC builds
54: f95f801 = 79: 9e69e83 MinGW: link as terminal server aware
91: 198e009 = 80: 59d64b3 survey: show progress during object walk
94: 4179efa = 81: d89467b clink.pl: ignore no-stack-protector arg on MSVC=1 builds
95: 76e9576 = 82: 698e493 http: optionally load libcurl lazily
96: 3593de0 = 83: a79ea97 survey: add ability to track prioritized lists
99: 995c62f = 84: 5649951 clink.pl: move default linker options for MSVC=1 builds
100: db32172 = 85: 51aaa43 http: support lazy-loading libcurl also on Windows
101: b4b6be4 = 86: 8dfe11e survey: add report of "largest" paths
50: 029f7fc = 87: 112c527 setup: properly use "%(prefix)/" when in WSL
51: fbf9ece = 88: 4f347c3 Add config option
windows.appendAtomically104: 63543e0 = 89: b2fb3a1 cmake: install headless-git.
105: 0671bd0 = 90: 8c77c75 http: when loading libcurl lazily, allow for multiple SSL backends
106: 35c1923 = 91: 2f544ec survey: add --top= option and config
67: 3cd6753 = 92: 1a081c1 compat/mingw.c: do not warn when failing to get owner
68: f5d4dcb = 93: 3175fc1 mingw: $env:TERM="xterm-256color" for newer OSes
92: 511685f = 94: cf529ea mingw: make sure
errnois set correctly when socket operations fail69: 0ddee79 = 95: 4470cc8 winansi: check result and Buffer before using Name
70: acd6433 = 96: 297f0af mingw: change core.fsyncObjectFiles = 1 by default
71: 04fe01a = 97: 445be7b Fix Windows version resources
72: 9241296 = 98: 7391029 status: fix for old-style submodules with commondir
109: af5a84d = 99: 8550fe5 git.rc: include winuser.h
110: f2168f9 = 100: 6e2607f mingw: do load libcurl dynamically by default
111: 4e1155e = 101: fb9dd1d Add a GitHub workflow to verify that Git/Scalar work in Nano Server
112: 0d7511f = 102: 9b4dd77 mingw: suggest
windows.appendAtomicallyin more cases113: af361d2 = 103: 86a5c07 win32: use native ANSI sequence processing, if possible
114: a28c450 = 104: c64c1b4 common-main.c: fflush stdout buffer upon exit
115: 9d8bdf6 = 105: 58d920f t5601/t7406(mingw): do run tests with symlink support
116: d3a188b = 106: 542ee34 win32: ensure that
localtime_r()is declared even in i686 builds117: 2d1ff4d = 107: 2211287 Fallback to AppData if XDG_CONFIG_HOME is unset
118: 9e91763 = 108: 951eb0a run-command: be helpful with Git LFS fails on Windows 7
119: 5adaa65 = 109: 949fd53 survey: clearly note the experimental nature in the output
83: beccba6 = 110: 84392fa Merge 'remote-hg-prerequisites' into HEAD
86: 685beff = 111: 6ba0eb6 Merge branch 'drive-prefix'
89: fcb0791 = 112: 4db7f16 Merge branch 'dont-clean-junctions'
93: b124dac = 113: 03fe791 Merge branch 'msys2-python'
98: fc10285 = 114: 32c12ad Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
103: 79354f7 = 115: 57ce077 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
108: 3d3287e = 116: bfa98c7 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
124: 1fc99c3 = 117: 5b41084 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
125: f50076e = 118: 2182a0e Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction126: d43af30 = 119: 0846e0c Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
127: 0f1aee1 = 120: feda21d Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
128: 6145019 = 121: dc27968 Merge 'add-p-many-files'
129: 6e1d4fb = 122: 12b8297 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
130: ebb736e = 123: 702a85b Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
131: 5af91ff = 124: b8b1465 Merge 'git-gui/js/intent-to-add'
132: e531b15 = 125: 038b647 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
133: dea94ca = 126: 580624e Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
134: f902457 = 127: 76eb821 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
135: 04af373 = 128: 5c3b12c Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path136: 652d14f = 129: 8c4bad6 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
137: 92694ba = 130: 105e535 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
138: 30c19a8 = 131: f2d4b75 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests139: 5c6c0c7 = 132: 7291a87 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
140: 782a390 = 133: 7fda309 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t141: 0b5b808 = 134: f12abb7 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory142: be3a10b = 135: 07d9da3 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
97: 225078c = 136: 314e5b0 compat/mingw: handle WSA errors in strerror
143: b83aec6 = 137: 213fca4 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
102: 0aef1a5 = 138: d33f9ff compat/mingw: drop outdated comment
144: 298712c = 139: 15d61f6 Merge branch 'optionally-dont-append-atomically-on-windows'
107: 1e5d49c = 140: c753b63 t0301: actually test credential-cache on Windows
145: 16f90f3 = 141: 1f052b8 Merge branch 'fsync-object-files-always'
120: 97042bf = 142: bb037bf credential-cache: handle ECONNREFUSED gracefully
121: 596e539 = 143: 5ea002b reftable: do make sure to use custom allocators
122: c9f3694 = 144: cadd82d check-whitespace: avoid alerts about upstream commits
123: d9a3c04 = 145: cd653bc t/t5571-prep-push-hook.sh: Add test with writing to stderr
146: a1347d2 = 146: 4c9f913 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
147: 9aceb09 = 147: f8bc28c Fix Windows version resources (Fix Windows version resources git#4092)
148: 4627b19 = 148: 07d78d3 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
149: 7c62346 = 149: 7f977e6 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)150: 056b0e6 = 150: 3e29931 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)151: 0f03741 = 151: 7f95eda Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283152: 9b7f779 = 152: b2088e5 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
153: 40d8200 = 153: b03fed4 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
154: 29734b7 = 154: ad7122d Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
155: a887791 = 155: ad0f49f Merge branch 'nano-server'
156: 0af31e9 = 156: 2b2c10f Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
157: 2333aa3 = 157: 69acc7b win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
158: edd4354 = 158: 9df12d2 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
159: c5fe250 = 159: 50946c2 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
160: af6f21f = 160: f978861 Merge branch 'Fix-i686-build-with-GCC-v14'
161: 9849f32 = 161: 9ebe09d Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
162: 6189532 = 162: 8117be3 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
163: 7617bd3 = 163: 151d2bc pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
164: 34a0508 = 164: 1d6e241 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
165: 04c30b5 = 165: eb5d4e8 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
166: 8aa8b42 = 166: 8bed5bc credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
167: 6a8626a = 167: ab8060b Merge branch 'reftable-vs-custom-allocators'
168: b07c616 = 168: 1b1134f Merge branch 'check-whitespace-only-downstream'
169: c9344fd = 169: 665c742 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)
170: 88f8892 = 170: 2f0edce Merge branch 'ready-for-upstream'
171: bcee52d = 171: fb703e3 git-svn: mark it as unsupported by the Git for Windows project
172: 463fe31 = 172: 38f66f6 ci(macos): skip the
git p4tests173: 89ca19b = 173: b813d11 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)
174: 9f5e894 = 174: 5558197 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)186: 04adbf0 = 175: a75b7c0 git-gui--askyesno: fix funny text wrapping
188: 91096cd = 176: 23a3c02 git-gui--askyesno (mingw): use Git for Windows' icon, if available
175: fc5a175 = 177: 9ce7c64 Win32: make FILETIME conversion functions public
190: e7c2dea = 178: 8f38097 Merge branch 'git-gui-askyesno'
176: 863d613 = 179: b18ca1a Win32: dirent.c: Move opendir down
177: 862f749 = 180: d900ebf mingw: make the dirent implementation pluggable
178: fe5a8da = 181: 177dc9c Win32: make the lstat implementation pluggable
179: 4d7c53b = 182: f65aba3 mingw: add infrastructure for read-only file system level caches
180: 940f3e9 = 183: cfccf42 mingw: add a cache below mingw's lstat and dirent implementations
181: 3ebad94 = 184: 4694fec fscache: load directories only once
182: 3b5c202 = 185: cb87541 fscache: add key for GIT_TRACE_FSCACHE
183: 41fc6bd = 186: 20b9ab6 fscache: remember not-found directories
184: 67b0208 = 187: 289f0be fscache: add a test for the dir-not-found optimization
185: 898d57b = 188: 13d892d add: use preload-index and fscache for performance
187: 8972f9e = 189: 88cc495 dir.c: make add_excludes aware of fscache during status
189: 1dd0b25 = 190: 301d8fe fscache: make fscache_enabled() public
191: be37836 = 191: 21ba9e1 dir.c: regression fix for add_excludes with fscache
192: 82a917b = 192: 861e8a8 fetch-pack.c: enable fscache for stats under .git/objects
193: 73f6865 = 193: 31c3125 checkout.c: enable fscache for checkout again
194: c43103d = 194: 5a534cf Enable the filesystem cache (fscache) in refresh_index().
195: 30777e3 = 195: f90f8fc fscache: use FindFirstFileExW to avoid retrieving the short name
196: f4ade51 = 196: 10b4329 fscache: add GIT_TEST_FSCACHE support
197: ece9d26 = 197: 6c4ee37 fscache: add fscache hit statistics
198: d3a8136 = 198: 01a16bd unpack-trees: enable fscache for sparse-checkout
199: f0bc24d = 199: 8b9a5f9 status: disable and free fscache at the end of the status command
200: a5c11b4 = 200: abf5dff mem_pool: add GIT_TRACE_MEMPOOL support
201: dddf5b7 = 201: b397807 fscache: fscache takes an initial size
202: b10a5a0 = 202: fe0f106 fscache: update fscache to be thread specific instead of global
203: d74026b = 203: cf13b5b fscache: teach fscache to use mempool
204: 9787bb9 = 204: 50099d4 fscache: make fscache_enable() thread safe
205: 3c046a4 = 205: 5208af4 fscache: teach fscache to use NtQueryDirectoryFile
206: b1de1e3 = 206: eada9bd fscache: remember the reparse tag for each entry
207: c3ce6b2 = 207: fbd3389 Merge branch 'fscache'
208: f9a144e = 208: bc53f3f fscache: implement an FSCache-aware is_mount_point()
209: bbf8341 = 209: d79e2d0 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
210: 2259af1 = 210: a8ba17c clean: make use of FSCache
211: 47232c6 = 211: db66077 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
212: 393cf00 = 212: 577d49e Merge branch 'dont-clean-junctions-fscache'
213: 8e5ce64 = 213: e58bbf7 pack-objects (mingw): demonstrate a segmentation fault with large deltas
214: 6309832 = 214: 69c75a2 mingw: support long paths
215: 576f6f7 = 215: 51409dd win32(long path support): leave drive-less absolute paths intact
216: 06cd00a = 216: 7490a5b compat/fsmonitor/fsm-*-win32: support long paths
217: cd28148 = 217: 14b6fb3 clean: suggest using
core.longPathsif paths are too long to remove218: 9617357 = 218: 755175e mingw: Support
git_terminal_promptwith more terminals219: 038696e = 219: d9c8072 compat/terminal.c: only use the Windows console if bash 'read -r' fails
220: 8219b6b = 220: 7608982 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
221: 280e24f = 221: e4f923f Win32: symlink: move phantom symlink creation to a separate function
222: eb392d5 = 222: 95133e3 Introduce helper to create symlinks that knows about index_state
223: 7a871f8 = 223: b5a4cf7 mingw: allow to specify the symlink type in .gitattributes
224: e5c44b1 = 224: c99c747 Win32: symlink: add test for
symlinkattribute225: 5a6b328 = 225: 8b37480 mingw: explicitly specify with which cmd to prefix the cmdline
226: 39cc4f4 = 226: 0fc1412 mingw: when path_lookup() failed, try BusyBox
235: 257348b = 227: 32f8fb5 mingw: introduce code to detect whether we're inside a Windows container
227: 595f982 = 228: 38f689c test-tool: learn to act as a drop-in replacement for
iconv237: c49e54b = 229: a74394b mingw: when running in a Windows container, try to rename() harder
228: e7837f8 = 230: 1093212 tests(mingw): if
iconvis unavailable, usetest-helper --iconv239: cef9903 = 231: bb3ddf0 mingw: move the file_attr_to_st_mode() function definition
229: a3a028a = 232: 1e11278 gitattributes: mark .png files as binary
241: e2ef187 = 233: e45ebd1 mingw: Windows Docker volumes are not symbolic links
230: 7b93aee = 234: 7beeb96 tests: move test PNGs into t/lib-diff/
243: 8e3b49f = 235: 9768989 mingw: work around rename() failing on a read-only file
231: 0935f0a = 236: faa5b0a tests: only override sort & find if there are usable ones in /usr/bin/
232: b52ac6b = 237: c356bc1 tests: use the correct path separator with BusyBox
233: a4e7f10 = 238: b6b1990 mingw: only use Bash-ism
builtin pwd -Wwhen available234: 4e40d54 = 239: 89465d1 tests (mingw): remove Bash-specific pwd option
236: 2daa0d7 = 240: 9269ab3 test-lib: add BUSYBOX prerequisite
244: 0055a65 = 241: 1e05754 Merge branch 'gitk-and-git-gui-patches'
238: b9dcca7 = 242: 6d5af9d t5003: use binary file from t/lib-diff/
245: 260d3c6 = 243: e7f3e5b Merge branch 'long-paths'
240: 4b27a2e = 244: a695a90 t5532: workaround for BusyBox on Windows
246: 1839cf3 = 245: 60af78c Merge branch 'msys2'
242: a0aa515 = 246: 010568b t5605: special-case hardlink test for BusyBox-w32
247: 1e9e722 = 247: 057729e Merge 'docker-volumes-are-no-symlinks'
248: d48126f = 248: f2e130f t5813: allow for $PWD to be a Windows path
249: 457e4e3 = 249: 8a96ff2 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
250: 991055e = 250: 9daa3c3 t9200: skip tests when $PWD contains a colon
251: 34d1b16 = 251: 27bc078 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
252: 838f7f4 = 252: b00baa6 Describe Git for Windows' architecture [no ci]
253: 7e66732 = 253: 62bc857 mingw: kill child processes in a gentler way
254: e0c1ccb = 254: 70765f7 mingw: optionally enable wsl compability file mode bits
255: 986c6ca = 255: 578a04f Merge branch 'busybox-w32'
256: c519cde = 256: e3e4374 Modify the Code of Conduct for Git for Windows
257: a69b368 = 257: 29cce68 mingw: really handle SIGINT
258: 4762562 = 258: 86e7ac7 Merge branch 'wsl-file-mode-bits'
259: 703dc34 = 259: a3d037c CONTRIBUTING.md: add guide for first-time contributors
260: fa2f18a = 260: 7c0a504 Partially un-revert "editor: save and reset terminal after calling EDITOR"
261: e606f7f = 261: cda8ffa Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
262: 570ad58 = 262: a5bc509 README.md: Add a Windows-specific preamble
263: 8f4014c = 263: 9c0e170 reset: reinstate support for the deprecated --stdin option
264: 2a16908 = 264: af6eac2 Merge branch 'un-revert-editor-save-and-reset'
265: fcc6ce7 = 265: 55d4953 Add an issue template
266: 097aada = 266: 14d7443 Add a GitHub workflow to monitor component updates
267: e7f4dc6 = 267: ca55884 fsmonitor: reintroduce core.useBuiltinFSMonitor
268: 6f9f07e = 268: 0f0dfe5 Merge branch 'phase-out-reset-stdin'
269: 0a22d27 = 269: 2937e25 Modify the GitHub Pull Request template (to reflect Git for Windows)
270: 17056e1 = 270: c29ac7d dependabot: help keeping GitHub Actions versions up to date
271: e2ae5d2 = 271: 7015aaa Merge branch 'deprecate-core.useBuiltinFSMonitor'
272: 49615e7 = 272: 9d6d673 SECURITY.md: document Git for Windows' policies
273: cba6e93 = 273: 4a7040f Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
274: b9cd4bf = 274: a59f340 Merge 'readme' into HEAD
275: a40e688 = 275: 0c2491c Merge branch 'disallow-ntlm-auth-by-default'
276: 05267eb = 276: aa06b63 http: fix bug in ntlm_allow=1 handling
277: ec195df = 277: 1b30e5a http: fix bug in ntlm_allow=1 handling (http: fix bug in ntlm_allow=1 handling git#6136)
278: 66c87c2 = 278: 8f9aac2 fixup! git-svn: mark it as unsupported by the Git for Windows project
279: c54cba6 = 279: b3f41fe
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)280: 820cdfe = 280: 0a844f5 mingw: use strftime() directly in UCRT builds (mingw: use strftime() directly in UCRT builds git#6130)
281: 621198c = 281: 7ca6306 dir: do not traverse mount points
282: 24c3da7 = 282: 62f91db Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)