Rebase shears/next: 2 conflict(s) (0 skipped, 2 resolved) (#23930425644)#86
Open
gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/next-23930425644from
Open
Rebase shears/next: 2 conflict(s) (0 skipped, 2 resolved) (#23930425644)#86gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/next-23930425644from
gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/next-23930425644from
Conversation
Windows' equivalent to "bind mounts", NTFS junction points, can be unlinked without affecting the mount target. This is clearly what users expect to happen when they call `git clean -dfx` in a worktree that contains NTFS junction points: the junction should be removed, and the target directory of said junction should be left alone (unless it is inside the worktree). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
While Git for Windows does not _ship_ Python (in order to save on bandwidth), MSYS2 provides very fine Python interpreters that users can easily take advantage of, by using Git for Windows within its SDK. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
In the case of Git for Windows (say, in a Git Bash window) running in a Windows Subsystem for Linux (WSL) directory, the GetNamedSecurityInfoW() call in is_path_owned_By_current_side() returns an error code other than ERROR_SUCCESS. This is consistent behavior across this boundary. In these cases, the owner would always be different because the WSL owner is a different entity than the Windows user. The change here is to suppress the error message that looks like this: error: failed to get owner for '//wsl.localhost/...' (1) Before this change, this warning happens for every Git command, regardless of whether the directory is marked with safe.directory. Signed-off-by: Derrick Stolee <derrickstolee@github.com>
For Windows builds >= 15063 set $env:TERM to "xterm-256color" instead of "cygwin" because they have a more capable console system that supports this. Also set $env:COLORTERM="truecolor" if unset. $env:TERM is initialized so that ANSI colors in color.c work, see 29a3963 (Win32: patch Windows environment on startup, 2012-01-15). See git-for-windows#3629 regarding problems caused by always setting $env:TERM="cygwin". This is the same heuristic used by the Cygwin runtime. Signed-off-by: Rafael Kitover <rkitover@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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: next
From: ec5e3b22fa (Don't traverse mount points in
remove_dir_recurse()(git-for-windows#6151), 2026-03-31) (b1e40751aa..ec5e3b22fa)Resolved: 82ca8ef (Merge branch 'disallow-ntlm-auth-by-default', 2026-02-12)
kept both sides' additions in http.c (retry env vars + http_auth_methods) and t/lib-httpd.sh (http-429.sh + ntlm-handshake.sh)
Range-diff
1: 82ca8ef ! 1: 1b1fd2c 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 820469d4f9..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"); + +-<<<<<<< d5b626993a (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 e64729bcf8..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 +-<<<<<<< d5b626993a (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: 54de711 (mingw: use strftime() directly in UCRT builds (git-for-windows#6130), 2026-03-25)
resolved all 8 conflicts by keeping HEAD's code, matching the original merge resolution
Range-diff
1: 54de711 ! 1: 5528743 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 f2628bdae4..96fade7f5f 100644 + --- Documentation/config/sideband.adoc + +++ Documentation/config/sideband.adoc +@@ Documentation/config/sideband.adoc: sideband.allowControlCharacters:: + 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 +-<<<<<<< 960329bf7c (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + this config setting to override this behavior (the value can be + a comma-separated list of the following keywords): + + +@@ Documentation/config/sideband.adoc: sideband.allowControlCharacters:: + sideband.<url>.*:: + Apply the `sideband.*` option selectively to specific URLs. The + same URL matching logic applies as for `http.<url>.*` settings. +-======= +- 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 17e04647bc..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; +-<<<<<<< 960329bf7c (`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 cb1daca6c1..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]}) { + /** +-<<<<<<< 960329bf7c (`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. + */ ## http.c ## -@@ http.c: static long http_retry_after = 0; + remerge CONFLICT (content): Merge conflict in http.c + index 3fd9ba2d83..b632f9e52a 100644 + --- http.c + +++ http.c +@@ http.c: static long http_schannel_check_revoke_mode = + CURLSSLOPT_NO_REVOKE; + #endif + +-<<<<<<< 960329bf7c (`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/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 e539e4d3da..5ca27f026d 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 +-<<<<<<< 960329bf7c (`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/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 - ' + ## sideband.c ## + remerge CONFLICT (content): Merge conflict in sideband.c + index 6a5a7c1306..c6a3c00115 100644 + --- sideband.c + +++ sideband.c +@@ sideband.c: static struct keyword_entry keywords[] = { + }; - test_done + static enum { +-<<<<<<< 960329bf7c (`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; + +-<<<<<<< 960329bf7c (`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); + } + +-<<<<<<< 960329bf7c (`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 +-<<<<<<< 960329bf7c (`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; + +-<<<<<<< 960329bf7c (`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--) { +-<<<<<<< 960329bf7c (`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, '^'); +-<<<<<<< 960329bf7c (`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 98fc1c0953..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', +-<<<<<<< 960329bf7c (`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/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 - ' + ## t/t5409-colorize-remote-messages.sh ## + remerge CONFLICT (content): Merge conflict in t/t5409-colorize-remote-messages.sh + index fe80421b28..12c3af2382 100755 + --- t/t5409-colorize-remote-messages.sh + +++ t/t5409-colorize-remote-messages.sh +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'disallow (color) control sequences in sideband' ' + printf "error: Have you \\033[31mread\\033[m this?\\a\\n" >&2 + exec "$@" + EOF +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 960329bf7c (`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_config_global uploadPack.packObjectshook ./color-me-surprised && +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + test_commit need-at-least-one-commit && + git clone --no-local . throw-away 2>stderr && +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'disallow (color) control sequences in sideband' ' + test_file_not_empty actual + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 960329bf7c (`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: 414ed0d918 (Don't traverse mount points in
remove_dir_recurse()(git-for-windows#6151), 2026-03-31) (e42d9d93c9..414ed0d918)Statistics
Range-diff (click to expand)
1: 5af5a79 = 1: ef71eb1 unix-socket: avoid leak when initialization fails
2: e0b356f = 2: c1110f8 grep: prevent
^$false match at end of file3: 654cf29 = 3: b0d0809 Merge branch 'fixes-from-the-git-mailing-list'
4: 27b11b2 = 4: 8fdfcd5 t9350: point out that refs are not updated correctly
5: 08ffb04 = 5: b843c09 transport-helper: add trailing --
8: bf98a4d = 6: 42687ef vcpkg_install: detect lack of Git
9: 84cd43c = 7: 672bfab vcpkg_install: add comment regarding slow network connections
10: f692063 = 8: 56c7c11 vcbuild: install ARM64 dependencies when building ARM64 binaries
11: 2201319 = 9: f809649 vcbuild: add an option to install individual 'features'
12: b546fee = 10: 5ef1ca2 cmake: allow building for Windows/ARM64
13: 84ab32f = 11: dad3019 mingw: include the Python parts in the build
14: 30c57dd = 12: f19e29a ci(vs-build) also build Windows/ARM64 artifacts
15: 7ccc892 = 13: eeb6b4a win32/pthread: avoid name clashes with winpthread
16: 4d773a8 = 14: 186e634 Add schannel to curl installation
17: c06aef2 = 15: 16e869c hash-object: demonstrate a >4GB/LLP64 problem
18: e88d348 = 16: 99b7e4e git-compat-util: avoid redeclaring _DEFAULT_SOURCE
19: 78b9596 = 17: 7dd7d8a cmake(): allow setting HOST_CPU for cross-compilation
20: a42b5f3 ! 18: cfcd78e object-file.c: use size_t for header lengths
21: 2048d2d = 19: 5dd5870 Import the source code of mimalloc v2.2.7
22: bd3afee = 20: 025af2c CMake: default Visual Studio generator has changed
23: 561e5a7 = 21: 72b2866 hash algorithms: use size_t for section lengths
24: f01a714 = 22: 15cd5f3 mimalloc: adjust for building inside Git
25: b11a8af = 23: 3a24d3d mingw: demonstrate a
git addissue with NTFS junctions26: 80c5094 = 24: ca6f3b8 .gitignore: add Visual Studio CMakeSetting.json file
27: ae094c0 = 25: 6af9f4d hash-object --stdin: verify that it works with >4GB/LLP64
28: a64b3b4 = 26: 73717a0 mimalloc: offer a build-time option to enable it
29: 698849d = 27: b1a083b t5505/t5516: allow running without
.git/branches/in the templates6: d9bdf3a = 28: ce2b1e4 remote-helper: check helper status after import/export
30: 094df05 = 29: e395255 clean: do not traverse mount points
31: 242acd9 = 30: b6f5e64 strbuf_realpath(): use platform-dependent API if available
32: ca93df5 = 31: 1425070 http: use new "best effort" strategy for Secure Channel revoke checking
33: 7111a41 = 32: 44bd493 subtree: update
contrib/subtreetesttarget34: 9181dd7 = 33: 6c5d189 CMakeLists: add default "x64-windows" arch for Visual Studio
35: 64d72f6 = 34: 5b8b910 hash-object: add another >4GB/LLP64 test case
36: 3d7f4af = 35: cab6377 setup: properly use "%(prefix)/" when in WSL
38: 9b7edcf = 36: f8ab5d9 mingw: use mimalloc
39: 9a81fd6 = 37: 177e94e t5505/t5516: fix white-space around redirectors
7: efaf1a9 = 38: bfaa638 Always auto-gc after calling a fast-import transport
40: a416498 = 39: 8836f12 mingw: prevent regressions with "drive-less" absolute paths
41: 0961155 = 40: 734e314 clean: remove mount points when possible
42: 81eca14 = 41: 1c62cef transport: optionally disable side-band-64k
43: 181add1 = 42: 67f7c1f mingw: fix fatal error working on mapped network drives on Windows
44: cbb5187 = 43: 2e8dabd clink.pl: fix MSVC compile script to handle libcurl-d.lib
45: edd7feb = 44: 9808071 mingw: implement a platform-specific
strbuf_realpath()46: b82ec21 = 45: 76d9501 t3701: verify that we can add lots of files interactively
47: 0b6a515 = 46: ef1ff2f commit: accept "scissors" with CR/LF line endings
48: 41f60d2 = 47: c03d5b2 t0014: fix indentation
49: 7d93e80 = 48: fbe8c26 git-gui: accommodate for intent-to-add files
50: 90388e9 = 49: 39aa579 mingw: allow for longer paths in
parse_interpreter()51: fd67664 = 50: cb3e8ac compat/vcbuild: document preferred way to build in Visual Studio
52: 76f1cd7 = 51: 7af113e http: optionally send SSL client certificate
53: a63b664 = 52: 906c2d9 ci: run
contrib/subtreetests in CI builds54: 9a027ae = 53: 330ce53 CMake: show Win32 and Generator_platform build-option values
55: 57e15f3 = 54: 9ecde3b hash-object: add a >4GB/LLP64 test case using filtered input
56: 9d1234d = 55: 912ff7b compat/mingw.c: do not warn when failing to get owner
57: 2f01b61 = 56: 6b728a3 mingw: $env:TERM="xterm-256color" for newer OSes
60: 1683ab9 = 57: 85868c3 windows: skip linking
git-<command>for built-ins61: e03fe71 = 58: c1c6b23 mingw: stop hard-coding
CC = gcc62: 043e778 = 59: cb1f6a0 mingw: drop the -D_USE_32BIT_TIME_T option
63: 5f7f8d7 = 60: a11d075 mingw: only use -Wl,--large-address-aware for 32-bit builds
64: b24ef67 = 61: 9232673 mingw: avoid over-specifying
--pic-executable65: 46ca7f0 = 62: c0a74dd mingw: set the prefix and HOST_CPU as per MSYS2's settings
66: 8b13dba = 63: 0f1e464 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
67: 266fce0 = 64: cedbefa mingw: rely on MSYS2's metadata instead of hard-coding it
68: 1472c86 = 65: 8b59f2a mingw: always define
ETC_*for MSYS2 environments69: d02469c = 66: e0088f7 max_tree_depth: lower it for clang builds in general on Windows
70: de51a7a = 67: 7e0ed80 mingw: ensure valid CTYPE
71: 22f17ca = 68: ee6994c ci: work around a problem with HTTP/2 vs libcurl v8.10.0
72: bc75f75 = 69: 45a142f mingw: allow
git.exeto be used instead of the "Git wrapper"73: 3be9531 = 70: 236e1eb revision: create mark_trees_uninteresting_dense()
74: f52a420 = 71: 6c98614 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
75: d789bc8 = 72: a7c0333 survey: stub in new experimental 'git-survey' command
76: 65f4109 = 73: 942cfc7 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
77: d1832d2 = 74: 8edbaa4 survey: add command line opts to select references
78: fd56d43 = 75: 5862347 clink.pl: fix libexpatd.lib link error when using MSVC
79: 1e17c27 = 76: 58650ab survey: start pretty printing data in table form
80: 0fff258 = 77: d9c5903 Makefile: clean up .ilk files when MSVC=1
81: 0b93f93 = 78: 8265eeb survey: add object count summary
82: 5258fae = 79: 4f6552e vcbuild: add support for compiling Windows resource files
83: 75eb9f7 = 80: 4c92def survey: summarize total sizes by object type
84: d0269f2 = 81: 9c84e1b config.mak.uname: add git.rc to MSVC builds
85: c1fbba8 = 82: 1218a75 MinGW: link as terminal server aware
86: 86e9a83 = 83: a506164 survey: show progress during object walk
87: 374d6ed = 84: b609ba9 mingw: make sure
errnois set correctly when socket operations fail88: 751afbc = 85: 762d308 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
89: 893f645 = 86: 8fdef3d http: optionally load libcurl lazily
90: 39719c7 = 87: d869797 survey: add ability to track prioritized lists
91: 8452164 = 88: 38f03d9 compat/mingw: handle WSA errors in strerror
92: d65d660 = 89: 79d014f clink.pl: move default linker options for MSVC=1 builds
93: ef42a5e = 90: 1c7a1cb http: support lazy-loading libcurl also on Windows
94: c647dc1 = 91: f500637 survey: add report of "largest" paths
95: 2ab82c8 = 92: 3efdce7 compat/mingw: drop outdated comment
37: 8a94ca1 = 93: aa81b81 Add config option
windows.appendAtomically96: da6ccc8 = 94: 77534b7 cmake: install headless-git.
97: b768799 = 95: ed32059 http: when loading libcurl lazily, allow for multiple SSL backends
98: 052cc2e = 96: e962eae survey: add --top= option and config
99: 2a1771e = 97: 152b9c8 t0301: actually test credential-cache on Windows
58: 348277a = 98: 91555a9 winansi: check result and Buffer before using Name
59: 4f1928b = 99: c4a0675 mingw: change core.fsyncObjectFiles = 1 by default
100: 8f7830b = 100: 0d94616 Fix Windows version resources
101: 815a803 = 101: 13dddcf status: fix for old-style submodules with commondir
102: 2f464cf = 102: 14e9715 git.rc: include winuser.h
103: fa7695b = 103: 09506d8 mingw: do load libcurl dynamically by default
104: 7b4b6af = 104: bf25a61 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
105: 8c5f073 = 105: a2aee32 mingw: suggest
windows.appendAtomicallyin more cases106: 198e69f = 106: 94e7f2c win32: use native ANSI sequence processing, if possible
107: 79d4f46 = 107: 1a290c9 common-main.c: fflush stdout buffer upon exit
108: 59734f6 = 108: 711cf77 t5601/t7406(mingw): do run tests with symlink support
109: c561888 = 109: 2b7e32a win32: ensure that
localtime_r()is declared even in i686 builds110: a399613 = 110: a70f67b Fallback to AppData if XDG_CONFIG_HOME is unset
111: e0c2671 = 111: 2a512f9 run-command: be helpful with Git LFS fails on Windows 7
112: 564dd68 = 112: 8e87c92 survey: clearly note the experimental nature in the output
113: 57689ef = 113: 9fa2eb7 credential-cache: handle ECONNREFUSED gracefully
116: 5a59a2b = 114: 491ad26 Merge 'remote-hg-prerequisites' into HEAD
117: 78fe605 = 115: f0c9384 Merge branch 'drive-prefix'
118: 5d48a8d = 116: 410b9cb Merge branch 'dont-clean-junctions'
119: 7eccbbd = 117: d479178 Merge branch 'msys2-python'
120: b21f4fb = 118: ee78af7 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
121: 787982f = 119: bb889a1 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
122: 00232c1 = 120: 15ca83c Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
123: e44562b = 121: 347d1c2 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
124: 90b90c5 = 122: 33edecf Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction125: a423486 = 123: 8e011c5 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
126: cd34bad = 124: 7998a4d Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
127: 2a8b28e = 125: 02e4dda Merge 'add-p-many-files'
128: e85f46a = 126: 42f0aa8 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
129: a769b49 = 127: 665048a Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
130: 303f47a = 128: d63d6ef Merge 'git-gui/js/intent-to-add'
131: 19b5252 = 129: 7cab9ed Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
132: ddbb032 = 130: 66ae9dc Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
133: 7762668 = 131: a47f14e Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
134: 475906b = 132: 1c4d3a6 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path135: 4b1feec = 133: 1ab1244 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
136: b374d2e = 134: 211c8f5 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
137: cd3091e = 135: 87868b8 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests138: 4bbe7a9 = 136: e6c119d Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
139: 9d5e10d = 137: 6dc24c7 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t140: 147d3eb = 138: 578ce6a Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory141: 53c2d52 = 139: 8a17bf0 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
142: be013c5 = 140: 591e71a Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
143: 3d9103d = 141: 8802388 Merge branch 'optionally-dont-append-atomically-on-windows'
144: f4bee79 = 142: f9d57e4 Merge branch 'fsync-object-files-always'
145: b9da21c = 143: 6bd8e8f Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
146: 603bebc = 144: 2540cc6 Fix Windows version resources (Fix Windows version resources git#4092)
114: cd48951 = 145: 56499bc reftable: do make sure to use custom allocators
115: ff1685c = 146: 8923822 check-whitespace: avoid alerts about upstream commits
147: 6cdb11b = 147: 1f3cf42 t/t5571-prep-push-hook.sh: Add test with writing to stderr
148: fbb487e = 148: d66e85e Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
149: 9af4d3d = 149: fe75de6 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)150: fb5c3ce = 150: 767e879 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)151: da7b17b = 151: b2e8a95 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283152: 818d2a2 = 152: 3a6fa69 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
153: 8134873 = 153: 97cb3c6 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
154: 1ccdd17 = 154: 80b1772 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: 78aec57 = 155: 152a638 Merge branch 'nano-server'
156: e8690f0 = 156: 1631c37 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
157: af567bc = 157: 23b78fe win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
158: 77bef04 = 158: 1786866 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
159: dc6d47b = 159: 3ac016a Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
160: f530115 = 160: f1cbaa9 Merge branch 'Fix-i686-build-with-GCC-v14'
161: 1e99d1e = 161: f17379c Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
162: c180850 = 162: 869766f Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
163: 4d9a1e5 = 163: 180d791 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
164: bd6e6cd = 164: a7fb1a5 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: de0fb3f = 165: c419764 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
166: 6261745 = 166: 3b78b81 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
167: dbdb3ae = 167: edda0da Merge branch 'reftable-vs-custom-allocators'
168: 0a0a9c0 = 168: 47dc4ea Merge branch 'check-whitespace-only-downstream'
169: 6786387 = 169: e3d3d4c 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: 2047e9b = 170: 0fb51bc Merge branch 'ready-for-upstream'
171: 8e9f19d = 171: 32e6a04 git-svn: mark it as unsupported by the Git for Windows project
172: 65255f9 = 172: b1173d5 ci(macos): skip the
git p4tests173: 50af84d = 173: 0a57c14 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: f9392df = 174: 441bbdc ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)175: d7a84ac = 175: b6bbc5c git-gui--askyesno: fix funny text wrapping
176: e43cac0 = 176: 27f3dd8 git-gui--askyesno (mingw): use Git for Windows' icon, if available
177: 48c74c5 = 177: 128aa4f Win32: make FILETIME conversion functions public
178: 2f22244 = 178: 343f159 Merge branch 'git-gui-askyesno'
179: 5a06e6b = 179: 679bceb Win32: dirent.c: Move opendir down
180: 671a824 = 180: 64f6131 mingw: make the dirent implementation pluggable
181: 586e6f7 = 181: 451072c Win32: make the lstat implementation pluggable
182: b290371 = 182: 158299a mingw: add infrastructure for read-only file system level caches
183: 867ffc8 = 183: 399a140 mingw: add a cache below mingw's lstat and dirent implementations
184: cbabc2b = 184: ed0c5bb fscache: load directories only once
185: 1519178 = 185: 03d082d fscache: add key for GIT_TRACE_FSCACHE
186: cdf4a98 = 186: 2c4d337 fscache: remember not-found directories
187: e077147 = 187: 5ecd027 fscache: add a test for the dir-not-found optimization
188: 840b13d = 188: edb47b5 add: use preload-index and fscache for performance
189: f4f0bfd = 189: 3c639e1 dir.c: make add_excludes aware of fscache during status
190: 64bdd76 = 190: afda573 fscache: make fscache_enabled() public
191: 3d5db11 = 191: 03a0670 dir.c: regression fix for add_excludes with fscache
192: 0c8cb47 = 192: 23a92c2 fetch-pack.c: enable fscache for stats under .git/objects
193: 71239d8 = 193: 2ce0c9e checkout.c: enable fscache for checkout again
194: 21c420e = 194: 1fa38eb Enable the filesystem cache (fscache) in refresh_index().
195: bd9b14d = 195: 24b8635 fscache: use FindFirstFileExW to avoid retrieving the short name
196: 6830084 = 196: d9ebb7b fscache: add GIT_TEST_FSCACHE support
197: faf876f = 197: 3254d1f fscache: add fscache hit statistics
198: 31911a1 = 198: 7a26d1b unpack-trees: enable fscache for sparse-checkout
199: 6a4b498 = 199: 9a1555b status: disable and free fscache at the end of the status command
200: 28c75b4 = 200: f3b9322 mem_pool: add GIT_TRACE_MEMPOOL support
201: 5789e61 = 201: c01001a fscache: fscache takes an initial size
202: b41b930 = 202: 65d3311 fscache: update fscache to be thread specific instead of global
203: 377e089 = 203: 2c8b92d fscache: teach fscache to use mempool
204: a6e2171 = 204: 12508b6 fscache: make fscache_enable() thread safe
205: 9d50ede = 205: f5b68e4 fscache: teach fscache to use NtQueryDirectoryFile
206: a809d28 = 206: b34a29a fscache: remember the reparse tag for each entry
207: ebcac89 = 207: 26b12ab Merge branch 'fscache'
208: 64e2e95 = 208: 2bd8d82 fscache: implement an FSCache-aware is_mount_point()
209: 6ccfe1f = 209: dc69c17 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: 2094abc = 210: 3f0cac2 clean: make use of FSCache
211: e21ddcd = 211: 246fdea Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
212: b0d4323 = 212: 437fd53 Merge branch 'dont-clean-junctions-fscache'
213: bbd08b2 = 213: e67694f pack-objects (mingw): demonstrate a segmentation fault with large deltas
214: 92b72c0 = 214: 6b79286 mingw: support long paths
215: ad9bf7f = 215: 9a6827c win32(long path support): leave drive-less absolute paths intact
216: 18ea29c = 216: 1dbb556 compat/fsmonitor/fsm-*-win32: support long paths
217: e998128 = 217: 83d744c clean: suggest using
core.longPathsif paths are too long to remove218: 84f2510 = 218: dddd234 mingw: Support
git_terminal_promptwith more terminals219: aff3352 = 219: 5211a74 compat/terminal.c: only use the Windows console if bash 'read -r' fails
220: 3adfefa = 220: b5485e8 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
221: 23f54f5 = 221: 2236403 Win32: symlink: move phantom symlink creation to a separate function
222: 82c6e08 = 222: a689b3e Introduce helper to create symlinks that knows about index_state
223: d42d8d2 = 223: a4b8556 mingw: allow to specify the symlink type in .gitattributes
224: a35bfe0 = 224: f4c1881 Win32: symlink: add test for
symlinkattribute225: 2378bfb = 225: 609d10e mingw: explicitly specify with which cmd to prefix the cmdline
226: a257ed7 = 226: da9532d mingw: when path_lookup() failed, try BusyBox
228: 58fde76 = 227: 8162a98 mingw: introduce code to detect whether we're inside a Windows container
227: 42269b0 = 228: 5558742 test-tool: learn to act as a drop-in replacement for
iconv230: 587d133 = 229: 87cb22e mingw: when running in a Windows container, try to rename() harder
229: 212d5d9 = 230: 0e193fa tests(mingw): if
iconvis unavailable, usetest-helper --iconv232: c0d2d43 = 231: 1e29f73 mingw: move the file_attr_to_st_mode() function definition
231: b968510 = 232: cbdee03 gitattributes: mark .png files as binary
234: 5fc5e2a = 233: 47c8eee mingw: Windows Docker volumes are not symbolic links
233: 09d0a7d = 234: bffd8aa tests: move test PNGs into t/lib-diff/
236: 302ec1a = 235: 4379277 mingw: work around rename() failing on a read-only file
235: f4efe1d = 236: 6cdcf1a tests: only override sort & find if there are usable ones in /usr/bin/
237: 2105cd8 = 237: e0c2c94 tests: use the correct path separator with BusyBox
238: 713ab43 = 238: 7d37f99 mingw: only use Bash-ism
builtin pwd -Wwhen available239: 5674c58 = 239: 2fbda4c tests (mingw): remove Bash-specific pwd option
240: db6c143 = 240: 908eb7b test-lib: add BUSYBOX prerequisite
241: 995e994 = 241: de6fe1f Merge branch 'gitk-and-git-gui-patches'
242: 08c3a65 = 242: 6248ace t5003: use binary file from t/lib-diff/
243: e53b920 = 243: 274a8de Merge branch 'long-paths'
244: 57883a1 = 244: e649515 t5532: workaround for BusyBox on Windows
245: 04cb23f = 245: 9668d36 Merge branch 'msys2'
246: e461f40 = 246: a537caa t5605: special-case hardlink test for BusyBox-w32
247: b9f377f = 247: 7332ab6 Merge 'docker-volumes-are-no-symlinks'
248: b818603 = 248: e3bcc36 t5813: allow for $PWD to be a Windows path
249: 0b55fd9 = 249: 8d018d0 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
250: 2b607b0 = 250: 864c8d7 t9200: skip tests when $PWD contains a colon
251: dff0747 = 251: 525f7dd Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
252: b8dd619 = 252: f0ba14a Describe Git for Windows' architecture [no ci]
253: b959ecc = 253: 237254f mingw: kill child processes in a gentler way
254: af4977f = 254: 3063b53 mingw: optionally enable wsl compability file mode bits
255: 4584557 = 255: a459ab6 Merge branch 'busybox-w32'
256: d412f38 = 256: d48775c Modify the Code of Conduct for Git for Windows
257: 6bf0889 = 257: df1dc37 mingw: really handle SIGINT
258: fe595d1 = 258: 0a75fdb Merge branch 'wsl-file-mode-bits'
259: 87c73b0 = 259: 2ac6424 CONTRIBUTING.md: add guide for first-time contributors
260: 3231d91 = 260: db4892c Partially un-revert "editor: save and reset terminal after calling EDITOR"
261: 03444ff = 261: 2b5b14c Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
262: 15faa19 = 262: 70e53ac README.md: Add a Windows-specific preamble
263: f3be410 = 263: bac5ad7 reset: reinstate support for the deprecated --stdin option
264: 42b9594 = 264: 187da15 Merge branch 'un-revert-editor-save-and-reset'
265: 1874fbd = 265: cbe47c8 Add an issue template
266: a4b52aa = 266: efb611b Add a GitHub workflow to monitor component updates
267: 1d88710 = 267: 0e1e03d fsmonitor: reintroduce core.useBuiltinFSMonitor
268: 6eab548 = 268: c5c74e0 Merge branch 'phase-out-reset-stdin'
269: 6b1cc63 = 269: a58e2e0 Modify the GitHub Pull Request template (to reflect Git for Windows)
270: 9f1f908 = 270: f95bb1a dependabot: help keeping GitHub Actions versions up to date
271: 5e44af5 = 271: 99fbf5f Merge branch 'deprecate-core.useBuiltinFSMonitor'
272: 566d787 = 272: a51cc21 SECURITY.md: document Git for Windows' policies
273: 7adf211 = 273: dbadb24 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
274: a33ef11 = 274: d5b6269 Merge 'readme' into HEAD
275: 82ca8ef = 275: 1b1fd2c Merge branch 'disallow-ntlm-auth-by-default'
276: cf17ea8 = 276: 81c73b6 http: fix bug in ntlm_allow=1 handling
277: 4ac8cbd = 277: a5a37ee http: fix bug in ntlm_allow=1 handling (http: fix bug in ntlm_allow=1 handling git#6136)
278: ccebe0a = 278: a9f3444 fixup! git-svn: mark it as unsupported by the Git for Windows project
279: 54f7e79 = 279: 960329b
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: 54de711 ! 280: 5528743 mingw: use strftime() directly in UCRT builds (mingw: use strftime() directly in UCRT builds git#6130)
281: 2729daa = 281: aaf9bc5 dir: do not traverse mount points
282: ec5e3b2 = 282: 414ed0d Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)