Rebase shears/next: 2 conflict(s) (0 skipped, 2 resolved) (#23916656090)#83
Open
gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/next-23916656090from
Open
Rebase shears/next: 2 conflict(s) (0 skipped, 2 resolved) (#23916656090)#83gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/next-23916656090from
gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/next-23916656090from
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>
NtQueryObject under Wine can return a success but fill out no name. In those situations, Wine will set Buffer to NULL, and set result to the sizeof(OBJECT_NAME_INFORMATION). Running a command such as echo "$(git.exe --version 2>/dev/null)" will crash due to a NULL pointer dereference when the code attempts to null terminate the buffer, although, weirdly, removing the subshell or redirecting stdout to a file will not trigger the crash. Code has been added to also check Buffer and Length to ensure the check is as robust as possible due to the current behavior being fragile at best, and could potentially change in the future This code is based on the behavior of NtQueryObject under wine and reactos. Signed-off-by: Christopher Degawa <ccom@randomderp.com>
Atomic append on windows is only supported on local disk files, and it may cause errors in other situations, e.g. network file system. If that is the case, this config option should be used to turn atomic append off. Co-Authored-By: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: 孙卓识 <sunzhuoshi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
From the documentation of said setting: This boolean will enable fsync() when writing object files. This is a total waste of time and effort on a filesystem that orders data writes properly, but can be useful for filesystems that do not use journalling (traditional UNIX filesystems) or that only journal metadata and not file contents (OS X’s HFS+, or Linux ext3 with "data=writeback"). The most common file system on Windows (NTFS) does not guarantee that order, therefore a sudden loss of power (or any other event causing an unclean shutdown) would cause corrupt files (i.e. files filled with NULs). Therefore we need to change the default. Note that the documentation makes it sound as if this causes really bad performance. In reality, writing loose objects is something that is done only rarely, and only a handful of files at a time. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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: e925f20433 (Don't traverse mount points in
remove_dir_recurse()(git-for-windows#6151), 2026-03-31) (6f46844422..e925f20433)Resolved: 28ffb84 (Merge branch 'disallow-ntlm-auth-by-default', 2026-02-12)
kept both sides' independent additions in http.c and t/lib-httpd.sh
Range-diff
1: 28ffb84 ! 1: 82ca8ef 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 5e75d96e0b..d568abd13b 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"); + +-<<<<<<< a33ef11284 (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 98540310f9..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 +-<<<<<<< a33ef11284 (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: 0105831 (mingw: use strftime() directly in UCRT builds (git-for-windows#6130), 2026-03-25)
kept HEAD (rebased) version for all 8 conflicting files; merge commit's actual payload (git-svn/strftime changes) was already cleanly applied
Range-diff
1: 0105831 ! 1: 54de711 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 75897d34f0..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 +-<<<<<<< 54f7e79c4f (`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 d6316a0305..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; +-<<<<<<< 54f7e79c4f (`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 8f313a60ed..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." -+); + /** +-<<<<<<< 54f7e79c4f (`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 ## + remerge CONFLICT (content): Merge conflict in http.c + index 869ab55b5d..c6ba13d80b 100644 + --- http.c + +++ http.c +@@ http.c: static long http_schannel_check_revoke_mode = + CURLSSLOPT_NO_REVOKE; + #endif + +-<<<<<<< 54f7e79c4f (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + static long http_retry_after = 0; + static long http_max_retries = 0; + static long http_max_retry_time = 300; + +-======= +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + - my $cmd; - for (my $i = 0; $i < @ARGV; $i++) { - if (defined $cmd{$ARGV[$i]}) { + /* + * With the backend being set to `schannel`, setting sslCAinfo would override + * the Certificate Store in cURL v7.60.0 and later, which is not what we want - ## t/t9108-git-svn-glob.sh ## -@@ t/t9108-git-svn-glob.sh: test_expect_success 'test disallow multi-globs' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch three 2> stderr.three && -- test_cmp expect.three stderr.three -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean && -+ test_cmp expect.three stderr.three.clean - ' + ## refs/reftable-backend.c ## + remerge CONFLICT (content): Merge conflict in refs/reftable-backend.c + index dedd036efd..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 +-<<<<<<< 54f7e79c4f (`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 88ac16b192..c6a3c00115 100644 + --- sideband.c + +++ sideband.c +@@ sideband.c: static struct keyword_entry keywords[] = { + }; - test_done + static enum { +-<<<<<<< 54f7e79c4f (`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; + +-<<<<<<< 54f7e79c4f (`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); + } + +-<<<<<<< 54f7e79c4f (`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 +-<<<<<<< 54f7e79c4f (`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; + +-<<<<<<< 54f7e79c4f (`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--) { +-<<<<<<< 54f7e79c4f (`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, '^'); +-<<<<<<< 54f7e79c4f (`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/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/meson.build ## + remerge CONFLICT (content): Merge conflict in t/meson.build + index 670fcb2600..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', +-<<<<<<< 54f7e79c4f (`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 2f1b953745..3010913bb1 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 +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 54f7e79c4f (`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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 54f7e79c4f (`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: ec5e3b22fa (Don't traverse mount points in
remove_dir_recurse()(git-for-windows#6151), 2026-03-31) (b1e40751aa..ec5e3b22fa)Statistics
Range-diff (click to expand)
1: 4151599 = 1: 5af5a79 unix-socket: avoid leak when initialization fails
2: 68076b5 = 2: e0b356f grep: prevent
^$false match at end of file3: ff96c87 = 3: 654cf29 Merge branch 'fixes-from-the-git-mailing-list'
8: fac588c = 4: 27b11b2 t9350: point out that refs are not updated correctly
10: 9a6352d = 5: 08ffb04 transport-helper: add trailing --
12: 6eae167 = 6: d9bdf3a remote-helper: check helper status after import/export
15: c6e182b = 7: efaf1a9 Always auto-gc after calling a fast-import transport
18: 66bd5ff = 8: bf98a4d vcpkg_install: detect lack of Git
19: 6f0fceb = 9: 84cd43c vcpkg_install: add comment regarding slow network connections
20: ac959ad = 10: f692063 vcbuild: install ARM64 dependencies when building ARM64 binaries
21: e9b3dcf = 11: 2201319 vcbuild: add an option to install individual 'features'
22: 6b3f28d = 12: b546fee cmake: allow building for Windows/ARM64
4: c1c3de1 = 13: 84ab32f mingw: include the Python parts in the build
23: eb1a831 = 14: 30c57dd ci(vs-build) also build Windows/ARM64 artifacts
5: 4468b39 = 15: 7ccc892 win32/pthread: avoid name clashes with winpthread
25: d43b05d = 16: 4d773a8 Add schannel to curl installation
26: 126f43c = 17: c06aef2 hash-object: demonstrate a >4GB/LLP64 problem
6: fc6dbf2 = 18: e88d348 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
28: 9734c9d = 19: 78b9596 cmake(): allow setting HOST_CPU for cross-compilation
29: a3381a0 = 20: a42b5f3 object-file.c: use size_t for header lengths
7: ddc5b5b = 21: 2048d2d Import the source code of mimalloc v2.2.7
31: 8cc9d3e = 22: bd3afee CMake: default Visual Studio generator has changed
32: fc233c4 = 23: 561e5a7 hash algorithms: use size_t for section lengths
9: c9ae3ce = 24: f01a714 mimalloc: adjust for building inside Git
34: c92eb24 = 25: b11a8af mingw: demonstrate a
git addissue with NTFS junctions35: 444557b = 26: 80c5094 .gitignore: add Visual Studio CMakeSetting.json file
36: f948947 = 27: ae094c0 hash-object --stdin: verify that it works with >4GB/LLP64
11: 90fadd9 = 28: a64b3b4 mimalloc: offer a build-time option to enable it
38: d0d1a09 = 29: 698849d t5505/t5516: allow running without
.git/branches/in the templates13: 37a4be2 = 30: 094df05 clean: do not traverse mount points
39: 5dea689 = 31: 242acd9 strbuf_realpath(): use platform-dependent API if available
40: 0fdecbd = 32: ca93df5 http: use new "best effort" strategy for Secure Channel revoke checking
41: 891bd01 = 33: 7111a41 subtree: update
contrib/subtreetesttarget42: 48a243f = 34: 9181dd7 CMakeLists: add default "x64-windows" arch for Visual Studio
43: afc7abe = 35: 64d72f6 hash-object: add another >4GB/LLP64 test case
44: 7d79c88 = 36: 3d7f4af setup: properly use "%(prefix)/" when in WSL
45: b2312eb = 37: 8a94ca1 Add config option
windows.appendAtomically14: 8ccad13 = 38: 9b7edcf mingw: use mimalloc
47: 3dbee9c = 39: 9a81fd6 t5505/t5516: fix white-space around redirectors
16: d068c77 = 40: a416498 mingw: prevent regressions with "drive-less" absolute paths
17: 4304dfc = 41: 0961155 clean: remove mount points when possible
49: f33ec1b = 42: 81eca14 transport: optionally disable side-band-64k
50: 82a9f90 = 43: 181add1 mingw: fix fatal error working on mapped network drives on Windows
51: ffe20e7 = 44: cbb5187 clink.pl: fix MSVC compile script to handle libcurl-d.lib
52: bbfd87d = 45: edd7feb mingw: implement a platform-specific
strbuf_realpath()53: ef24e90 = 46: b82ec21 t3701: verify that we can add lots of files interactively
54: 94f91ef = 47: 0b6a515 commit: accept "scissors" with CR/LF line endings
55: 391042e = 48: 41f60d2 t0014: fix indentation
56: ab6c9a3 = 49: 7d93e80 git-gui: accommodate for intent-to-add files
57: 5e0962c = 50: 90388e9 mingw: allow for longer paths in
parse_interpreter()58: 92819d2 = 51: fd67664 compat/vcbuild: document preferred way to build in Visual Studio
59: 89fe246 = 52: 76f1cd7 http: optionally send SSL client certificate
60: e54c184 = 53: a63b664 ci: run
contrib/subtreetests in CI builds61: 4ebfd51 = 54: 9a027ae CMake: show Win32 and Generator_platform build-option values
62: 1ab8290 = 55: 57e15f3 hash-object: add a >4GB/LLP64 test case using filtered input
63: 4257d80 = 56: 9d1234d compat/mingw.c: do not warn when failing to get owner
64: 2a086fc = 57: 2f01b61 mingw: $env:TERM="xterm-256color" for newer OSes
65: ac808a9 = 58: 348277a winansi: check result and Buffer before using Name
66: 091d1da = 59: 4f1928b mingw: change core.fsyncObjectFiles = 1 by default
24: 3b5ea0f = 60: 1683ab9 windows: skip linking
git-<command>for built-ins27: 55e5957 = 61: e03fe71 mingw: stop hard-coding
CC = gcc30: 0f44648 = 62: 043e778 mingw: drop the -D_USE_32BIT_TIME_T option
33: ccd124d = 63: 5f7f8d7 mingw: only use -Wl,--large-address-aware for 32-bit builds
37: d2cf9b6 = 64: b24ef67 mingw: avoid over-specifying
--pic-executable46: 895cb43 = 65: 46ca7f0 mingw: set the prefix and HOST_CPU as per MSYS2's settings
69: 3c84738 = 66: 8b13dba mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
70: 472aa3f = 67: 266fce0 mingw: rely on MSYS2's metadata instead of hard-coding it
71: 406e6ae = 68: 1472c86 mingw: always define
ETC_*for MSYS2 environments72: 1ce72e4 = 69: d02469c max_tree_depth: lower it for clang builds in general on Windows
73: 7fda4e8 = 70: de51a7a mingw: ensure valid CTYPE
74: 8d54ae2 = 71: 22f17ca ci: work around a problem with HTTP/2 vs libcurl v8.10.0
75: c766d4f = 72: bc75f75 mingw: allow
git.exeto be used instead of the "Git wrapper"76: 412032a = 73: 3be9531 revision: create mark_trees_uninteresting_dense()
77: e235969 = 74: f52a420 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
78: c15251c = 75: d789bc8 survey: stub in new experimental 'git-survey' command
79: 4899ea6 = 76: 65f4109 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
80: 007de6a = 77: d1832d2 survey: add command line opts to select references
81: f9390d5 = 78: fd56d43 clink.pl: fix libexpatd.lib link error when using MSVC
82: 4aeb4bc = 79: 1e17c27 survey: start pretty printing data in table form
83: 8daa163 = 80: 0fff258 Makefile: clean up .ilk files when MSVC=1
84: 8923a69 = 81: 0b93f93 survey: add object count summary
86: 922a6f0 = 82: 5258fae vcbuild: add support for compiling Windows resource files
87: 9b17643 = 83: 75eb9f7 survey: summarize total sizes by object type
89: 1ec265d = 84: d0269f2 config.mak.uname: add git.rc to MSVC builds
48: 9d30edc = 85: c1fbba8 MinGW: link as terminal server aware
90: 06b1df7 = 86: 86e9a83 survey: show progress during object walk
91: 5929007 = 87: 374d6ed mingw: make sure
errnois set correctly when socket operations fail93: 49eb55a = 88: 751afbc clink.pl: ignore no-stack-protector arg on MSVC=1 builds
94: 788fa8a = 89: 893f645 http: optionally load libcurl lazily
95: c7ab825 = 90: 39719c7 survey: add ability to track prioritized lists
96: dba5538 = 91: 8452164 compat/mingw: handle WSA errors in strerror
98: 577fc39 = 92: d65d660 clink.pl: move default linker options for MSVC=1 builds
99: 87c4d7a = 93: ef42a5e http: support lazy-loading libcurl also on Windows
100: 54e2d7a = 94: c647dc1 survey: add report of "largest" paths
101: 00974c1 = 95: 2ab82c8 compat/mingw: drop outdated comment
103: 60ab13b = 96: da6ccc8 cmake: install headless-git.
104: 1414537 = 97: b768799 http: when loading libcurl lazily, allow for multiple SSL backends
105: fa28048 = 98: 052cc2e survey: add --top= option and config
106: fa7addb = 99: 2a1771e t0301: actually test credential-cache on Windows
67: cfdc1eb = 100: 8f7830b Fix Windows version resources
68: 696bada = 101: 815a803 status: fix for old-style submodules with commondir
108: 7c79f2f = 102: 2f464cf git.rc: include winuser.h
109: 5d36d67 = 103: fa7695b mingw: do load libcurl dynamically by default
110: 658cd62 = 104: 7b4b6af Add a GitHub workflow to verify that Git/Scalar work in Nano Server
111: 4642d46 = 105: 8c5f073 mingw: suggest
windows.appendAtomicallyin more cases112: 7374b52 = 106: 198e69f win32: use native ANSI sequence processing, if possible
113: 9ff66cd = 107: 79d4f46 common-main.c: fflush stdout buffer upon exit
114: de0ebfd = 108: 59734f6 t5601/t7406(mingw): do run tests with symlink support
115: 820b727 = 109: c561888 win32: ensure that
localtime_r()is declared even in i686 builds116: 2001183 = 110: a399613 Fallback to AppData if XDG_CONFIG_HOME is unset
117: 85beaea = 111: e0c2671 run-command: be helpful with Git LFS fails on Windows 7
118: 3471b73 = 112: 564dd68 survey: clearly note the experimental nature in the output
119: 2aa509b = 113: 57689ef credential-cache: handle ECONNREFUSED gracefully
120: bc34ef1 = 114: cd48951 reftable: do make sure to use custom allocators
121: 2af4883 = 115: ff1685c check-whitespace: avoid alerts about upstream commits
85: 86babcd = 116: 5a59a2b Merge 'remote-hg-prerequisites' into HEAD
88: 1fcce3e = 117: 78fe605 Merge branch 'drive-prefix'
92: 02e668e = 118: 5d48a8d Merge branch 'dont-clean-junctions'
97: 63baa69 = 119: 7eccbbd Merge branch 'msys2-python'
102: 83bbdb8 = 120: b21f4fb Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
107: b838fbf = 121: 787982f Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
123: 005c8e3 = 122: 00232c1 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
124: aae5cc8 = 123: e44562b Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
125: 66e390c = 124: 90b90c5 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction126: f9502e2 = 125: a423486 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: a3d661c = 126: cd34bad Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
128: 871c32a = 127: 2a8b28e Merge 'add-p-many-files'
129: 3372144 = 128: e85f46a Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
130: ba12a56 = 129: a769b49 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
131: a2f71e6 = 130: 303f47a Merge 'git-gui/js/intent-to-add'
132: 7c000cb = 131: 19b5252 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
133: 51ee02b = 132: ddbb032 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
134: acb8bda = 133: 7762668 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
135: fa680f3 = 134: 475906b Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path136: ecae794 = 135: 4b1feec 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: 00f9edc = 136: b374d2e 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: 564f82f = 137: cd3091e Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests139: 2f217f8 = 138: 4bbe7a9 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
140: 31c488b = 139: 9d5e10d Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t141: 9127941 = 140: 147d3eb Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory142: c264254 = 141: 53c2d52 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
143: 430607d = 142: be013c5 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
144: 7fd137c = 143: 3d9103d Merge branch 'optionally-dont-append-atomically-on-windows'
145: a518666 = 144: f4bee79 Merge branch 'fsync-object-files-always'
146: 18f8643 = 145: b9da21c Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
147: 2bfa3d4 = 146: 603bebc Fix Windows version resources (Fix Windows version resources git#4092)
122: 7d5aae0 = 147: 6cdb11b t/t5571-prep-push-hook.sh: Add test with writing to stderr
148: 2cceb89 = 148: fbb487e Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
149: c698e6d = 149: 9af4d3d Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)150: eb147b5 = 150: fb5c3ce Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)151: 600c0e2 = 151: da7b17b Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283152: 7bc954b = 152: 818d2a2 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
153: d199942 = 153: 8134873 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
154: ae9d78e = 154: 1ccdd17 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: bf563d1 = 155: 78aec57 Merge branch 'nano-server'
156: da46e82 = 156: e8690f0 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
157: de57015 = 157: af567bc win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
158: 5329202 = 158: 77bef04 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
159: b3765e0 = 159: dc6d47b Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
160: 3baaf06 = 160: f530115 Merge branch 'Fix-i686-build-with-GCC-v14'
161: 140d45c = 161: 1e99d1e Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
162: 76d7af4 = 162: c180850 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
163: 6759ec2 = 163: 4d9a1e5 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
164: 095af6b = 164: bd6e6cd 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: 72e60ab = 165: de0fb3f Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
166: 33e02a9 = 166: 6261745 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
167: 2dd9850 = 167: dbdb3ae Merge branch 'reftable-vs-custom-allocators'
168: 67da0b9 = 168: 0a0a9c0 Merge branch 'check-whitespace-only-downstream'
169: 8c9205a = 169: 6786387 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: d4d8f67 = 170: 2047e9b Merge branch 'ready-for-upstream'
171: c09b4a8 = 171: 8e9f19d git-svn: mark it as unsupported by the Git for Windows project
172: 4cc2500 = 172: 65255f9 ci(macos): skip the
git p4tests173: 0d49d04 = 173: 50af84d 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: f4397e3 = 174: f9392df ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)186: 9ad5b6a = 175: d7a84ac git-gui--askyesno: fix funny text wrapping
188: 2484201 = 176: e43cac0 git-gui--askyesno (mingw): use Git for Windows' icon, if available
175: f1f1164 = 177: 48c74c5 Win32: make FILETIME conversion functions public
190: 66f5195 = 178: 2f22244 Merge branch 'git-gui-askyesno'
176: acbd95d = 179: 5a06e6b Win32: dirent.c: Move opendir down
177: 3e77cc5 = 180: 671a824 mingw: make the dirent implementation pluggable
178: 2ff3bda = 181: 586e6f7 Win32: make the lstat implementation pluggable
179: 4cecacb = 182: b290371 mingw: add infrastructure for read-only file system level caches
180: 4de91a5 = 183: 867ffc8 mingw: add a cache below mingw's lstat and dirent implementations
181: 44187d2 = 184: cbabc2b fscache: load directories only once
182: b416183 = 185: 1519178 fscache: add key for GIT_TRACE_FSCACHE
183: cba4718 = 186: cdf4a98 fscache: remember not-found directories
184: 20c2e41 = 187: e077147 fscache: add a test for the dir-not-found optimization
185: 73df317 = 188: 840b13d add: use preload-index and fscache for performance
187: 3b4eead = 189: f4f0bfd dir.c: make add_excludes aware of fscache during status
189: 877a99b = 190: 64bdd76 fscache: make fscache_enabled() public
191: efbae34 = 191: 3d5db11 dir.c: regression fix for add_excludes with fscache
192: cb68543 = 192: 0c8cb47 fetch-pack.c: enable fscache for stats under .git/objects
193: 9e9c498 = 193: 71239d8 checkout.c: enable fscache for checkout again
194: bfb38c1 = 194: 21c420e Enable the filesystem cache (fscache) in refresh_index().
195: 0ebd5dd = 195: bd9b14d fscache: use FindFirstFileExW to avoid retrieving the short name
196: 29e8d94 = 196: 6830084 fscache: add GIT_TEST_FSCACHE support
197: 10beca5 = 197: faf876f fscache: add fscache hit statistics
198: a1d28df = 198: 31911a1 unpack-trees: enable fscache for sparse-checkout
199: 3c7862b = 199: 6a4b498 status: disable and free fscache at the end of the status command
200: 7cc99fb = 200: 28c75b4 mem_pool: add GIT_TRACE_MEMPOOL support
201: 33316ce = 201: 5789e61 fscache: fscache takes an initial size
202: 46e1505 = 202: b41b930 fscache: update fscache to be thread specific instead of global
203: 5d67cc1 = 203: 377e089 fscache: teach fscache to use mempool
204: 4448612 = 204: a6e2171 fscache: make fscache_enable() thread safe
205: 5f565d4 = 205: 9d50ede fscache: teach fscache to use NtQueryDirectoryFile
206: 3a34fee = 206: a809d28 fscache: remember the reparse tag for each entry
207: 8efde86 = 207: ebcac89 Merge branch 'fscache'
208: cebfc91 = 208: 64e2e95 fscache: implement an FSCache-aware is_mount_point()
209: 8fd4289 = 209: 6ccfe1f 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: 7d4445e = 210: 2094abc clean: make use of FSCache
211: 0308db3 = 211: e21ddcd Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
212: 3cc5b2a = 212: b0d4323 Merge branch 'dont-clean-junctions-fscache'
213: a915779 = 213: bbd08b2 pack-objects (mingw): demonstrate a segmentation fault with large deltas
214: 2fff727 = 214: 92b72c0 mingw: support long paths
215: ea61ae2 = 215: ad9bf7f win32(long path support): leave drive-less absolute paths intact
216: abbad38 = 216: 18ea29c compat/fsmonitor/fsm-*-win32: support long paths
217: a501491 = 217: e998128 clean: suggest using
core.longPathsif paths are too long to remove218: f4fed91 = 218: 84f2510 mingw: Support
git_terminal_promptwith more terminals219: 61af642 = 219: aff3352 compat/terminal.c: only use the Windows console if bash 'read -r' fails
220: f86a2f5 = 220: 3adfefa mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
221: 0467693 = 221: 23f54f5 Win32: symlink: move phantom symlink creation to a separate function
222: 90ac84e = 222: 82c6e08 Introduce helper to create symlinks that knows about index_state
223: cf0860b = 223: d42d8d2 mingw: allow to specify the symlink type in .gitattributes
224: a58b554 = 224: a35bfe0 Win32: symlink: add test for
symlinkattribute225: 0579789 = 225: 2378bfb mingw: explicitly specify with which cmd to prefix the cmdline
226: 261ac67 = 226: a257ed7 mingw: when path_lookup() failed, try BusyBox
227: c795d74 = 227: 42269b0 test-tool: learn to act as a drop-in replacement for
iconv234: d4524fe = 228: 58fde76 mingw: introduce code to detect whether we're inside a Windows container
228: c8023d6 = 229: 212d5d9 tests(mingw): if
iconvis unavailable, usetest-helper --iconv236: 28e37ef = 230: 587d133 mingw: when running in a Windows container, try to rename() harder
229: d365f06 = 231: b968510 gitattributes: mark .png files as binary
238: 01945cb = 232: c0d2d43 mingw: move the file_attr_to_st_mode() function definition
230: 363545d = 233: 09d0a7d tests: move test PNGs into t/lib-diff/
240: badc31f = 234: 5fc5e2a mingw: Windows Docker volumes are not symbolic links
231: e2c7932 = 235: f4efe1d tests: only override sort & find if there are usable ones in /usr/bin/
242: e84008a = 236: 302ec1a mingw: work around rename() failing on a read-only file
232: 6fffbd7 = 237: 2105cd8 tests: use the correct path separator with BusyBox
233: 83cd799 = 238: 713ab43 mingw: only use Bash-ism
builtin pwd -Wwhen available235: ec10709 = 239: 5674c58 tests (mingw): remove Bash-specific pwd option
237: 0eb577a = 240: db6c143 test-lib: add BUSYBOX prerequisite
243: 521edb5 = 241: 995e994 Merge branch 'gitk-and-git-gui-patches'
239: 9a541df = 242: 08c3a65 t5003: use binary file from t/lib-diff/
244: ecfce24 = 243: e53b920 Merge branch 'long-paths'
241: b482616 = 244: 57883a1 t5532: workaround for BusyBox on Windows
245: b57a04e = 245: 04cb23f Merge branch 'msys2'
246: 7bb2953 = 246: e461f40 t5605: special-case hardlink test for BusyBox-w32
247: 97986f0 = 247: b9f377f Merge 'docker-volumes-are-no-symlinks'
248: 4c90cd4 = 248: b818603 t5813: allow for $PWD to be a Windows path
249: 515c4ae = 249: 0b55fd9 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
250: 6983d71 = 250: 2b607b0 t9200: skip tests when $PWD contains a colon
251: 3a22bca = 251: dff0747 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
252: 910d309 = 252: b8dd619 Describe Git for Windows' architecture [no ci]
253: b147c4e = 253: b959ecc mingw: kill child processes in a gentler way
254: bb10909 = 254: af4977f mingw: optionally enable wsl compability file mode bits
255: 1f8badb = 255: 4584557 Merge branch 'busybox-w32'
256: 6520bbf = 256: d412f38 Modify the Code of Conduct for Git for Windows
257: bb681d9 = 257: 6bf0889 mingw: really handle SIGINT
258: 9b35d1b = 258: fe595d1 Merge branch 'wsl-file-mode-bits'
259: 35d35f2 = 259: 87c73b0 CONTRIBUTING.md: add guide for first-time contributors
260: b9ad4dc = 260: 3231d91 Partially un-revert "editor: save and reset terminal after calling EDITOR"
261: 707945a = 261: 03444ff Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
262: b69026a = 262: 15faa19 README.md: Add a Windows-specific preamble
263: c1c4279 = 263: f3be410 reset: reinstate support for the deprecated --stdin option
264: e769662 = 264: 42b9594 Merge branch 'un-revert-editor-save-and-reset'
265: 59a840d = 265: 1874fbd Add an issue template
266: 43fcffe = 266: a4b52aa Add a GitHub workflow to monitor component updates
267: 2c61c4e = 267: 1d88710 fsmonitor: reintroduce core.useBuiltinFSMonitor
268: 5ab81dc = 268: 6eab548 Merge branch 'phase-out-reset-stdin'
269: eba4a99 = 269: 6b1cc63 Modify the GitHub Pull Request template (to reflect Git for Windows)
270: c578919 = 270: 9f1f908 dependabot: help keeping GitHub Actions versions up to date
271: 32d88ca = 271: 5e44af5 Merge branch 'deprecate-core.useBuiltinFSMonitor'
272: e186afa = 272: 566d787 SECURITY.md: document Git for Windows' policies
273: 1a499bb = 273: 7adf211 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
274: e6aa32f = 274: a33ef11 Merge 'readme' into HEAD
275: 28ffb84 = 275: 82ca8ef Merge branch 'disallow-ntlm-auth-by-default'
276: 49adc0a = 276: cf17ea8 http: fix bug in ntlm_allow=1 handling
277: 38896d4 = 277: 4ac8cbd http: fix bug in ntlm_allow=1 handling (http: fix bug in ntlm_allow=1 handling git#6136)
278: afed357 = 278: ccebe0a fixup! git-svn: mark it as unsupported by the Git for Windows project
279: 212f5ed = 279: 54f7e79
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: 0105831 ! 280: 54de711 mingw: use strftime() directly in UCRT builds (mingw: use strftime() directly in UCRT builds git#6130)
@@ git-svn.perl: sub term_init { for (my $i = 0; $i < @ARGV; $i++) { if (defined $cmd{$ARGV[$i]}) { + ## http.c ## +@@ http.c: static long http_retry_after = 0; + static long http_max_retries = 0; + static long http_max_retry_time = 300; + ++ + /* + * With the backend being set to `schannel`, setting sslCAinfo would override + * the Certificate Store in cURL v7.60.0 and later, which is not what we want + ## t/t9108-git-svn-glob.sh ## @@ t/t9108-git-svn-glob.sh: test_expect_success 'test disallow multi-globs' ' svn_cmd commit -m "try to try"281: 071bf87 = 281: 2729daa dir: do not traverse mount points
282: e925f20 = 282: ec5e3b2 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)