Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#24099043086)#99
Open
gitforwindowshelper[bot] wants to merge 281 commits intobase/shears/seen-24099043086from
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#24099043086)#99gitforwindowshelper[bot] wants to merge 281 commits intobase/shears/seen-24099043086from
gitforwindowshelper[bot] wants to merge 281 commits intobase/shears/seen-24099043086from
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>
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>
This was pull request git-for-windows#1645 from ZCube/master Support windows container. 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>
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
The Git for Windows project has grown quite complex over the years, certainly much more complex than during the first years where the `msysgit.git` repository was abusing Git for package management purposes and the `git/git` fork was called `4msysgit.git`. Let's describe the status quo in a thorough way. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
git-for-windows@1edeb9a (Win32: warn if the console font doesn't support Unicode, 2014-06-10) introduced both code to detect the current console font on Windows Vista and newer and a fallback for older systems to detect the default console font and issue a warning if that font doesn't support unicode. Since we haven't supported any Windows older than Vista in almost a decade, we don't need to keep the workaround. This more or less fell out of git-for-windows#6108, but didn't quite fit into that PR. There are also some other version specific hacks and workarounds I considered dropping, but decided against: * git-for-windows@492f709 * I'm unsure if this regression has ever been fixed or just become the new normal. * git-for-windows#5042 * So far this hasn't been an issue on Windows 8.1, but officially Go 1.21 and newer only support Windows 10 and newer. So this might become a problem at any point.
…s#6108) While the currently used way to detect the number of CPU cores ond Windows is nice and straight-forward, GetSystemInfo() only [gives us access to the number of processors within the current group.](https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-system_info#members) While that is usually fine for systems with a single physical CPU, separate physical sockets are typically separate groups. Switch to using GetLogicalProcessorInformationEx() to handle multi-socket systems better. I've tested this on a physical single-socket x86-64 and a physical dual-socket x86-64 system, and on a virtual single-socket ARM64 system. Physical [multi-socket ARM64 systems seem to exist](https://cloudbase.it/ampere-altra-industry-leading-arm64-server/), but I don't have access to such hardware and the hypervisor I use apparently can't emulate that either.
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: f5a8b94af8 (Detect number of cores better on multi-socket systems (git-for-windows#6108), 2026-04-06) (d3f166ff45..f5a8b94af8)
Resolved: 6bcc0e7 (Winansi: Drop pre-Vista workaround (git-for-windows#6109), 2026-04-06)
resolved all 5 files by keeping HEAD side to match original merge resolution: interactive_options in reset.c, CURLINFO_RETRY_AFTER in git-curl-compat.h, http retry variables in http.c, refs_compute_filesystem_location in reftable-backend.c, t7425/t7426 test entries in meson.build
Range-diff
1: 6bcc0e7 ! 1: 0ca8b9d Winansi: Drop pre-Vista workaround (Winansi: Drop pre-Vista workaround git#6109)
@@ Commit message 1.21 and newer only support Windows 10 and newer. So this might become a problem at any point. - ## Documentation/git-svn.adoc ## -@@ Documentation/git-svn.adoc: SYNOPSIS - -------- - [verse] - 'git svn' <command> [<options>] [<arguments>] -+(UNSUPPORTED!) + ## builtin/reset.c ## + remerge CONFLICT (content): Merge conflict in builtin/reset.c + index f8e764b102..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; +-<<<<<<< ebac26f61b (Merge 'readme' into HEAD) + struct interactive_options interactive_opts = INTERACTIVE_OPTIONS_INIT; +-======= +- struct add_p_opt add_p_opt = ADD_P_OPT_INIT; +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + int nul_term_line = 0, read_from_stdin = 0; + const struct option options[] = { + OPT__QUIET(&quiet, N_("be quiet, only report errors")), + + ## git-curl-compat.h ## + remerge CONFLICT (content): Merge conflict in git-curl-compat.h + index 52ed71eb98..5c8ceb076a 100644 + --- git-curl-compat.h + +++ git-curl-compat.h +@@ + #endif + + /** +-<<<<<<< ebac26f61b (Merge 'readme' into HEAD) + * CURLINFO_RETRY_AFTER was added in 7.66.0, released in September 2019. + * It allows curl to automatically parse Retry-After headers. + */ +@@ + #endif - DESCRIPTION - ----------- + /** +-======= +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + * CURLSSLOPT_AUTO_CLIENT_CERT was added in 7.77.0, released in May + * 2021. + */ - ## git-svn.perl ## -@@ git-svn.perl: sub term_init { - : new Term::ReadLine 'git-svn'; - } + ## http.c ## + remerge CONFLICT (content): Merge conflict in http.c + index 59043421d6..c6ba13d80b 100644 + --- http.c + +++ http.c +@@ http.c: static long http_schannel_check_revoke_mode = + CURLSSLOPT_NO_REVOKE; + #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." -+); +-<<<<<<< ebac26f61b (Merge 'readme' into HEAD) + static long http_retry_after = 0; + static long http_max_retries = 0; + static long http_max_retry_time = 300; + +-======= +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + - 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 f2097f95f9..732c8fe103 100644 + --- refs/reftable-backend.c + +++ refs/reftable-backend.c +@@ refs/reftable-backend.c: static struct ref_store *reftable_be_init(struct repository *repo, + umask(mask); - test_done - - ## t/t9109-git-svn-multi-glob.sh ## -@@ t/t9109-git-svn-multi-glob.sh: test_expect_success 'test disallow multiple globs' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch three 2> stderr.three && -- test_cmp expect.three stderr.three -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean && -+ test_cmp expect.three stderr.three.clean - ' + reftable_set_alloc(malloc, realloc, free); +-<<<<<<< ebac26f61b (Merge 'readme' into HEAD) - test_done - - ## t/t9168-git-svn-partially-globbed-names.sh ## -@@ t/t9168-git-svn-partially-globbed-names.sh: test_expect_success 'test disallow prefixed multi-globs' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch four 2>stderr.four && -- test_cmp expect.four stderr.four && -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.four >stderr.four.clean && -+ test_cmp expect.four stderr.four.clean && - git config --unset svn-remote.four.branches && - git config --unset svn-remote.four.tags - ' -@@ t/t9168-git-svn-partially-globbed-names.sh: test_expect_success 'test disallow multiple asterisks in one word' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch six 2>stderr.six && -- test_cmp expect.six stderr.six -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.six >stderr.six.clean && -+ test_cmp expect.six stderr.six.clean - ' + refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir, + &ref_common_dir); - test_done + base_ref_store_init(&refs->base, repo, refdir.buf, &refs_be_reftable); +-======= +- base_ref_store_init(&refs->base, repo, gitdir, &refs_be_reftable); +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + strmap_init(&refs->worktree_backends); + refs->store_flags = store_flags; + refs->log_all_ref_updates = repo_settings_get_log_all_ref_updates(repo); + + ## t/meson.build ## + remerge CONFLICT (content): Merge conflict in t/meson.build + index 531bc8d075..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', +-<<<<<<< ebac26f61b (Merge 'readme' into HEAD) + 't7425-submodule-gitdir-path-extension.sh', + 't7426-submodule-get-default-remote.sh', +-======= +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + 't7429-submodule-long-path.sh', + 't7450-bad-git-dotfiles.sh', + 't7500-commit-template-squash-signoff.sh',To: 695ccca8de (Detect number of cores better on multi-socket systems (git-for-windows#6108), 2026-04-06) (a53c8e49ab..695ccca8de)
Statistics
Range-diff (click to expand)
1: f3c02d5 = 1: 5e0c3e3 unix-socket: avoid leak when initialization fails
2: dc2662f = 2: 332d69c grep: prevent
^$false match at end of file3: 0f4c6d7 = 3: 9f013b4 Merge branch 'fixes-from-the-git-mailing-list'
19: 95b01f3 = 4: 5bab523 vcpkg_install: detect lack of Git
20: f46e7a2 = 5: 96141aa vcpkg_install: add comment regarding slow network connections
21: 6afdceb = 6: c02def0 vcbuild: install ARM64 dependencies when building ARM64 binaries
22: b9cdc74 = 7: 0120361 vcbuild: add an option to install individual 'features'
23: d784fd1 = 8: b770796 cmake: allow building for Windows/ARM64
4: d9c4add = 9: 51f7f72 mingw: include the Python parts in the build
24: e8b4fb0 = 10: 4c2f526 ci(vs-build) also build Windows/ARM64 artifacts
5: dd767db ! 11: deb6cf3 win32/pthread: avoid name clashes with winpthread
26: 48766d3 = 12: a8a00e5 Add schannel to curl installation
27: f8b681f = 13: 55fe338 hash-object: demonstrate a >4GB/LLP64 problem
6: 0231638 = 14: 0cc504f git-compat-util: avoid redeclaring _DEFAULT_SOURCE
29: 808d9e6 = 15: 7043fd6 cmake(): allow setting HOST_CPU for cross-compilation
30: fed1cf3 ! 16: 48c8848 object-file.c: use size_t for header lengths
7: 74acd7a = 17: 890586e Import the source code of mimalloc v2.2.7
8: 319afd2 = 18: b6579ab t9350: point out that refs are not updated correctly
32: cec1c90 = 19: 8b134e2 CMake: default Visual Studio generator has changed
33: a879ab4 = 20: 50dee02 hash algorithms: use size_t for section lengths
9: ba440b4 = 21: 30760ab mimalloc: adjust for building inside Git
10: d97de91 = 22: b7223ec transport-helper: add trailing --
35: e9c204d = 23: 7d5fc50 mingw: demonstrate a
git addissue with NTFS junctions36: df76554 = 24: 0a63d37 .gitignore: add Visual Studio CMakeSetting.json file
37: a2460b5 = 25: 23161b9 hash-object --stdin: verify that it works with >4GB/LLP64
11: 88bdd9a = 26: 654ffea mimalloc: offer a build-time option to enable it
39: 8550ab1 = 27: b6cdb2e t5505/t5516: allow running without
.git/branches/in the templates12: 6c95275 = 28: cbb54c7 remote-helper: check helper status after import/export
13: 4d1fbcc = 29: c870ae7 clean: do not traverse mount points
40: d72e667 = 30: 539c097 strbuf_realpath(): use platform-dependent API if available
41: a79b775 = 31: 765909f http: use new "best effort" strategy for Secure Channel revoke checking
42: 416f381 = 32: 4b469a8 subtree: update
contrib/subtreetesttarget43: 2ab77db = 33: ca78134 CMakeLists: add default "x64-windows" arch for Visual Studio
44: f5f4b60 = 34: bbd9bb0 hash-object: add another >4GB/LLP64 test case
45: bff3095 ! 35: e058677 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(struct repository *repo, int *nongit_ok) +@@ setup.c: const char *setup_git_directory_gently(int *nongit_ok) break; case GIT_DIR_INVALID_OWNERSHIP: if (!nongit_ok) {14: 1cdb5e2 = 36: 7e520d7 mingw: use mimalloc
48: 62350b6 = 37: 557ef72 t5505/t5516: fix white-space around redirectors
15: 41ed65e = 38: 54c2185 Always auto-gc after calling a fast-import transport
16: 1aa3906 = 39: e58f2e7 mingw: prevent regressions with "drive-less" absolute paths
17: 3c38ded = 40: 3fb9243 clean: remove mount points when possible
18: 313a058 = 41: 024b680 transport: optionally disable side-band-64k
50: 4e073ce = 42: 86b2a55 mingw: fix fatal error working on mapped network drives on Windows
51: 5a3df34 = 43: a5a527f clink.pl: fix MSVC compile script to handle libcurl-d.lib
52: 8ce63d0 = 44: e8c9ab8 mingw: implement a platform-specific
strbuf_realpath()53: 8c87ce5 = 45: 982f550 t3701: verify that we can add lots of files interactively
54: cc5a789 = 46: 8dfd0a1 commit: accept "scissors" with CR/LF line endings
55: d6efc94 = 47: b2cca5b t0014: fix indentation
56: 76eb36e = 48: 12ff8fa git-gui: accommodate for intent-to-add files
57: 1ea33c4 = 49: 54aa76a mingw: allow for longer paths in
parse_interpreter()58: 3912e93 = 50: a22475e compat/vcbuild: document preferred way to build in Visual Studio
59: 2c21783 = 51: 111c1d5 http: optionally send SSL client certificate
60: 36cbddb = 52: ce86366 ci: run
contrib/subtreetests in CI builds61: b6e9681 = 53: 29bfa7e CMake: show Win32 and Generator_platform build-option values
62: ee2048a = 54: cbe6948 hash-object: add a >4GB/LLP64 test case using filtered input
63: f59c69b = 55: 0da6aa8 compat/mingw.c: do not warn when failing to get owner
25: 50ce83b = 56: ce2c0d7 windows: skip linking
git-<command>for built-ins28: 811284f = 57: cc0076b mingw: stop hard-coding
CC = gcc31: a62a004 = 58: b75bfe3 mingw: drop the -D_USE_32BIT_TIME_T option
34: 61300ba = 59: b31aa0a mingw: only use -Wl,--large-address-aware for 32-bit builds
38: 5fe08fd = 60: 7cf43aa mingw: avoid over-specifying
--pic-executable47: 24866f2 = 61: 817d14e mingw: set the prefix and HOST_CPU as per MSYS2's settings
69: d38bf12 = 62: f0f9f68 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
70: 03abee8 = 63: 34bb07d mingw: rely on MSYS2's metadata instead of hard-coding it
71: d10cc88 = 64: 5a92dc1 mingw: always define
ETC_*for MSYS2 environments72: 33200d7 = 65: c5f604f max_tree_depth: lower it for clang builds in general on Windows
73: 6d32b20 = 66: 4b9ef49 mingw: ensure valid CTYPE
74: 2296fe8 = 67: 0c82eb8 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
75: 10f1eb2 = 68: 34cf74b mingw: allow
git.exeto be used instead of the "Git wrapper"76: 7f71522 = 69: 410dfbe revision: create mark_trees_uninteresting_dense()
77: 022f794 = 70: 3ec9037 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
78: 04e9c7d = 71: 1f8a4ac survey: stub in new experimental 'git-survey' command
79: 15865fa = 72: 1e01df8 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
80: ed9b279 = 73: 7067a9d survey: add command line opts to select references
81: b34a06d = 74: 196acd7 clink.pl: fix libexpatd.lib link error when using MSVC
82: 67c599a = 75: f1906c0 survey: start pretty printing data in table form
83: a23cf0c = 76: 62435ab Makefile: clean up .ilk files when MSVC=1
84: 77406ae = 77: e04ea03 survey: add object count summary
85: 28a155c = 78: c4f9ba7 vcbuild: add support for compiling Windows resource files
86: d6c9a76 = 79: a83b23a survey: summarize total sizes by object type
87: 812e650 = 80: 360a446 config.mak.uname: add git.rc to MSVC builds
49: bf4a2e8 = 81: f5265ec MinGW: link as terminal server aware
88: a0d7dff = 82: 0bd7740 survey: show progress during object walk
90: 177f0e5 = 83: fbec6fb clink.pl: ignore no-stack-protector arg on MSVC=1 builds
91: ef11fb3 = 84: 51ded12 http: optionally load libcurl lazily
92: dde8f30 = 85: 37d39d5 survey: add ability to track prioritized lists
89: 6b4a1fa = 86: 21aaf89 mingw: make sure
errnois set correctly when socket operations fail95: 32eb976 = 87: dc99655 clink.pl: move default linker options for MSVC=1 builds
96: 1fdb175 = 88: 84857d1 http: support lazy-loading libcurl also on Windows
97: edf7d66 = 89: 1096b53 survey: add report of "largest" paths
93: c343021 = 90: 659174e compat/mingw: handle WSA errors in strerror
46: 359458a = 91: f61646f Add config option
windows.appendAtomically100: 939d0e9 = 92: 2e1cea8 cmake: install headless-git.
101: 5952405 = 93: aa453c4 http: when loading libcurl lazily, allow for multiple SSL backends
102: 8f4b121 = 94: c45fc72 survey: add --top= option and config
98: 9cc9501 = 95: e49cb8c compat/mingw: drop outdated comment
64: f8d481d = 96: 5f76e5b mingw: $env:TERM="xterm-256color" for newer OSes
65: ffe1186 = 97: 8856ff7 winansi: check result and Buffer before using Name
66: 384b348 = 98: bdf11b8 mingw: change core.fsyncObjectFiles = 1 by default
67: e4b4c5a = 99: d589781 Fix Windows version resources
68: e879827 = 100: 94baef9 status: fix for old-style submodules with commondir
106: f63b30f = 101: 7fd61b2 git.rc: include winuser.h
107: 6f7feef = 102: 8029ae6 mingw: do load libcurl dynamically by default
108: 29fea5c = 103: 6cc6990 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
109: ade0817 = 104: 2e3ac57 mingw: suggest
windows.appendAtomicallyin more cases110: d03b96b = 105: ac4e147 win32: use native ANSI sequence processing, if possible
111: d8a50ac = 106: 6429c98 common-main.c: fflush stdout buffer upon exit
112: b2a33ab = 107: fe1faca t5601/t7406(mingw): do run tests with symlink support
113: 4c35d9a = 108: 201db7e win32: ensure that
localtime_r()is declared even in i686 builds114: 589f665 = 109: 73b3c56 Fallback to AppData if XDG_CONFIG_HOME is unset
115: 8241d96 = 110: d766aba run-command: be helpful with Git LFS fails on Windows 7
116: 9859029 = 111: d518361 survey: clearly note the experimental nature in the output
105: 0bff077 = 112: 230fd8a Merge 'remote-hg-prerequisites' into HEAD
123: 536374e = 113: 76ad760 Merge branch 'drive-prefix'
124: 4fd3435 = 114: 3027fa7 Merge branch 'dont-clean-junctions'
125: 872c7cb = 115: cd6fe14 Merge branch 'msys2-python'
126: dd94663 = 116: f3f0584 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
127: 43599d0 = 117: 4c1bd47 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
128: cc99843 = 118: 5a11f8b Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
129: 3166766 = 119: dfd955a Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
130: 99b195a = 120: b14e581 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction131: 318841d = 121: 72f655d Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
132: 8e7f501 = 122: 99c6af7 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
133: 553537d = 123: 78ddd18 Merge 'add-p-many-files'
134: cdf4928 = 124: 8c02fbd Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
135: 46b6eb3 = 125: 52514ff Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
136: 1a9d4a6 = 126: bf3ba9c Merge 'git-gui/js/intent-to-add'
137: ebf5f2f = 127: f211029 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
138: 6a9c525 = 128: c6882e0 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
139: a025918 = 129: 96a053f Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
140: d3bf0f9 = 130: f483396 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path141: a160900 = 131: 09e50a7 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
142: b61d30f = 132: 5d6ddca Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
143: 4d11dcd = 133: 540d227 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests94: 3d66c0d = 134: 70e6715 t5563: verify that NTLM authentication works
144: 9d5bc07 = 135: f08c058 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
99: 2c7aa35 = 136: 66d73d3 http: disallow NTLM authentication by default
145: 077ea71 = 137: 9b6881c Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t103: f73bb24 = 138: 2d1b42a t0301: actually test credential-cache on Windows
104: f440e15 = 139: 18b07e5 http: warn if might have failed because of NTLM
146: 30d8162 = 140: 6ce9f54 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory117: 80bfedf = 141: 0e2a3ce credential-cache: handle ECONNREFUSED gracefully
118: dbb10a1 = 142: 417c5b6 reftable: do make sure to use custom allocators
119: 5f481a3 = 143: a31c0fa check-whitespace: avoid alerts about upstream commits
120: cd4e2e4 = 144: 457c340 t/t5571-prep-push-hook.sh: Add test with writing to stderr
121: cea5e06 = 145: 3b022d4 credential: advertise NTLM suppression and allow helpers to re-enable
122: c75e6bb = 146: 7ddf94e dir: do not traverse mount points
147: 0fd1c39 = 147: a3fc118 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
148: 8f8e9fe = 148: 92e83f9 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
149: 88605f6 = 149: d6a380f Merge branch 'optionally-dont-append-atomically-on-windows'
150: 3ea840e = 150: 13e24de Merge branch 'fsync-object-files-always'
151: ca81b60 = 151: c35e673 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
152: b290643 = 152: 4dff7a7 Fix Windows version resources (Fix Windows version resources git#4092)
153: 957cf53 = 153: b6b39e4 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
154: 2ed4803 = 154: 74cd6f8 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)155: a66d482 = 155: e9452bf Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)156: d53aa56 = 156: a18b7f7 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283157: 7e92c75 = 157: a7c0330 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
158: 5b712b3 = 158: a254a7d ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
159: 99af470 = 159: f91c5d8 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
160: 12fb81d = 160: 73e18dc Merge branch 'nano-server'
161: 603c9b1 = 161: 66b7d2e Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
162: 4a77ad9 = 162: 5a1bc23 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
163: 6b9b8ef = 163: c86ece3 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
164: 17c975c = 164: 66ca690 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
165: 1dc453e = 165: 7802015 Merge branch 'Fix-i686-build-with-GCC-v14'
166: 936bf93 = 166: fa68b3e Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
167: 42044d0 = 167: a3f7c29 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
168: 59b8f66 = 168: 4d481ea pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
169: e9feb11 = 169: f5a8c00 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
170: 23c453b = 170: 6ca8b8e Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
171: 33f65e8 = 171: e749afb credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
172: c31639b = 172: ef39900 Merge branch 'reftable-vs-custom-allocators'
173: 646f918 = 173: c41900e Merge branch 'check-whitespace-only-downstream'
174: 59d0916 = 174: ff49b52 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)
175: 17e2775 = 175: 0a9aa09 Merge branch 'disallow-ntlm-auth-by-default'
176: eb9667d = 176: 4377501 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)177: 7f91d68 = 177: 77a86c2 Merge branch 'ready-for-upstream'
178: 3945646 = 178: 746436d ci(macos): skip the
git p4tests179: 1be1a21 = 179: d67ee31 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)180: c078f38 = 180: cb8c0c5 git-gui--askyesno: fix funny text wrapping
181: 86b7768 = 181: 0f2a0f8 Win32: make FILETIME conversion functions public
183: 080a406 = 182: c3ba885 Win32: dirent.c: Move opendir down
185: adf3993 = 183: 39f1ff9 mingw: make the dirent implementation pluggable
186: 2da5230 = 184: bdc472c Win32: make the lstat implementation pluggable
187: 0651474 = 185: db5613f mingw: add infrastructure for read-only file system level caches
188: 7219290 = 186: 5f9c02b mingw: add a cache below mingw's lstat and dirent implementations
189: 7b724e0 = 187: 2224c2d fscache: load directories only once
190: 959ea7c = 188: ff1ab2e fscache: add key for GIT_TRACE_FSCACHE
191: 4816101 = 189: f757b69 fscache: remember not-found directories
192: 72ad219 = 190: 84bb9eb fscache: add a test for the dir-not-found optimization
193: 8fefcaf = 191: b1ba81f add: use preload-index and fscache for performance
194: 86d99f1 = 192: 34bc42b dir.c: make add_excludes aware of fscache during status
195: 5402bbf = 193: 68bb6f7 fscache: make fscache_enabled() public
196: eea2903 = 194: 4c9abb3 dir.c: regression fix for add_excludes with fscache
197: 3183a15 = 195: 03921fe fetch-pack.c: enable fscache for stats under .git/objects
198: da9fd65 = 196: 63505b0 checkout.c: enable fscache for checkout again
199: 84888ed = 197: a2c4409 Enable the filesystem cache (fscache) in refresh_index().
200: 2de4343 = 198: 6c365e5 fscache: use FindFirstFileExW to avoid retrieving the short name
201: f189857 = 199: 9d63810 fscache: add GIT_TEST_FSCACHE support
202: ac06a3e = 200: 390c3c7 fscache: add fscache hit statistics
203: 574257b = 201: c2a752e unpack-trees: enable fscache for sparse-checkout
204: e3ac4d1 = 202: 946bf69 status: disable and free fscache at the end of the status command
205: 61786a1 = 203: f55f5c9 mem_pool: add GIT_TRACE_MEMPOOL support
206: 57080d9 = 204: 0992acd fscache: fscache takes an initial size
207: 3d39998 = 205: e7dde74 fscache: update fscache to be thread specific instead of global
208: 1b8de79 = 206: 9f6f1ef fscache: teach fscache to use mempool
209: 45c228f = 207: da0f3a7 fscache: make fscache_enable() thread safe
210: fe52e88 = 208: a00df72 fscache: teach fscache to use NtQueryDirectoryFile
211: 3fe0cff = 209: ac0061c fscache: remember the reparse tag for each entry
212: 9bf5efa = 210: d504085 Merge branch 'fscache'
213: c1f2d9a = 211: 38e161d fscache: implement an FSCache-aware is_mount_point()
214: 4a03cb4 = 212: 3dcd0bc Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
215: 783162c = 213: 0443141 clean: make use of FSCache
216: c8c9b45 = 214: 2e68fb4 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
217: fae902c = 215: aa4105f Merge branch 'dont-clean-junctions-fscache'
218: c2be943 = 216: f903aa3 pack-objects (mingw): demonstrate a segmentation fault with large deltas
219: acc9b7a = 217: 40d99c4 mingw: support long paths
220: 6f8772b = 218: 39ac252 win32(long path support): leave drive-less absolute paths intact
221: b57a9a9 = 219: bd4a5c1 compat/fsmonitor/fsm-*-win32: support long paths
222: 7b1433f = 220: 2e7de6a clean: suggest using
core.longPathsif paths are too long to remove223: bde5017 = 221: bb6ca77 mingw: Support
git_terminal_promptwith more terminals224: 2a87d30 = 222: 7a8ff12 compat/terminal.c: only use the Windows console if bash 'read -r' fails
225: e6d0fa4 = 223: 568698c mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
226: 6b16837 = 224: caa8133 Win32: symlink: move phantom symlink creation to a separate function
227: c2bb6d5 ! 225: c94c54c Introduce helper to create symlinks that knows about index_state
229: c014cb8 = 226: 49cc55f mingw: allow to specify the symlink type in .gitattributes
231: 076652c = 227: c5ab4b8 Win32: symlink: add test for
symlinkattribute233: 43acbab = 228: c3e2ba1 mingw: explicitly specify with which cmd to prefix the cmdline
228: 370a533 = 229: cb5cba7 mingw: introduce code to detect whether we're inside a Windows container
235: c7d21fd = 230: ae726b3 mingw: when path_lookup() failed, try BusyBox
230: 7bf3d1a = 231: 54f5295 mingw: when running in a Windows container, try to rename() harder
237: af737ee = 232: 3794bd9 test-tool: learn to act as a drop-in replacement for
iconv232: 800c6db = 233: 0f8912b mingw: move the file_attr_to_st_mode() function definition
238: 561557a = 234: 26e67e7 tests(mingw): if
iconvis unavailable, usetest-helper --iconv182: 28e3cc0 = 235: 578f375 git-gui--askyesno (mingw): use Git for Windows' icon, if available
234: 620db93 = 236: a4335bb mingw: Windows Docker volumes are not symbolic links
239: 0d33000 = 237: 9454743 gitattributes: mark .png files as binary
184: 3b94461 = 238: 35ee293 Merge branch 'git-gui-askyesno'
236: e5aea4c = 239: de493ce mingw: work around rename() failing on a read-only file
240: 6acad1d = 240: 41b0e9f tests: move test PNGs into t/lib-diff/
241: 8887513 = 241: 7d47eb5 tests: only override sort & find if there are usable ones in /usr/bin/
242: 0e6436f = 242: 3a5ca2e tests: use the correct path separator with BusyBox
243: af96a57 = 243: c209415 mingw: only use Bash-ism
builtin pwd -Wwhen available244: 62faa78 = 244: a924ee3 tests (mingw): remove Bash-specific pwd option
245: 4ff76b4 = 245: 1b81d46 test-lib: add BUSYBOX prerequisite
266: c0119c7 = 246: 6f45153 Merge branch 'gitk-and-git-gui-patches'
247: eb71952 = 247: d8850e7 t5003: use binary file from t/lib-diff/
267: dbf9c4e = 248: 6e16601 Merge branch 'long-paths'
249: 35549e7 = 249: cfe97c0 t5532: workaround for BusyBox on Windows
268: 422d46a = 250: 772549a Merge branch 'msys2'
251: 39dacaa = 251: f331341 t5605: special-case hardlink test for BusyBox-w32
269: c1360ad = 252: 0ef8f73 Merge 'docker-volumes-are-no-symlinks'
253: ef543f2 = 253: f1b3614 t5813: allow for $PWD to be a Windows path
270: 36d13bd = 254: 51c9d2d mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
255: 19205b2 = 255: 510a452 t9200: skip tests when $PWD contains a colon
271: 249e5c2 = 256: 8003ee4 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
246: ea379a5 = 257: 347fdfa Describe Git for Windows' architecture [no ci]
256: 67a3089 = 258: fe0a155 mingw: kill child processes in a gentler way
259: 0918e6e = 259: 4d34f9c mingw: optionally enable wsl compability file mode bits
272: c8d5410 = 260: 180f616 Merge branch 'busybox-w32'
248: 59c07b3 = 261: f066397 Modify the Code of Conduct for Git for Windows
260: 1b82112 = 262: 0532ffb mingw: really handle SIGINT
273: 40c97fd = 263: a2cf85d Merge branch 'wsl-file-mode-bits'
250: d921372 = 264: 68fc11a CONTRIBUTING.md: add guide for first-time contributors
261: 34890c8 = 265: 4e7a68b Partially un-revert "editor: save and reset terminal after calling EDITOR"
274: 08034f5 = 266: 9d46fa3 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
252: eb84a8c = 267: 63574f9 README.md: Add a Windows-specific preamble
262: 751245f = 268: ab70113 reset: reinstate support for the deprecated --stdin option
275: 9dfb4a6 = 269: dbfb3e8 Merge branch 'un-revert-editor-save-and-reset'
254: 1d91c4a = 270: 2106678 Add an issue template
257: c07afc6 = 271: 3deccd1 Add a GitHub workflow to monitor component updates
263: 7d31f75 = 272: f03985d fsmonitor: reintroduce core.useBuiltinFSMonitor
276: 7e76d0c = 273: c08356c Merge branch 'phase-out-reset-stdin'
258: 4b986f1 = 274: 1c38fc1 Modify the GitHub Pull Request template (to reflect Git for Windows)
264: 59e1387 = 275: 49316e3 dependabot: help keeping GitHub Actions versions up to date
277: c1b0823 = 276: 2f54808 Merge branch 'deprecate-core.useBuiltinFSMonitor'
265: dab70a1 = 277: c2de312 SECURITY.md: document Git for Windows' policies
278: 3f84bc0 = 278: 20326a5 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
279: 0f9d061 = 279: ebac26f Merge 'readme' into HEAD
280: 6bcc0e7 < -: ---------- Winansi: Drop pre-Vista workaround (Winansi: Drop pre-Vista workaround git#6109)
-: ---------- > 280: 0ca8b9d Winansi: Drop pre-Vista workaround (Winansi: Drop pre-Vista workaround git#6109)
281: f5a8b94 = 281: 695ccca Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)