Rebase shears/seen: 2 conflict(s) (0 skipped, 2 resolved) (#23776884452)#74
Open
gitforwindowshelper[bot] wants to merge 280 commits intobase/shears/seen-23776884452from
Open
Rebase shears/seen: 2 conflict(s) (0 skipped, 2 resolved) (#23776884452)#74gitforwindowshelper[bot] wants to merge 280 commits intobase/shears/seen-23776884452from
gitforwindowshelper[bot] wants to merge 280 commits intobase/shears/seen-23776884452from
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>
These fixes have been sent to the Git mailing list but have not been picked up by the Git project yet. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Start work on a new 'git survey' command to scan the repository for monorepo performance and scaling problems. The goal is to measure the various known "dimensions of scale" and serve as a foundation for adding additional measurements as we learn more about Git monorepo scaling problems. The initial goal is to complement the scanning and analysis performed by the GO-based 'git-sizer' (https://github.com/github/git-sizer) tool. It is hoped that by creating a builtin command, we may be able to take advantage of internal Git data structures and code that is not accessible from GO to gain further insight into potential scaling problems. Co-authored-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
This is no longer true in general, not with supporting Clang out of the box. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
By default we will scan all references in "refs/heads/", "refs/tags/" and "refs/remotes/". Add command line opts let the use ask for all refs or a subset of them and to include a detached HEAD. Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When 'git survey' provides information to the user, this will be presented in one of two formats: plaintext and JSON. The JSON implementation will be delayed until the functionality is complete for the plaintext format. The most important parts of the plaintext format are headers specifying the different sections of the report and tables providing concreted data. Create a custom table data structure that allows specifying a list of strings for the row values. When printing the table, check each column for the maximum width so we can create a table of the correct size from the start. The table structure is designed to be flexible to the different kinds of output that will be implemented in future changes. Signed-off-by: Derrick Stolee <stolee@gmail.com>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows uses MSYS2's Bash to run the test suite, which comes with benefits but also at a heavy price: on the plus side, MSYS2's POSIX emulation layer allows us to continue pretending that we are on a Unix system, e.g. use Unix paths instead of Windows ones, yet this is bought at a rather noticeable performance penalty. There *are* some more native ports of Unix shells out there, though, most notably BusyBox-w32's ash. These native ports do not use any POSIX emulation layer (or at most a *very* thin one, choosing to avoid features such as fork() that are expensive to emulate on Windows), and they use native Windows paths (usually with forward slashes instead of backslashes, which is perfectly legal in almost all use cases). And here comes the problem: with a $PWD looking like, say, C:/git-sdk-64/usr/src/git/t/trash directory.t5813-proto-disable-ssh Git's test scripts get quite a bit confused, as their assumptions have been shattered. Not only does this path contain a colon (oh no!), it also does not start with a slash. This is a problem e.g. when constructing a URL as t5813 does it: ssh://remote$PWD. Not only is it impossible to separate the "host" from the path with a $PWD as above, even prefixing $PWD by a slash won't work, as /C:/git-sdk-64/... is not a valid path. As a workaround, detect when $PWD does not start with a slash on Windows, and simply strip the drive prefix, using an obscure feature of Windows paths: if an absolute Windows path starts with a slash, it is implicitly prefixed by the drive prefix of the current directory. As we are talking about the current directory here, anyway, that strategy works. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ws#4527) With this patch, Git for Windows works as intended on mounted APFS volumes (where renaming read-only files would fail). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, the current working directory is pretty much guaranteed to contain a colon. If we feed that path to CVS, it mistakes it for a separator between host and port, though. This has not been a problem so far because Git for Windows uses MSYS2's Bash using a POSIX emulation layer that also pretends that the current directory is a Unix path (at least as long as we're in a shell script). However, that is rather limiting, as Git for Windows also explores other ports of other Unix shells. One of those is BusyBox-w32's ash, which is a native port (i.e. *not* using any POSIX emulation layer, and certainly not emulating Unix paths). So let's just detect if there is a colon in $PWD and punt in that case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Specify symlink type in .gitattributes
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>
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>
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>
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>
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>
…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>
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>
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>
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>
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>
Handle Ctrl+C in Git Bash nicely 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>
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>
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>
…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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: seen
From: 10f4e0ee35 (mingw: use strftime() directly in UCRT builds (git-for-windows#6130), 2026-03-25) (29935f1102..10f4e0ee35)
Resolved: 7a5916f (Merge branch 'disallow-ntlm-auth-by-default', 2026-02-12)
kept both sides in http.c (retry env vars + NTLM auth methods) and t/lib-httpd.sh (http-429.sh + ntlm-handshake.sh scripts)
Range-diff
1: 7a5916f ! 1: 7653bf6 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 4de8dcc86e..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"); + +-<<<<<<< bb24c4c352 (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 36849081a0..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 +-<<<<<<< bb24c4c352 (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: 10f4e0e (mingw: use strftime() directly in UCRT builds (git-for-windows#6130), 2026-03-25)
resolved all 8 conflicting files by taking HEAD (ours) side, matching original merge resolution that preserved downstream extensions (sideband control chars, interactive_options, curl retry, reftable filesystem location, meson test entries)
Range-diff
1: 10f4e0e ! 1: cb6326f 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 061b15abc3..ddba93393c 100644 + --- Documentation/config/sideband.adoc + +++ Documentation/config/sideband.adoc +@@ + sideband.allowControlCharacters:: +-<<<<<<< 44a2af8921 (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + ifdef::with-breaking-changes[] + By default, control characters that are delivered via the sideband + are masked, except ANSI color sequences. This prevents potentially +@@ Documentation/config/sideband.adoc: endif::with-breaking-changes[] + sideband.<url>.*:: + Apply the `sideband.*` option selectively to specific URLs. The + same URL matching logic applies as for `http.<url>.*` settings. +-======= +- By default, control characters that are delivered via the sideband +- are masked, except ANSI color sequences. This prevents potentially +- unwanted ANSI escape sequences from being sent to the terminal. Use +- this config setting to override this behavior: +-+ +--- +- color:: +- Allow ANSI color sequences, line feeds and horizontal tabs, +- but mask all other control characters. This is the default. +- false:: +- Mask all control characters other than line feeds and +- horizontal tabs. +- true:: +- Allow all control characters to be sent to the terminal. +--- +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) - ## compat/mingw.c ## -@@ compat/mingw.c: int mingw_utime (const char *file_name, const struct utimbuf *times) - size_t mingw_strftime(char *s, size_t max, - const char *format, const struct tm *tm) - { -+#ifdef _UCRT -+ size_t ret = strftime(s, max, format, tm); -+#else - /* a pointer to the original strftime in case we can't find the UCRT version */ - static size_t (*fallback)(char *, size_t, const char *, const struct tm *) = strftime; - size_t ret; -@@ compat/mingw.c: size_t mingw_strftime(char *s, size_t max, - ret = strftime(s, max, format, tm); - else - ret = fallback(s, max, format, tm); -+#endif - - if (!ret && errno == EINVAL) - die("invalid strftime format: '%s'", format); + ## builtin/reset.c ## + remerge CONFLICT (content): Merge conflict in builtin/reset.c + index ac43db48df..8e3c8509d7 100644 + --- builtin/reset.c + +++ builtin/reset.c +@@ builtin/reset.c: int cmd_reset(int argc, + struct object_id oid; + struct pathspec pathspec; + int intent_to_add = 0; +-<<<<<<< 44a2af8921 (`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 cec8bd5da6..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]}) { + /** +-<<<<<<< 44a2af8921 (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + * CURLINFO_RETRY_AFTER was added in 7.66.0, released in September 2019. + * It allows curl to automatically parse Retry-After headers. + */ +@@ + #endif + + /** +-======= +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + * CURLSSLOPT_AUTO_CLIENT_CERT was added in 7.77.0, released in May + * 2021. + */ - ## t/t9108-git-svn-glob.sh ## -@@ t/t9108-git-svn-glob.sh: test_expect_success 'test disallow multi-globs' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch three 2> stderr.three && -- test_cmp expect.three stderr.three -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean && -+ test_cmp expect.three stderr.three.clean - ' + ## http.c ## + remerge CONFLICT (content): Merge conflict in http.c + index 7ee0729029..5bc2ad8b87 100644 + --- http.c + +++ http.c +@@ http.c: static long http_schannel_check_revoke_mode = + CURLSSLOPT_NO_REVOKE; + #endif - test_done +-<<<<<<< 44a2af8921 (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + static long http_retry_after = 0; + static long http_max_retries = 0; + static long http_max_retry_time = 300; + +-======= +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + /* + * With the backend being set to `schannel`, setting sslCAinfo would override + * the Certificate Store in cURL v7.60.0 and later, which is not what we want - ## t/t9109-git-svn-multi-glob.sh ## -@@ t/t9109-git-svn-multi-glob.sh: test_expect_success 'test disallow multiple globs' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch three 2> stderr.three && -- test_cmp expect.three stderr.three -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean && -+ test_cmp expect.three stderr.three.clean - ' + ## refs/reftable-backend.c ## + remerge CONFLICT (content): Merge conflict in refs/reftable-backend.c + index 08d2cfd20d..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 +-<<<<<<< 44a2af8921 (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir, + &ref_common_dir); + + reftable_set_alloc(malloc, realloc, free); + base_ref_store_init(&refs->base, repo, refdir.buf, &refs_be_reftable); +-======= +- reftable_set_alloc(malloc, realloc, free); +- base_ref_store_init(&refs->base, repo, gitdir, &refs_be_reftable); +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + strmap_init(&refs->worktree_backends); + refs->store_flags = store_flags; + refs->log_all_ref_updates = repo_settings_get_log_all_ref_updates(repo); - ## t/t9168-git-svn-partially-globbed-names.sh ## -@@ t/t9168-git-svn-partially-globbed-names.sh: test_expect_success 'test disallow prefixed multi-globs' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch four 2>stderr.four && -- test_cmp expect.four stderr.four && -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.four >stderr.four.clean && -+ test_cmp expect.four stderr.four.clean && - git config --unset svn-remote.four.branches && - git config --unset svn-remote.four.tags - ' -@@ t/t9168-git-svn-partially-globbed-names.sh: test_expect_success 'test disallow multiple asterisks in one word' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch six 2>stderr.six && -- test_cmp expect.six stderr.six -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.six >stderr.six.clean && -+ test_cmp expect.six stderr.six.clean - ' + ## sideband.c ## + remerge CONFLICT (content): Merge conflict in sideband.c + index 9aaca17061..26e5bbd4b5 100644 + --- sideband.c + +++ sideband.c +@@ sideband.c: static struct keyword_entry keywords[] = { + }; + + static enum { +-<<<<<<< 44a2af8921 (`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; + +-<<<<<<< 44a2af8921 (`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); + } + +-<<<<<<< 44a2af8921 (`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 +-<<<<<<< 44a2af8921 (`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; + +-<<<<<<< 44a2af8921 (`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--) { +-<<<<<<< 44a2af8921 (`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, '^'); +-<<<<<<< 44a2af8921 (`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 32edab60d1..25272d7ae4 100644 + --- t/meson.build + +++ t/meson.build +@@ t/meson.build: integration_tests = [ + 't7422-submodule-output.sh', + 't7423-submodule-symlinks.sh', + 't7424-submodule-mixed-ref-formats.sh', +-<<<<<<< 44a2af8921 (`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 1a1560ef93..07cbc62736 100755 + --- t/t5409-colorize-remote-messages.sh + +++ t/t5409-colorize-remote-messages.sh +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'fallback to color.ui' ' + grep "<BOLD;RED>error<RESET>: error" decoded + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 44a2af8921 (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + if test_have_prereq WITH_BREAKING_CHANGES + then + TURN_ON_SANITIZING=already.turned=on +@@ t/t5409-colorize-remote-messages.sh: else + TURN_ON_SANITIZING=sideband.allowControlCharacters=color + fi + +-================================ +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + test_expect_success 'disallow (color) control sequences in sideband' ' + write_script .git/color-me-surprised <<-\EOF && + printf "error: Have you \\033[31mread\\033[m this?\\a\\n" >&2 + exec "$@" + EOF +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 44a2af8921 (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + test_config_global uploadPack.packObjectsHook ./color-me-surprised && + test_commit need-at-least-one-commit && + + git -c $TURN_ON_SANITIZING clone --no-local . throw-away 2>stderr && +-================================ +- test_config_global uploadPack.packObjectshook ./color-me-surprised && +- test_commit need-at-least-one-commit && +- +- git clone --no-local . throw-away 2>stderr && +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + test_decode_color <stderr >decoded && + test_grep RED decoded && + test_grep "\\^G" stderr && +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'disallow (color) control sequences in sideband' ' + test_file_not_empty actual + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 44a2af8921 (`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: cb6326f50f (mingw: use strftime() directly in UCRT builds (git-for-windows#6130), 2026-03-25) (ed9f3f1a8b..cb6326f50f)
Statistics
Range-diff (click to expand)
1: 878923f = 1: dedef22 unix-socket: avoid leak when initialization fails
2: 3547ce4 = 2: 9b2f7e4 grep: prevent
^$false match at end of file3: bfae546 = 3: 5d73e3c Merge branch 'fixes-from-the-git-mailing-list'
4: 1602bd5 = 4: 1f757f5 vcpkg_install: detect lack of Git
5: 2420984 = 5: 1fcc906 vcpkg_install: add comment regarding slow network connections
6: 4cf9943 = 6: 812011c vcbuild: install ARM64 dependencies when building ARM64 binaries
7: ba63033 = 7: a46a693 vcbuild: add an option to install individual 'features'
8: 72e28af = 8: 081d6bb cmake: allow building for Windows/ARM64
9: a1ce659 = 9: 9ed1ac4 mingw: include the Python parts in the build
10: dcfeea7 = 10: 214941e ci(vs-build) also build Windows/ARM64 artifacts
11: 04fab6b = 11: bd9c9d7 win32/pthread: avoid name clashes with winpthread
12: cfa92b0 = 12: a5fecf3 Add schannel to curl installation
13: 5fcf2cd = 13: af6de4e hash-object: demonstrate a >4GB/LLP64 problem
14: 47a259b = 14: f65c8ab git-compat-util: avoid redeclaring _DEFAULT_SOURCE
15: b7df391 = 15: 674094c cmake(): allow setting HOST_CPU for cross-compilation
16: 5102a0a = 16: 6404a59 object-file.c: use size_t for header lengths
17: b919478 = 17: 89aa9e1 Import the source code of mimalloc v2.2.7
18: 3e20827 = 18: 786b6e9 t9350: point out that refs are not updated correctly
19: 1e3682d = 19: e5b6968 CMake: default Visual Studio generator has changed
20: d59ef63 = 20: 2d6e8be hash algorithms: use size_t for section lengths
21: 8437789 = 21: 13c57b7 mimalloc: adjust for building inside Git
22: 4227997 = 22: d187b3d transport-helper: add trailing --
23: 3225592 = 23: fea966c mingw: demonstrate a
git addissue with NTFS junctions24: 9adc038 = 24: 835204d .gitignore: add Visual Studio CMakeSetting.json file
25: 78b2368 = 25: 1d7d8b2 hash-object --stdin: verify that it works with >4GB/LLP64
26: dae6e96 = 26: b9f910c mimalloc: offer a build-time option to enable it
27: f10a62b = 27: 4e49da6 t5505/t5516: allow running without
.git/branches/in the templates28: 5d89148 = 28: 7e02fcb remote-helper: check helper status after import/export
29: 53c3e54 = 29: aa0583e clean: do not traverse mount points
30: b1d11f8 = 30: e563dc7 strbuf_realpath(): use platform-dependent API if available
31: ff5bc3a = 31: cf04f2f http: use new "best effort" strategy for Secure Channel revoke checking
32: f0e2251 = 32: 8b6a8cd subtree: update
contrib/subtreetesttarget33: a89017c = 33: c3c8d11 CMakeLists: add default "x64-windows" arch for Visual Studio
34: b4d74df = 34: 1db6879 hash-object: add another >4GB/LLP64 test case
36: b7d990d = 35: a3852f7 mingw: use mimalloc
37: e9ef515 = 36: 46cc63b t5505/t5516: fix white-space around redirectors
38: f46cc79 = 37: 9f7e075 Always auto-gc after calling a fast-import transport
39: 94fa3d2 = 38: 1448c6d mingw: prevent regressions with "drive-less" absolute paths
40: 053e3f9 = 39: b8932bc clean: remove mount points when possible
41: f70da10 = 40: b8eb87f transport: optionally disable side-band-64k
42: ec0fc3e = 41: c90d44b mingw: fix fatal error working on mapped network drives on Windows
43: fa43660 = 42: 5098033 clink.pl: fix MSVC compile script to handle libcurl-d.lib
44: 582938e = 43: 0cf445c mingw: implement a platform-specific
strbuf_realpath()45: d7ff8b7 = 44: dfcab7e t3701: verify that we can add lots of files interactively
46: 612590d = 45: d7eb401 commit: accept "scissors" with CR/LF line endings
47: a48c06a = 46: 9ff1470 t0014: fix indentation
48: cfa485f = 47: 956279d git-gui: accommodate for intent-to-add files
49: 38f6bf9 = 48: 7ee7f4d mingw: allow for longer paths in
parse_interpreter()50: 1b83e6f = 49: 8af486a compat/vcbuild: document preferred way to build in Visual Studio
51: d23c591 = 50: adc7d57 http: optionally send SSL client certificate
52: d7effaa = 51: 9b9edc3 ci: run
contrib/subtreetests in CI builds53: 2854db4 = 52: 0b08814 CMake: show Win32 and Generator_platform build-option values
54: 8d152fa = 53: 3b52bb4 hash-object: add a >4GB/LLP64 test case using filtered input
56: 144a0e7 = 54: 82d33ac windows: skip linking
git-<command>for built-ins57: f957f2a = 55: a9ef715 mingw: stop hard-coding
CC = gcc58: 6fd2148 = 56: 3a26f1f mingw: drop the -D_USE_32BIT_TIME_T option
59: 0ed298b = 57: 1b248c5 mingw: only use -Wl,--large-address-aware for 32-bit builds
60: fbbe551 = 58: 89eb39f mingw: avoid over-specifying
--pic-executable61: be6bd7a = 59: 2cfc1a2 mingw: set the prefix and HOST_CPU as per MSYS2's settings
62: 13fcd20 = 60: 8867e6a mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
63: 0f8dc13 = 61: 5782838 mingw: rely on MSYS2's metadata instead of hard-coding it
64: f31eac4 = 62: 86ab7be mingw: always define
ETC_*for MSYS2 environments65: 1182173 = 63: 8554764 max_tree_depth: lower it for clang builds in general on Windows
66: 6139609 = 64: 777bf67 mingw: ensure valid CTYPE
67: a171339 = 65: 3d4c0f1 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
68: b73f0ea = 66: 48888a0 mingw: allow
git.exeto be used instead of the "Git wrapper"69: cf80401 = 67: 7da46ea revision: create mark_trees_uninteresting_dense()
70: cd2d3e6 = 68: 70d7bee mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
71: a22e93e = 69: bd3f1f4 survey: stub in new experimental 'git-survey' command
72: 2be1786 = 70: 0ab7a87 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
73: 4501e12 = 71: 850e1db survey: add command line opts to select references
74: 086b899 = 72: d4bc901 clink.pl: fix libexpatd.lib link error when using MSVC
75: 855bc54 = 73: 54a62a7 survey: start pretty printing data in table form
76: cd51b86 = 74: 36d96af Makefile: clean up .ilk files when MSVC=1
77: d2902ea = 75: af39bee survey: add object count summary
78: 59a9979 = 76: 408b9f9 vcbuild: add support for compiling Windows resource files
79: df9d5a2 = 77: 276ed76 survey: summarize total sizes by object type
80: f4a593c = 78: ec37678 config.mak.uname: add git.rc to MSVC builds
81: d1707c9 = 79: b35588c MinGW: link as terminal server aware
82: e1f2f3a = 80: 1c9f081 survey: show progress during object walk
84: 70690cc = 81: 2ace69c clink.pl: ignore no-stack-protector arg on MSVC=1 builds
85: 17a8f28 = 82: 9f9bbad http: optionally load libcurl lazily
86: 611a4b6 = 83: 91de5c8 survey: add ability to track prioritized lists
88: afc55c1 = 84: f645014 clink.pl: move default linker options for MSVC=1 builds
89: 65438d1 = 85: 3c0a522 http: support lazy-loading libcurl also on Windows
35: 3a87fd0 ! 86: 74ade52 setup: properly use "%(prefix)/" when in WSL
@@ Commit message Signed-off-by: Derrick Stolee <derrickstolee@github.com> ## setup.c ## -@@ setup.c: const char *setup_git_directory_gently(int *nongit_ok) +@@ setup.c: const char *setup_git_directory_gently(struct repository *repo, int *nongit_ok) break; case GIT_DIR_INVALID_OWNERSHIP: if (!nongit_ok) {90: 0586fcb = 87: 49510e9 survey: add report of "largest" paths
91: 11dc155 = 88: d9662e9 Add config option
windows.appendAtomically93: 9ed86b6 = 89: 635a667 cmake: install headless-git.
94: 9657dab = 90: 97faba4 http: when loading libcurl lazily, allow for multiple SSL backends
55: b7ba066 = 91: dfeda01 compat/mingw.c: do not warn when failing to get owner
95: 87a1f1e = 92: d5e1b44 survey: add --top= option and config
96: b14f4fd = 93: 60520bf mingw: $env:TERM="xterm-256color" for newer OSes
97: 07971a5 = 94: d77ab1e winansi: check result and Buffer before using Name
98: a4fc282 = 95: f332db9 mingw: change core.fsyncObjectFiles = 1 by default
100: efe7b0e = 96: 32ab0f8 Fix Windows version resources
101: a10a4f9 = 97: c66f63a status: fix for old-style submodules with commondir
102: d5e68fd = 98: 9b234b6 git.rc: include winuser.h
103: 4e6f1d5 = 99: d591b36 mingw: do load libcurl dynamically by default
104: ccc705f = 100: 3851f03 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
105: 4afbf70 = 101: 8544a03 mingw: suggest
windows.appendAtomicallyin more cases106: d402600 = 102: b40d140 win32: use native ANSI sequence processing, if possible
107: ccb3b06 = 103: 692cc78 common-main.c: fflush stdout buffer upon exit
108: 32ca4dd = 104: ca09886 t5601/t7406(mingw): do run tests with symlink support
109: 53395d5 = 105: e84196b win32: ensure that
localtime_r()is declared even in i686 builds110: 5a0c209 = 106: b850ed5 Fallback to AppData if XDG_CONFIG_HOME is unset
111: 7e5b07b = 107: 1a27ff6 run-command: be helpful with Git LFS fails on Windows 7
113: 635ea6d = 108: 5bb30c2 Merge 'remote-hg-prerequisites' into HEAD
114: 42301ea = 109: 3b84d18 Merge branch 'drive-prefix'
115: c7a8940 = 110: 07f392d Merge branch 'dont-clean-junctions'
116: c25625a = 111: 268e4c7 Merge branch 'msys2-python'
117: b877089 = 112: cb4f50f Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
118: 92a4135 = 113: decb44a Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
119: 692a555 = 114: 758ea7f Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
120: 183e8c1 = 115: ddce2c6 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
121: 9794abc = 116: ec9bb69 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction122: 3b35ce4 = 117: 0e3ab79 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
123: e1bd399 = 118: 7629b08 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
124: 41ffc52 = 119: b345f1b Merge 'add-p-many-files'
125: 90ebddf = 120: 19241ad Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
126: 3e4942b = 121: 0b9a6e6 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
127: 52e39c8 = 122: 0e79929 Merge 'git-gui/js/intent-to-add'
128: 75febb5 = 123: 2072fd4 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
129: 61284ab = 124: a56edbf Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
130: 28f791f = 125: 9cbd447 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
131: 091d0e9 = 126: 65a2bc6 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path132: 4d8fe94 = 127: 6843160 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
133: e5b4c1e = 128: 2a58a8c Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
83: e2cc3fe = 129: f918c72 mingw: make sure
errnois set correctly when socket operations fail134: 9a036d5 = 130: 6b7c5c8 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests87: fd537f8 = 131: 254425a compat/mingw: handle WSA errors in strerror
135: 40f0503 = 132: 41e882e Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
92: 959bbdc = 133: 65db0ae compat/mingw: drop outdated comment
136: 7a3e12f = 134: 07cefd8 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t99: c062700 = 135: b0cffc9 t0301: actually test credential-cache on Windows
137: 3876cbe = 136: df90866 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory112: adab22a = 137: ebeb5da survey: clearly note the experimental nature in the output
142: b9c4692 = 138: f9615e8 credential-cache: handle ECONNREFUSED gracefully
143: e5540d4 = 139: d7cd606 reftable: do make sure to use custom allocators
144: 6625f9a = 140: 59b95ca check-whitespace: avoid alerts about upstream commits
145: b17cebd = 141: 10402d4 t/t5571-prep-push-hook.sh: Add test with writing to stderr
138: 3380e43 = 142: 6effe5f Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
139: f6319bb = 143: 1502051 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
140: 4af1683 = 144: d419f08 Merge branch 'optionally-dont-append-atomically-on-windows'
141: 9d9bbf4 = 145: 1b5f946 Merge branch 'fsync-object-files-always'
146: 18e3479 = 146: 4c0abd1 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
147: 5e74dca = 147: 0d65e62 Fix Windows version resources (Fix Windows version resources git#4092)
148: 0e7bcbb = 148: 1d6ac48 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
149: 9825007 = 149: 67b1f47 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)150: c551b12 = 150: 21dcfab Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)151: 3730850 = 151: 39b8b60 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283152: 0e141c1 = 152: 91085f6 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
153: 0874c99 = 153: fd04268 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
154: 63e5950 = 154: dcfbdaa 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: 886513a = 155: 55e5d8a Merge branch 'nano-server'
156: f4c9edb = 156: 2dbbebe Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
157: b66d2db = 157: 404f652 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
158: 9ca0c3b = 158: 80863f6 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
159: 907e5ac = 159: f892aba Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
160: 8849ef3 = 160: 07163f9 Merge branch 'Fix-i686-build-with-GCC-v14'
161: 65a6919 = 161: 175c92f Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
162: bcc85ca = 162: 749ec10 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
163: 21d9ab8 = 163: 8036692 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
164: f8cfab7 = 164: e0ad5f6 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: 32baf4a = 165: 9dbea46 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
166: 368a117 = 166: 5a0d389 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
167: 593fddb = 167: 5665c4c Merge branch 'reftable-vs-custom-allocators'
168: 930fc8d = 168: a3702c2 Merge branch 'check-whitespace-only-downstream'
169: c5a5453 = 169: c8f7c8f 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: 07984e9 = 170: e44e39e Merge branch 'ready-for-upstream'
171: 7b21333 = 171: 116426e git-svn: mark it as unsupported by the Git for Windows project
172: 963df90 = 172: 908a3cd ci(macos): skip the
git p4tests173: 4dc6904 = 173: 6cc6408 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: 9aaf580 = 174: 09d3e63 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)178: e24781b = 175: 55e8711 Win32: make FILETIME conversion functions public
179: 7e5d3e6 = 176: c3d974d Win32: dirent.c: Move opendir down
180: b7f5832 = 177: 2d1912f mingw: make the dirent implementation pluggable
181: ef50216 = 178: d6b411d Win32: make the lstat implementation pluggable
182: 38de0f9 = 179: 6211af9 mingw: add infrastructure for read-only file system level caches
183: e491d9f = 180: 1b13917 mingw: add a cache below mingw's lstat and dirent implementations
184: 5bd4b0e = 181: 7c95b3f fscache: load directories only once
185: 49fada4 = 182: efc1ae9 fscache: add key for GIT_TRACE_FSCACHE
186: dbf6481 = 183: 1f3038f fscache: remember not-found directories
187: 072c54d = 184: bb57bc3 fscache: add a test for the dir-not-found optimization
188: 7790e50 = 185: 14aab2b add: use preload-index and fscache for performance
189: b2d61ee = 186: 3727a53 dir.c: make add_excludes aware of fscache during status
190: b7711e9 = 187: 589e7e1 fscache: make fscache_enabled() public
191: 0423769 = 188: 62cca41 dir.c: regression fix for add_excludes with fscache
192: 7cb6c73 = 189: 4d7edae fetch-pack.c: enable fscache for stats under .git/objects
193: 7170887 = 190: 6f7301b checkout.c: enable fscache for checkout again
194: 75a9045 = 191: a458c98 Enable the filesystem cache (fscache) in refresh_index().
195: 2870989 = 192: ff980b2 fscache: use FindFirstFileExW to avoid retrieving the short name
196: 81b091c = 193: 312690e fscache: add GIT_TEST_FSCACHE support
197: 3b17875 = 194: 91175f3 fscache: add fscache hit statistics
198: 37d2702 = 195: 224970f unpack-trees: enable fscache for sparse-checkout
199: 96500ec = 196: 63fef77 status: disable and free fscache at the end of the status command
200: 91110c2 = 197: 2d524e7 mem_pool: add GIT_TRACE_MEMPOOL support
201: 16df723 = 198: 2eb357a fscache: fscache takes an initial size
202: b90864a = 199: b12afda fscache: update fscache to be thread specific instead of global
203: 07862ee = 200: 9b78430 fscache: teach fscache to use mempool
204: 379fbe7 = 201: 8d95d52 fscache: make fscache_enable() thread safe
205: 8e03f17 = 202: 319c3d2 fscache: teach fscache to use NtQueryDirectoryFile
206: c81d415 = 203: 78001d9 fscache: remember the reparse tag for each entry
207: 07612d4 = 204: f545755 Merge branch 'fscache'
208: 1fdaab0 = 205: 5e58e37 fscache: implement an FSCache-aware is_mount_point()
209: 6c726ce = 206: ac368aa 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: 8e65046 = 207: b0fc7d0 clean: make use of FSCache
211: 5d209d6 = 208: eef6208 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
212: 1d4b882 = 209: 087803c Merge branch 'dont-clean-junctions-fscache'
213: 66c12e9 = 210: b216a8c pack-objects (mingw): demonstrate a segmentation fault with large deltas
214: 81146df = 211: 102650c mingw: support long paths
215: fc25324 = 212: 394ccaa win32(long path support): leave drive-less absolute paths intact
216: 8c514da = 213: 134555e compat/fsmonitor/fsm-*-win32: support long paths
217: ccb2f8c = 214: 9ad3320 clean: suggest using
core.longPathsif paths are too long to remove218: 78b1230 = 215: dbc2a21 mingw: Support
git_terminal_promptwith more terminals219: f081ec9 = 216: 0a98bb9 compat/terminal.c: only use the Windows console if bash 'read -r' fails
220: e8d1b82 = 217: adce4d9 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
227: 6b45213 = 218: 3390179 mingw: introduce code to detect whether we're inside a Windows container
221: 0207cd3 = 219: 0b64147 Win32: symlink: move phantom symlink creation to a separate function
229: fd34b4c = 220: 6e53e49 mingw: when running in a Windows container, try to rename() harder
222: 1a6b4b4 ! 221: f381138 Introduce helper to create symlinks that knows about index_state
175: 25bab20 = 222: e3b66b8 git-gui--askyesno: fix funny text wrapping
231: be609b5 = 223: 25f6835 mingw: move the file_attr_to_st_mode() function definition
223: 2197184 = 224: cf23270 mingw: allow to specify the symlink type in .gitattributes
176: a82ff1a = 225: b79e12a git-gui--askyesno (mingw): use Git for Windows' icon, if available
233: 1aac359 = 226: a9ca996 mingw: Windows Docker volumes are not symbolic links
224: e750235 = 227: 1732f59 Win32: symlink: add test for
symlinkattribute177: b970c11 = 228: c3a752e Merge branch 'git-gui-askyesno'
235: e3837b9 = 229: 3481480 mingw: work around rename() failing on a read-only file
225: 7611458 = 230: bb60789 mingw: explicitly specify with which cmd to prefix the cmdline
226: c43fac6 = 231: f7e8ca1 mingw: when path_lookup() failed, try BusyBox
228: 2a3fb02 = 232: 0ff7c40 test-tool: learn to act as a drop-in replacement for
iconv230: 7a4a6c5 = 233: 4939ab6 tests(mingw): if
iconvis unavailable, usetest-helper --iconv232: 34eb741 = 234: 59b01c5 gitattributes: mark .png files as binary
234: 7f57986 = 235: f9b7f20 tests: move test PNGs into t/lib-diff/
236: 57dbe06 = 236: 96882dd tests: only override sort & find if there are usable ones in /usr/bin/
237: 0b529c6 = 237: dbc4d9f tests: use the correct path separator with BusyBox
238: dde3452 = 238: 09d586d mingw: only use Bash-ism
builtin pwd -Wwhen available239: 7491434 = 239: 7e12a3b tests (mingw): remove Bash-specific pwd option
240: 5ecee72 = 240: 756ef97 test-lib: add BUSYBOX prerequisite
241: 0e90894 = 241: 8bb3fa4 Merge branch 'gitk-and-git-gui-patches'
242: 922121d = 242: 50fcb95 t5003: use binary file from t/lib-diff/
243: 2c3ab3c = 243: 18ff82f Merge branch 'long-paths'
250: 459eba3 = 244: 2bf96be Describe Git for Windows' architecture [no ci]
244: 6bf59e6 = 245: 480442e t5532: workaround for BusyBox on Windows
245: ab98f38 = 246: 0f314ef Merge branch 'msys2'
253: 943a706 = 247: cb79564 Modify the Code of Conduct for Git for Windows
246: 7c587d0 = 248: 63159de t5605: special-case hardlink test for BusyBox-w32
247: 74916f2 = 249: d6a26dd Merge 'docker-volumes-are-no-symlinks'
257: 728191a = 250: 5caa0d4 CONTRIBUTING.md: add guide for first-time contributors
248: a9567ac = 251: 451d7d9 t5813: allow for $PWD to be a Windows path
249: db87068 = 252: 9fb1f1f mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
260: 3561b05 = 253: e67b632 README.md: Add a Windows-specific preamble
251: 1826ff8 = 254: ef33495 t9200: skip tests when $PWD contains a colon
252: 1c3bb29 = 255: d383989 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
263: aacb17a = 256: a26c3d6 Add an issue template
254: bc7f34b = 257: ea7cdad mingw: kill child processes in a gentler way
255: d550ab8 = 258: e4caed7 mingw: optionally enable wsl compability file mode bits
256: c0e18a4 = 259: d5c16ee Merge branch 'busybox-w32'
266: 0b1a001 = 260: 63d4564 Add a GitHub workflow to monitor component updates
267: 644dece = 261: 8863355 Modify the GitHub Pull Request template (to reflect Git for Windows)
258: fa652e7 = 262: c7add91 mingw: really handle SIGINT
259: 3b5cb34 = 263: 6926ff8 Merge branch 'wsl-file-mode-bits'
261: dc8fb55 = 264: 1ed0f93 Partially un-revert "editor: save and reset terminal after calling EDITOR"
264: 09d9973 = 265: e387d3f reset: reinstate support for the deprecated --stdin option
268: 85e5572 = 266: f4e8875 fsmonitor: reintroduce core.useBuiltinFSMonitor
270: f685df5 = 267: 34d1178 dependabot: help keeping GitHub Actions versions up to date
271: 060eaa9 = 268: ac16876 SECURITY.md: document Git for Windows' policies
262: 2d1f2f5 = 269: cd3c12c Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
265: 595d528 = 270: b09f33c Merge branch 'un-revert-editor-save-and-reset'
269: 60c0609 = 271: f55c0e7 Merge branch 'phase-out-reset-stdin'
272: 842c717 = 272: f778e76 Merge branch 'deprecate-core.useBuiltinFSMonitor'
273: 4f69a6a = 273: a828924 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
274: 75161f7 = 274: bb24c4c Merge 'readme' into HEAD
275: 7a5916f = 275: 7653bf6 Merge branch 'disallow-ntlm-auth-by-default'
276: 96aaed6 = 276: 0cb5a71 http: fix bug in ntlm_allow=1 handling
277: 11488cc = 277: 54a19e8 http: fix bug in ntlm_allow=1 handling (http: fix bug in ntlm_allow=1 handling git#6136)
278: ce2746e = 278: a976b94 fixup! git-svn: mark it as unsupported by the Git for Windows project
279: f382fae = 279: 44a2af8
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: 10f4e0e = 280: cb6326f mingw: use strftime() directly in UCRT builds (mingw: use strftime() directly in UCRT builds git#6130)