Rebase shears/next (#24377129018)#120
Open
gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/next-24377129018from
Open
Rebase shears/next (#24377129018)#120gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/next-24377129018from
gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/next-24377129018from
Conversation
To complement the `--stdin` and `--literally` test cases that verify that we can hash files larger than 4GB on 64-bit platforms using the LLP64 data model, here is a test case that exercises `hash-object` _without_ any options. Just as before, we use the `big` file from the previous test case if it exists to save on setup time, otherwise generate it. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Thorough benchmarking with repacking a subset of linux.git (the commit history reachable from 93a6fef ([PATCH] fix the SYSCTL=n compilation, 2007-02-28), to be precise) suggest that this allocator is on par, in multi-threaded situations maybe even better than nedmalloc: `git repack -adfq` with mimalloc, 8 threads: 31.166991900 27.576763800 28.712311000 27.373859000 27.163141900 `git repack -adfq` with nedmalloc, 8 threads: 31.915032900 27.149883100 28.244933700 27.240188800 28.580849500 In a different test using GitHub Actions build agents (probably single-threaded, a core-strength of nedmalloc)): `git repack -q -d -l -A --unpack-unreachable=2.weeks.ago` with mimalloc: 943.426 978.500 939.709 959.811 954.605 `git repack -q -d -l -A --unpack-unreachable=2.weeks.ago` with nedmalloc: 995.383 952.179 943.253 963.043 980.468 While these measurements were not executed with complete scientific rigor, as no hardware was set aside specifically for these benchmarks, it shows that mimalloc and nedmalloc perform almost the same, nedmalloc with a bit higher variance and also slightly higher average (further testing suggests that nedmalloc performs worse in multi-threaded situations than in single-threaded ones). In short: mimalloc seems to be slightly better suited for our purposes than nedmalloc. Seeing that mimalloc is developed actively, while nedmalloc ceased to see any updates in eight years, let's use mimalloc on Windows instead. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Since commit 0c499ea (send-pack: demultiplex a sideband stream with status data, 2010-02-05) the send-pack builtin uses the side-band-64k capability if advertised by the server. Unfortunately this breaks pushing over the dump git protocol if used over a network connection. The detailed reasons for this breakage are (by courtesy of Jeff Preshing, quoted from https://groups.google.com/d/msg/msysgit/at8D7J-h7mw/eaLujILGUWoJ): MinGW wraps Windows sockets in CRT file descriptors in order to mimic the functionality of POSIX sockets. This causes msvcrt.dll to treat sockets as Installable File System (IFS) handles, calling ReadFile, WriteFile, DuplicateHandle and CloseHandle on them. This approach works well in simple cases on recent versions of Windows, but does not support all usage patterns. In particular, using this approach, any attempt to read & write concurrently on the same socket (from one or more processes) will deadlock in a scenario where the read waits for a response from the server which is only invoked after the write. This is what send_pack currently attempts to do in the use_sideband codepath. The new config option `sendpack.sideband` allows to override the side-band-64k capability of the server, and thus makes the dumb git protocol work. Other transportation methods like ssh and http/https still benefit from the sideband channel, therefore the default value of `sendpack.sideband` is still true. Signed-off-by: Thomas Braun <thomas.braun@byte-physics.de> Signed-off-by: Oliver Schneider <oliver@assarbad.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In 1e64d18 (mingw: do resolve symlinks in `getcwd()`) a problem was introduced that causes git for Windows to stop working with certain mapped network drives (in particular, drives that are mapped to locations with long path names). Error message was "fatal: Unable to read current working directory: No such file or directory". Present change fixes this issue as discussed in git-for-windows#2480 Signed-off-by: Bjoern Mueller <bjoernm@gmx.de>
Update clink.pl to link with either libcurl.lib or libcurl-d.lib depending on whether DEBUG=1 is set. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
There is a Win32 API function to resolve symbolic links, and we can use that instead of resolving them manually. Even better, this function also resolves NTFS junction points (which are somewhat similar to bind mounts). This fixes git-for-windows#2481. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The native Windows HTTPS backend is based on Secure Channel which lets the caller decide how to handle revocation checking problems caused by missing information in the certificate or offline CRL distribution points. Unfortunately, cURL chose to handle these problems differently than OpenSSL by default: while OpenSSL happily ignores those problems (essentially saying "¯\_(ツ)_/¯"), the Secure Channel backend will error out instead. As a remedy, the "no revoke" mode was introduced, which turns off revocation checking altogether. This is a bit heavy-handed. We support this via the `http.schannelCheckRevoke` setting. In curl/curl#4981, we contributed an opt-in "best effort" strategy that emulates what OpenSSL seems to do. In Git for Windows, we actually want this to be the default. This patch makes it so, introducing it as a new value for the `http.schannelCheckRevoke" setting, which now becmes a tristate: it accepts the values "false", "true" or "best-effort" (defaulting to the last one). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The convention in Git project's shell scripts is to have white-space _before_, but not _after_ the `>` (or `<`). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This change enhances `git commit --cleanup=scissors` by detecting scissors lines ending in either LF (UNIX-style) or CR/LF (DOS-style). Regression tests are included to specifically test for trailing comments after a CR/LF-terminated scissors line. Signed-off-by: Luke Bonanomi <lbonanomi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
For some reason, this test case was indented with 4 spaces instead of 1 horizontal tab. The other test cases in the same test script are fine. Signed-off-by: Jens Glathe <jens.glathe@oldschoolsolutions.biz> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
As of Git v2.28.0, the diff for files staged via `git add -N` marks them as new files. Git GUI was ill-prepared for that, and this patch teaches Git GUI about them. Please note that this will not even fix things with v2.28.0, as the `rp/apply-cached-with-i-t-a` patches are required on Git's side, too. This fixes git-for-windows#2779 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
The vcpkg downloads may not succeed. Warn careful readers of the time out. A simple retry will usually resolve the issue. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Git's regular Makefile mentions that HOST_CPU should be defined when cross-compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L438-L439 This is then used to set the GIT_HOST_CPU variable when compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L1337-L1341 Then, when the user runs `git version --build-options`, it returns that value: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/help.c#L658 This commit adds the same functionality to the CMake configuration. Users can now set -DHOST_CPU= to set the target architecture. Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
As reported in newren/git-filter-repo#225, it looks like 99 bytes is not really sufficient to represent e.g. the full path to Python when installed via Windows Store (and this path is used in the hasb bang line when installing scripts via `pip`). Let's increase it to what is probably the maximum sensible path size: MAX_PATH. This makes `parse_interpreter()` in line with what `lookup_prog()` handles. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Vilius Šumskas <vilius@sumskas.eu>
We used to have that `make vcxproj` hack, but a hack it is. In the meantime, we have a much cleaner solution: using CMake, either explicitly, or even more conveniently via Visual Studio's built-in CMake support (simply open Git's top-level directory via File>Open>Folder...). Let's let the `README` reflect this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This adds support for a new http.sslAutoClientCert config value. In cURL 7.77 or later the schannel backend does not automatically send client certificates from the Windows Certificate Store anymore. This config value is only used if http.sslBackend is set to "schannel", and can be used to opt in to the old behavior and force cURL to send client certificates. This fixes git-for-windows#3292 Signed-off-by: Pascal Muller <pascalmuller@gmail.com>
Because `git subtree` (unlike most other `contrib` modules) is included as part of the standard release of Git for Windows, its stability should be verified as consistently as it is for the rest of git. By including the `git subtree` tests in the CI workflow, these tests are as much of a gate to merging and indicator of stability as the standard test suite. Signed-off-by: Victoria Dye <vdye@github.com>
Ensure key CMake option values are part of the CMake output to facilitate user support when tool updates impact the wider CMake actions, particularly ongoing 'improvements' in Visual Studio. These CMake displays perform the same function as the build-options.txt provided in the main Git for Windows. CMake is already chatty. The setting of CMAKE_EXPORT_COMPILE_COMMANDS is also reported. Include the environment's CMAKE_EXPORT_COMPILE_COMMANDS value which may have been propogated to CMake's internal value. Testing the CMAKE_EXPORT_COMPILE_COMMANDS processing can be difficult in the Visual Studio environment, as it may be cached in many places. The 'environment' may include the OS, the user shell, CMake's own environment, along with the Visual Studio presets and caches. See previous commit for arefacts that need removing for a clean test. Signed-off-by: Philip Oakley <philipoakley@iee.email>
To verify that the `clean` side of the `clean`/`smudge` filter code is correct with regards to LLP64 (read: to ensure that `size_t` is used instead of `unsigned long`), here is a test case using a trivial filter, specifically _not_ writing anything to the object store to limit the scope of the test case. As in previous commits, the `big` file from previous test cases is reused if available, to save setup time, otherwise re-generated. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In the case of Git for Windows (say, in a Git Bash window) running in a Windows Subsystem for Linux (WSL) directory, the GetNamedSecurityInfoW() call in is_path_owned_By_current_side() returns an error code other than ERROR_SUCCESS. This is consistent behavior across this boundary. In these cases, the owner would always be different because the WSL owner is a different entity than the Windows user. The change here is to suppress the error message that looks like this: error: failed to get owner for '//wsl.localhost/...' (1) Before this change, this warning happens for every Git command, regardless of whether the directory is marked with safe.directory. Signed-off-by: Derrick Stolee <derrickstolee@github.com>
For Windows builds >= 15063 set $env:TERM to "xterm-256color" instead of "cygwin" because they have a more capable console system that supports this. Also set $env:COLORTERM="truecolor" if unset. $env:TERM is initialized so that ANSI colors in color.c work, see 29a3963 (Win32: patch Windows environment on startup, 2012-01-15). See git-for-windows#3629 regarding problems caused by always setting $env:TERM="cygwin". This is the same heuristic used by the Cygwin runtime. Signed-off-by: Rafael Kitover <rkitover@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NtQueryObject under Wine can return a success but fill out no name. In those situations, Wine will set Buffer to NULL, and set result to the sizeof(OBJECT_NAME_INFORMATION). Running a command such as echo "$(git.exe --version 2>/dev/null)" will crash due to a NULL pointer dereference when the code attempts to null terminate the buffer, although, weirdly, removing the subshell or redirecting stdout to a file will not trigger the crash. Code has been added to also check Buffer and Length to ensure the check is as robust as possible due to the current behavior being fragile at best, and could potentially change in the future This code is based on the behavior of NtQueryObject under wine and reactos. Signed-off-by: Christopher Degawa <ccom@randomderp.com>
Atomic append on windows is only supported on local disk files, and it may cause errors in other situations, e.g. network file system. If that is the case, this config option should be used to turn atomic append off. Co-Authored-By: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: 孙卓识 <sunzhuoshi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
From the documentation of said setting: This boolean will enable fsync() when writing object files. This is a total waste of time and effort on a filesystem that orders data writes properly, but can be useful for filesystems that do not use journalling (traditional UNIX filesystems) or that only journal metadata and not file contents (OS X’s HFS+, or Linux ext3 with "data=writeback"). The most common file system on Windows (NTFS) does not guarantee that order, therefore a sudden loss of power (or any other event causing an unclean shutdown) would cause corrupt files (i.e. files filled with NULs). Therefore we need to change the default. Note that the documentation makes it sound as if this causes really bad performance. In reality, writing loose objects is something that is done only rarely, and only a handful of files at a time. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Whith Windows 2000, Microsoft introduced a flag to the PE header to mark executables as "terminal server aware". Windows terminal servers provide a redirected Windows directory and redirected registry hives when launching legacy applications without this flag set. Since we do not use any INI files in the Windows directory and don't write to the registry, we don't need this additional preparation. Telling the OS that we don't need this should provide slightly improved startup times in terminal server environments. When building for supported Windows Versions with MSVC the /TSAWARE linker flag is automatically set, but MinGW requires us to set the --tsaware flag manually. This partially addresses git-for-windows#3935. Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Add FileVersion, which is a required field As not all required fields were present, none were being included Fixes git-for-windows#4090 Signed-off-by: Kiel Hurley <kielhurley@gmail.com>
In f9b7573 (repository: free fields before overwriting them, 2017-09-05), Git was taught to release memory before overwriting it, but 357a03e (repository.c: move env-related setup code back to environment.c, 2018-03-03) changed the code so that it would not _always_ be overwritten. As a consequence, the `commondir` attribute would point to already-free()d memory. This seems not to cause problems in core Git, but there are add-on patches in Git for Windows where the `commondir` attribute is subsequently used and causing invalid memory accesses e.g. in setups containing old-style submodules (i.e. the ones with a `.git` directory within theirs worktrees) that have `commondir` configured. This fixes git-for-windows#4083. Signed-off-by: Andrey Zabavnikov <zabavnikov@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When t5605 tries to verify that files are hardlinked (or that they are not), it uses the `-links` option of the `find` utility. BusyBox' implementation does not support that option, and BusyBox-w32's lstat() does not even report the number of hard links correctly (for performance reasons). So let's just switch to a different method that actually works on Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This was pull request git-for-windows#1645 from ZCube/master Support windows container. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
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
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>
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>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. 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>
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>
…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>
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>
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>
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>
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>
Bumps [actions/cache](https://github.com/actions/cache) from 4 to 5. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/actions/cache/releases">actions/cache's releases</a>.</em></p> <blockquote> <h2>v5.0.0</h2> <blockquote> <p>[!IMPORTANT] <strong><code>actions/cache@v5</code> runs on the Node.js 24 runtime and requires a minimum Actions Runner version of <code>2.327.1</code>.</strong></p> <p>If you are using self-hosted runners, ensure they are updated before upgrading.</p> </blockquote> <hr /> <h2>What's Changed</h2> <ul> <li>Upgrade to use node24 by <a href="https://github.com/salmanmkc"><code>@salmanmkc</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1630">actions/cache#1630</a></li> <li>Prepare v5.0.0 release by <a href="https://github.com/salmanmkc"><code>@salmanmkc</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1684">actions/cache#1684</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v4.3.0...v5.0.0">https://github.com/actions/cache/compare/v4.3.0...v5.0.0</a></p> <h2>v4.3.0</h2> <h2>What's Changed</h2> <ul> <li>Add note on runner versions by <a href="https://github.com/GhadimiR"><code>@GhadimiR</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1642">actions/cache#1642</a></li> <li>Prepare <code>v4.3.0</code> release by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1655">actions/cache#1655</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/GhadimiR"><code>@GhadimiR</code></a> made their first contribution in <a href="https://redirect.github.com/actions/cache/pull/1642">actions/cache#1642</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v4...v4.3.0">https://github.com/actions/cache/compare/v4...v4.3.0</a></p> <h2>v4.2.4</h2> <h2>What's Changed</h2> <ul> <li>Update README.md by <a href="https://github.com/nebuk89"><code>@nebuk89</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1620">actions/cache#1620</a></li> <li>Upgrade <code>@actions/cache</code> to <code>4.0.5</code> and move <code>@protobuf-ts/plugin</code> to dev depdencies by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1634">actions/cache#1634</a></li> <li>Prepare release <code>4.2.4</code> by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1636">actions/cache#1636</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/nebuk89"><code>@nebuk89</code></a> made their first contribution in <a href="https://redirect.github.com/actions/cache/pull/1620">actions/cache#1620</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v4...v4.2.4">https://github.com/actions/cache/compare/v4...v4.2.4</a></p> <h2>v4.2.3</h2> <h2>What's Changed</h2> <ul> <li>Update to use <code>@actions/cache</code> 4.0.3 package & prepare for new release by <a href="https://github.com/salmanmkc"><code>@salmanmkc</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1577">actions/cache#1577</a> (SAS tokens for cache entries are now masked in debug logs)</li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/salmanmkc"><code>@salmanmkc</code></a> made their first contribution in <a href="https://redirect.github.com/actions/cache/pull/1577">actions/cache#1577</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v4.2.2...v4.2.3">https://github.com/actions/cache/compare/v4.2.2...v4.2.3</a></p> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/actions/cache/blob/main/RELEASES.md">actions/cache's changelog</a>.</em></p> <blockquote> <h1>Releases</h1> <h2>How to prepare a release</h2> <blockquote> <p>[!NOTE]<br /> Relevant for maintainers with write access only.</p> </blockquote> <ol> <li>Switch to a new branch from <code>main</code>.</li> <li>Run <code>npm test</code> to ensure all tests are passing.</li> <li>Update the version in <a href="https://github.com/actions/cache/blob/main/package.json"><code>https://github.com/actions/cache/blob/main/package.json</code></a>.</li> <li>Run <code>npm run build</code> to update the compiled files.</li> <li>Update this <a href="https://github.com/actions/cache/blob/main/RELEASES.md"><code>https://github.com/actions/cache/blob/main/RELEASES.md</code></a> with the new version and changes in the <code>## Changelog</code> section.</li> <li>Run <code>licensed cache</code> to update the license report.</li> <li>Run <code>licensed status</code> and resolve any warnings by updating the <a href="https://github.com/actions/cache/blob/main/.licensed.yml"><code>https://github.com/actions/cache/blob/main/.licensed.yml</code></a> file with the exceptions.</li> <li>Commit your changes and push your branch upstream.</li> <li>Open a pull request against <code>main</code> and get it reviewed and merged.</li> <li>Draft a new release <a href="https://github.com/actions/cache/releases">https://github.com/actions/cache/releases</a> use the same version number used in <code>package.json</code> <ol> <li>Create a new tag with the version number.</li> <li>Auto generate release notes and update them to match the changes you made in <code>RELEASES.md</code>.</li> <li>Toggle the set as the latest release option.</li> <li>Publish the release.</li> </ol> </li> <li>Navigate to <a href="https://github.com/actions/cache/actions/workflows/release-new-action-version.yml">https://github.com/actions/cache/actions/workflows/release-new-action-version.yml</a> <ol> <li>There should be a workflow run queued with the same version number.</li> <li>Approve the run to publish the new version and update the major tags for this action.</li> </ol> </li> </ol> <h2>Changelog</h2> <h3>5.0.4</h3> <ul> <li>Bump <code>minimatch</code> to v3.1.5 (fixes ReDoS via globstar patterns)</li> <li>Bump <code>undici</code> to v6.24.1 (WebSocket decompression bomb protection, header validation fixes)</li> <li>Bump <code>fast-xml-parser</code> to v5.5.6</li> </ul> <h3>5.0.3</h3> <ul> <li>Bump <code>@actions/cache</code> to v5.0.5 (Resolves: <a href="https://github.com/actions/cache/security/dependabot/33">https://github.com/actions/cache/security/dependabot/33</a>)</li> <li>Bump <code>@actions/core</code> to v2.0.3</li> </ul> <h3>5.0.2</h3> <ul> <li>Bump <code>@actions/cache</code> to v5.0.3 <a href="https://redirect.github.com/actions/cache/pull/1692">#1692</a></li> </ul> <h3>5.0.1</h3> <ul> <li>Update <code>@azure/storage-blob</code> to <code>^12.29.1</code> via <code>@actions/cache@5.0.1</code> <a href="https://redirect.github.com/actions/cache/pull/1685">#1685</a></li> </ul> <h3>5.0.0</h3> <blockquote> <p>[!IMPORTANT] <code>actions/cache@v5</code> runs on the Node.js 24 runtime and requires a minimum Actions Runner version of <code>2.327.1</code>.</p> </blockquote> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/actions/cache/commit/668228422ae6a00e4ad889ee87cd7109ec5666a7"><code>6682284</code></a> Merge pull request <a href="https://redirect.github.com/actions/cache/issues/1738">#1738</a> from actions/prepare-v5.0.4</li> <li><a href="https://github.com/actions/cache/commit/e34039626f957d3e3e50843d15c1b20547fc90e2"><code>e340396</code></a> Update RELEASES</li> <li><a href="https://github.com/actions/cache/commit/8a671105293e81530f1af99863cdf94550aba1a6"><code>8a67110</code></a> Add licenses</li> <li><a href="https://github.com/actions/cache/commit/1865903e1b0cb750dda9bc5c58be03424cc62830"><code>1865903</code></a> Update dependencies & patch security vulnerabilities</li> <li><a href="https://github.com/actions/cache/commit/565629816435f6c0b50676926c9b05c254113c0c"><code>5656298</code></a> Merge pull request <a href="https://redirect.github.com/actions/cache/issues/1722">#1722</a> from RyPeck/patch-1</li> <li><a href="https://github.com/actions/cache/commit/4e380d19e192ace8e86f23f32ca6fdec98a673c6"><code>4e380d1</code></a> Fix cache key in examples.md for bun.lock</li> <li><a href="https://github.com/actions/cache/commit/b7e8d49f17405cc70c1c120101943203c98d3a4b"><code>b7e8d49</code></a> Merge pull request <a href="https://redirect.github.com/actions/cache/issues/1701">#1701</a> from actions/Link-/fix-proxy-integration-tests</li> <li><a href="https://github.com/actions/cache/commit/984a21b1cb176a0936f4edafb42be88978f93ef1"><code>984a21b</code></a> Add traffic sanity check step</li> <li><a href="https://github.com/actions/cache/commit/acf2f1f76affe1ef80eee8e56dfddd3b3e5f0fba"><code>acf2f1f</code></a> Fix resolution</li> <li><a href="https://github.com/actions/cache/commit/95a07c51324af6001b4d6ab8dff29f4dfadc2531"><code>95a07c5</code></a> Add wait for proxy</li> <li>Additional commits viewable in <a href="https://github.com/actions/cache/compare/v4...v5">compare view</a></li> </ul> </details> <br />
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: next
From: 27dec29d31 (build(deps): bump actions/cache from 4 to 5 (git-for-windows#6004), 2026-04-13) (5ad5db668c..27dec29d31)
To: e653c9e738 (build(deps): bump actions/cache from 4 to 5 (git-for-windows#6004), 2026-04-13) (9553340cce..e653c9e738)
Statistics
Range-diff (click to expand)
1: fb51809 = 1: fc926ec unix-socket: avoid leak when initialization fails
2: a7da31f = 2: 7a83b0b grep: prevent
^$false match at end of file3: c72c9da = 3: d4fdc0b Merge branch 'fixes-from-the-git-mailing-list'
4: f6ac221 = 4: ddf005e t9350: point out that refs are not updated correctly
13: 3562915 = 5: a1bcc86 mingw: include the Python parts in the build
5: 52bf453 = 6: b6149cc transport-helper: add trailing --
15: a4a346b ! 7: 3edd001 win32/pthread: avoid name clashes with winpthread
6: 7150085 = 8: f39949b remote-helper: check helper status after import/export
30: 49d8dbf = 9: 0036150 clean: do not traverse mount points
18: da8dcee = 10: 31856a4 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
7: 8f07dfc = 11: 58f0c21 Always auto-gc after calling a fast-import transport
40: 3150d0d = 12: 678692a mingw: prevent regressions with "drive-less" absolute paths
41: 3b5ae55 = 13: bcdb39b clean: remove mount points when possible
8: d96c90c = 14: c25b665 vcpkg_install: detect lack of Git
9: c8f8c0a = 15: 79739e8 vcpkg_install: add comment regarding slow network connections
10: 555b7b8 = 16: 32aaa8f vcbuild: install ARM64 dependencies when building ARM64 binaries
11: 8a36c77 = 17: 341716f vcbuild: add an option to install individual 'features'
12: 16bc23f = 18: 43b81ff cmake: allow building for Windows/ARM64
14: ceb0ccd = 19: b0e6037 ci(vs-build) also build Windows/ARM64 artifacts
16: 7f2bbec = 20: 634e663 Add schannel to curl installation
17: c225d11 = 21: 5115783 hash-object: demonstrate a >4GB/LLP64 problem
21: 3a987d9 = 22: f807849 Import the source code of mimalloc v2.2.7
19: 6f40603 = 23: 3263b83 cmake(): allow setting HOST_CPU for cross-compilation
20: a6e3c6c = 24: 5761104 object-file.c: use size_t for header lengths
24: 9341fd8 = 25: 7ea8af6 mimalloc: adjust for building inside Git
22: 15f500a = 26: b88b1ad CMake: default Visual Studio generator has changed
23: 280b04f = 27: 4330523 hash algorithms: use size_t for section lengths
28: 29b31ae = 28: 8b31b7e mimalloc: offer a build-time option to enable it
25: 6c279b2 = 29: 7b9198c mingw: demonstrate a
git addissue with NTFS junctions26: 264f4e6 = 30: 41951e0 .gitignore: add Visual Studio CMakeSetting.json file
27: ad05426 = 31: 8e07330 hash-object --stdin: verify that it works with >4GB/LLP64
37: 7c05193 = 32: 65e10e4 mingw: use mimalloc
29: 671ab1f = 33: 8dedc70 t5505/t5516: allow running without
.git/branches/in the templates31: 4753a73 = 34: 1897d62 strbuf_realpath(): use platform-dependent API if available
32: 695842f = 35: 214555f http: use new "best effort" strategy for Secure Channel revoke checking
33: 745e00a = 36: d264e13 subtree: update
contrib/subtreetesttarget34: 13a276d = 37: da0bd85 CMakeLists: add default "x64-windows" arch for Visual Studio
35: d92ba5d = 38: eea28d7 hash-object: add another >4GB/LLP64 test case
36: 3ba6559 = 39: 4d09a01 setup: properly use "%(prefix)/" when in WSL
39: 81ebe6a = 40: 2622123 Add config option
windows.appendAtomically59: 2f896bb = 41: 909caa9 windows: skip linking
git-<command>for built-ins38: 33e7d00 = 42: da26ae1 t5505/t5516: fix white-space around redirectors
84: 29a668c = 43: 6ec9b36 MinGW: link as terminal server aware
42: ea6d4c8 = 44: 5ea84ff transport: optionally disable side-band-64k
43: 8a7f90a = 45: 8badc56 mingw: fix fatal error working on mapped network drives on Windows
44: ad3cd11 = 46: 0599e5c clink.pl: fix MSVC compile script to handle libcurl-d.lib
45: 7aca96a = 47: f5fbe07 mingw: implement a platform-specific
strbuf_realpath()46: e970fba = 48: d4ce496 t3701: verify that we can add lots of files interactively
47: b66dba5 = 49: 510e568 commit: accept "scissors" with CR/LF line endings
48: 22c5752 = 50: 21cbcd5 t0014: fix indentation
49: 55694c5 = 51: 6c9e1d1 git-gui: accommodate for intent-to-add files
50: d901d53 = 52: b461662 mingw: allow for longer paths in
parse_interpreter()51: c09e4c7 = 53: decb67a compat/vcbuild: document preferred way to build in Visual Studio
52: 35a77ed = 54: 9b25b5d http: optionally send SSL client certificate
53: 40f94eb = 55: 35bb6f1 ci: run
contrib/subtreetests in CI builds54: 8b2e472 = 56: 8e57ee9 CMake: show Win32 and Generator_platform build-option values
55: 9afb5d7 = 57: 2a503cc hash-object: add a >4GB/LLP64 test case using filtered input
56: 52035e2 = 58: 4ba2524 compat/mingw.c: do not warn when failing to get owner
57: f7e294d = 59: b8b6afb mingw: $env:TERM="xterm-256color" for newer OSes
58: 4fe169b = 60: d199057 winansi: check result and Buffer before using Name
99: 49a9ebd = 61: fd97277 mingw: change core.fsyncObjectFiles = 1 by default
100: 471aec2 = 62: 2069ef8 Fix Windows version resources
101: f44820e = 63: 8c929bb status: fix for old-style submodules with commondir
60: 1b6b17c = 64: 2cd545b mingw: stop hard-coding
CC = gcc61: 2886047 = 65: f1c8c01 mingw: drop the -D_USE_32BIT_TIME_T option
62: b24ed53 = 66: d5b0384 mingw: only use -Wl,--large-address-aware for 32-bit builds
63: ab75100 = 67: 849bc4a mingw: avoid over-specifying
--pic-executable64: 40f83fd = 68: a9b5e22 mingw: set the prefix and HOST_CPU as per MSYS2's settings
65: b1087b6 = 69: e141cb0 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
66: 229dd21 = 70: 3fcd982 mingw: rely on MSYS2's metadata instead of hard-coding it
67: e33a07e = 71: cf71dc9 mingw: always define
ETC_*for MSYS2 environments68: 8bae43e = 72: cd0b163 max_tree_depth: lower it for clang builds in general on Windows
69: 4f2b4c1 = 73: de29cac mingw: ensure valid CTYPE
70: 1c8c794 = 74: f3c5c9d ci: work around a problem with HTTP/2 vs libcurl v8.10.0
71: 182c6da = 75: d04fc22 mingw: allow
git.exeto be used instead of the "Git wrapper"72: a7d4973 = 76: aae0b03 revision: create mark_trees_uninteresting_dense()
73: 43843a1 = 77: 9187a5c mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
74: 0a10780 = 78: 1f874ab survey: stub in new experimental 'git-survey' command
75: 56bac49 = 79: e43ccd3 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
76: 8c93c74 = 80: 7698f95 survey: add command line opts to select references
77: 0e40618 = 81: 9133e15 clink.pl: fix libexpatd.lib link error when using MSVC
78: bad351f = 82: afbcaab survey: start pretty printing data in table form
79: 7c0933b = 83: eff2cf3 Makefile: clean up .ilk files when MSVC=1
80: 21d4672 = 84: 0fc2cd0 survey: add object count summary
81: cd77e88 = 85: 2dea844 vcbuild: add support for compiling Windows resource files
82: 301b750 = 86: a16ee04 survey: summarize total sizes by object type
83: e8b4e14 = 87: f94e931 config.mak.uname: add git.rc to MSVC builds
85: 0ed9f97 = 88: fb3ae98 survey: show progress during object walk
86: cd9443b = 89: e846bf8 mingw: make sure
errnois set correctly when socket operations fail87: ef87ee0 = 90: e163cf3 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
88: 2a2de2c = 91: e1d8843 http: optionally load libcurl lazily
89: 73d382d = 92: d1cdbfc survey: add ability to track prioritized lists
90: 62012da = 93: 90a395a compat/mingw: handle WSA errors in strerror
140: 2998915 = 94: bff518b t5563: verify that NTLM authentication works
91: b025532 = 95: 5ec8444 clink.pl: move default linker options for MSVC=1 builds
92: 657adca = 96: 2015270 http: support lazy-loading libcurl also on Windows
93: c157c44 = 97: bc88d1b survey: add report of "largest" paths
94: 85993cd = 98: e257416 compat/mingw: drop outdated comment
142: 4dcb248 = 99: 45d1f71 http: disallow NTLM authentication by default
95: fd5ea14 = 100: 5507174 cmake: install headless-git.
96: 12da079 = 101: 4f87584 http: when loading libcurl lazily, allow for multiple SSL backends
97: 852b25d = 102: 9dcde00 survey: add --top= option and config
98: 00cdc4d = 103: b006994 t0301: actually test credential-cache on Windows
144: e70c9b5 = 104: a65c728 http: warn if might have failed because of NTLM
102: 4e6d16a = 105: e7d0d6d git.rc: include winuser.h
103: b1f6989 = 106: 027f138 mingw: do load libcurl dynamically by default
104: 50a8fe4 = 107: e5c4e4b Add a GitHub workflow to verify that Git/Scalar work in Nano Server
105: cda66e4 = 108: 08602b5 mingw: suggest
windows.appendAtomicallyin more cases106: a34f676 = 109: d153bbf win32: use native ANSI sequence processing, if possible
107: 4e8b956 = 110: 0d1860c common-main.c: fflush stdout buffer upon exit
108: fa9e8b3 = 111: aa38471 t5601/t7406(mingw): do run tests with symlink support
109: c6c3ff2 = 112: 1eb1c58 win32: ensure that
localtime_r()is declared even in i686 builds110: 73185a7 = 113: 160775b Fallback to AppData if XDG_CONFIG_HOME is unset
111: 70ad944 = 114: 58538f4 run-command: be helpful with Git LFS fails on Windows 7
112: 15ee795 = 115: e342719 survey: clearly note the experimental nature in the output
113: 6e07adc = 116: f10449d credential-cache: handle ECONNREFUSED gracefully
114: 9588de6 = 117: 6147be1 reftable: do make sure to use custom allocators
146: 80cb5c8 = 118: 49bbe4b check-whitespace: avoid alerts about upstream commits
147: f966c18 = 119: 0f135eb t/t5571-prep-push-hook.sh: Add test with writing to stderr
148: 06ff6e8 = 120: 8a42e23 credential: advertise NTLM suppression and allow helpers to re-enable
115: 90d5d57 = 121: 7170d55 Merge 'remote-hg-prerequisites' into HEAD
116: 2feaa44 = 122: 31d54ec Merge branch 'drive-prefix'
117: 56ba4b0 = 123: 8fda9b3 Merge branch 'dont-clean-junctions'
118: 7f9b1f9 = 124: 19ffa8f Merge branch 'msys2-python'
119: b59e6c8 = 125: 59c24af Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
120: b0f29bc = 126: ba89da5 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
121: e16cafa = 127: d7c8da3 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
122: 0063225 = 128: a592d17 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
123: 2bf650e = 129: b006e2f Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction124: 3947c8a = 130: 5f872c1 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
125: b77763f = 131: 9f357e6 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
126: 4ec478b = 132: ba5d6a0 Merge 'add-p-many-files'
127: b3861d6 = 133: d4ce792 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
128: 05bbba0 = 134: 67699fd Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
129: bc616d1 = 135: 270732b Merge 'git-gui/js/intent-to-add'
130: 9cd6278 = 136: a584b85 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
131: 107136f = 137: 55c533c Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
132: 6daddca = 138: b88281e Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
133: b37b051 = 139: d7cfc66 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path134: 6dcbd84 = 140: 51c98f0 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
135: 387c7b7 = 141: 392d4bf Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
136: fc87e41 = 142: 03b98c0 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests137: fc61e05 = 143: 2dce07b Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
138: bb01fc9 = 144: 268b319 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t139: 17ef304 = 145: be4d884 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory141: 42faf23 = 146: b932b18 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
143: d27f270 = 147: 945980e Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
145: 1cb59d5 = 148: fdd138c Merge branch 'optionally-dont-append-atomically-on-windows'
151: 2cb84bd = 149: ff9bef3 Merge branch 'fsync-object-files-always'
149: cdff871 = 150: 3abb385 dir: do not traverse mount points
150: 983bc7b = 151: 38e8320 win32: thread-utils: handle multi-socket systems
152: bc583ec = 152: 1541bea Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
153: 75ea5e1 = 153: 9570f40 Fix Windows version resources (Fix Windows version resources git#4092)
154: 2cb468e = 154: 6fe77cb Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
155: 1952230 = 155: f601dcc Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)156: e1037a7 = 156: f8538f5 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)157: df7f16b = 157: 7f05be8 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283158: beeb2ab = 158: 1d23c04 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
159: 904f205 = 159: ed5b862 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
160: d2be57f = 160: 9489334 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
161: 9773339 = 161: eecad78 Merge branch 'nano-server'
162: 7d775cd = 162: 4726480 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
163: 7028b3e = 163: 5a5e0f8 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
164: 786776e = 164: 16e21ed common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
165: fdd52e2 = 165: aaa1b08 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
166: 3a3b6c5 = 166: 1cc2226 Merge branch 'Fix-i686-build-with-GCC-v14'
167: 207a5ac = 167: 6d21597 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
168: 1743240 = 168: 9d74c7a Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
169: 9f19705 = 169: c9df1e7 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
170: 8592ddc = 170: 28cbb90 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
171: 4e939b6 = 171: c3b0644 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
172: 4d3ce0a = 172: 9f2edc3 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
173: 9c74ca5 = 173: c049835 Merge branch 'reftable-vs-custom-allocators'
174: d715005 = 174: af5ea27 Merge branch 'check-whitespace-only-downstream'
175: 3178a3e = 175: 1460a74 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)
176: ff98ef9 = 176: 43d02bf Merge branch 'disallow-ntlm-auth-by-default'
177: 142b855 = 177: 56ea066 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)178: bc97836 = 178: d819e67 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
179: 107ff96 = 179: 90290cd Merge branch 'ready-for-upstream'
180: 4d76897 = 180: 4799c03 ci(macos): skip the
git p4tests181: 79078f7 = 181: 19f5b36 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)182: 49e8016 = 182: 99e8156 git-gui--askyesno: fix funny text wrapping
183: 705884a = 183: 58dc46d git-gui--askyesno (mingw): use Git for Windows' icon, if available
184: d4662ce = 184: b46960e Win32: make FILETIME conversion functions public
185: 0f59f7b = 185: c70fe70 Win32: dirent.c: Move opendir down
186: 86e6b1e = 186: c9dc087 mingw: make the dirent implementation pluggable
187: b0040c4 = 187: 02c78a7 Win32: make the lstat implementation pluggable
188: 016c6ff = 188: a8bafa9 mingw: add infrastructure for read-only file system level caches
189: 377c024 = 189: 7f231dc mingw: add a cache below mingw's lstat and dirent implementations
190: fe96adb = 190: 4a2d2bf fscache: load directories only once
191: e5b225c = 191: 3a67755 fscache: add key for GIT_TRACE_FSCACHE
192: 14e4ddb = 192: cb63a6d fscache: remember not-found directories
193: 390f014 = 193: f3571f6 fscache: add a test for the dir-not-found optimization
194: 231b36f = 194: ea53c85 add: use preload-index and fscache for performance
195: 749cf24 = 195: 46df09e dir.c: make add_excludes aware of fscache during status
196: 8d6104a = 196: 21c2018 fscache: make fscache_enabled() public
197: 8f98571 = 197: 7d7dbcf dir.c: regression fix for add_excludes with fscache
198: 5baa1c2 = 198: c44c004 fetch-pack.c: enable fscache for stats under .git/objects
199: 2dc76fb = 199: 3edc740 checkout.c: enable fscache for checkout again
200: cd3fba8 = 200: 0978003 Enable the filesystem cache (fscache) in refresh_index().
201: bc11741 = 201: 01c859d fscache: use FindFirstFileExW to avoid retrieving the short name
202: 2cebb7e = 202: 18cd0df fscache: add GIT_TEST_FSCACHE support
203: 18650fc = 203: 3bb9b49 fscache: add fscache hit statistics
204: 0e7a8c9 = 204: 3839041 unpack-trees: enable fscache for sparse-checkout
205: 99e3c87 = 205: f49969f status: disable and free fscache at the end of the status command
206: e29e34d = 206: cdb729f mem_pool: add GIT_TRACE_MEMPOOL support
207: b390ab4 = 207: 8a569b7 fscache: fscache takes an initial size
208: ae2f9fe = 208: 73a8b26 fscache: update fscache to be thread specific instead of global
209: 5253839 = 209: 8cb5428 fscache: teach fscache to use mempool
210: 313b18a = 210: 3ca5245 fscache: make fscache_enable() thread safe
211: d236b91 = 211: ecfe708 fscache: teach fscache to use NtQueryDirectoryFile
212: 4dacc5f = 212: a8e6648 fscache: remember the reparse tag for each entry
213: 31651fa = 213: 0d01a18 Merge branch 'fscache'
214: e8f432b = 214: c85b94d fscache: implement an FSCache-aware is_mount_point()
215: 05aa9b0 = 215: 03dbc20 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
216: 4c90277 = 216: 84cb00a clean: make use of FSCache
217: c3ef528 = 217: 12bb8bd Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
218: 412138a = 218: d6ef746 Merge branch 'dont-clean-junctions-fscache'
219: f0229e8 = 219: 39990bd pack-objects (mingw): demonstrate a segmentation fault with large deltas
220: 450dfcc = 220: 89b037f mingw: support long paths
221: 3c44a69 = 221: f8963b7 win32(long path support): leave drive-less absolute paths intact
222: 51466c0 = 222: 63d9b34 compat/fsmonitor/fsm-*-win32: support long paths
223: 0844acc = 223: dcde79b clean: suggest using
core.longPathsif paths are too long to remove224: 82c6676 = 224: dd5d1cd mingw: Support
git_terminal_promptwith more terminals225: 94bc08e = 225: fc0973d compat/terminal.c: only use the Windows console if bash 'read -r' fails
226: e7c129f = 226: 314d9fe mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
227: ffcf71b = 227: e8aebea Win32: symlink: move phantom symlink creation to a separate function
228: 77e504a = 228: fe5df79 Introduce helper to create symlinks that knows about index_state
229: 2ad207d = 229: 43b4166 mingw: allow to specify the symlink type in .gitattributes
233: 6ceb7d9 = 230: 7226d14 mingw: introduce code to detect whether we're inside a Windows container
230: 23a9e49 = 231: 31279ea Win32: symlink: add test for
symlinkattribute235: 849baf7 = 232: b46cb1a mingw: when running in a Windows container, try to rename() harder
231: d80fb56 = 233: 3d69d70 mingw: explicitly specify with which cmd to prefix the cmdline
237: 502830c = 234: cd94dfd mingw: move the file_attr_to_st_mode() function definition
232: 6c912d1 = 235: c664eb4 mingw: when path_lookup() failed, try BusyBox
239: f57024f = 236: 172e324 mingw: Windows Docker volumes are not symbolic links
234: e08e004 = 237: 1b8eb05 test-tool: learn to act as a drop-in replacement for
iconv241: 594fe9e = 238: 666ec2d Merge branch 'git-gui-askyesno'
242: 1a1007e = 239: a46c2a7 mingw: work around rename() failing on a read-only file
236: ce1c4e2 = 240: f0c6b03 tests(mingw): if
iconvis unavailable, usetest-helper --iconv238: 9bc52f4 = 241: 42efb60 gitattributes: mark .png files as binary
240: 6329375 = 242: 629fbef tests: move test PNGs into t/lib-diff/
243: 92348c9 = 243: d4a82ff tests: only override sort & find if there are usable ones in /usr/bin/
244: 9e72232 = 244: d3d2ee3 tests: use the correct path separator with BusyBox
245: 351142f = 245: 77cf6b9 mingw: only use Bash-ism
builtin pwd -Wwhen available246: d69207d = 246: ec5783a tests (mingw): remove Bash-specific pwd option
247: 8ea2a3b = 247: 4b687aa test-lib: add BUSYBOX prerequisite
257: 3bb848a = 248: e72e5df Merge branch 'gitk-and-git-gui-patches'
249: aeed09d = 249: 017af20 t5003: use binary file from t/lib-diff/
262: c661c19 = 250: aa34636 Merge branch 'long-paths'
251: d51e803 = 251: 3ebabe9 t5532: workaround for BusyBox on Windows
270: c5afcbb = 252: 62fd6db Merge branch 'msys2'
253: 7a93d1b = 253: 3991b9b t5605: special-case hardlink test for BusyBox-w32
271: 310a60a = 254: 7db282e Merge 'docker-volumes-are-no-symlinks'
248: 0df745c = 255: 11ca29e Describe Git for Windows' architecture [no ci]
255: acc189a = 256: cf6ae9a t5813: allow for $PWD to be a Windows path
272: 6b10a54 = 257: 672a83f mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
250: f4eb7df = 258: f207d8c Modify the Code of Conduct for Git for Windows
258: bb52839 = 259: c22ee51 t9200: skip tests when $PWD contains a colon
273: abbc841 = 260: e8ab248 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
252: cf5e93f = 261: 84db86b CONTRIBUTING.md: add guide for first-time contributors
259: 7fe348d = 262: 03709fc mingw: kill child processes in a gentler way
263: cc8425e = 263: d386f10 mingw: optionally enable wsl compability file mode bits
274: 24ccda0 = 264: b919faa Merge branch 'busybox-w32'
254: 5f959b9 = 265: d335e70 README.md: Add a Windows-specific preamble
264: 15812eb = 266: b515765 mingw: really handle SIGINT
275: 79ae362 = 267: 057700c Merge branch 'wsl-file-mode-bits'
256: 9706276 = 268: 3770a04 Add an issue template
265: ce9879b = 269: 2fac5ae Partially un-revert "editor: save and reset terminal after calling EDITOR"
276: ce63863 = 270: 4d76fbd Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
260: 2e8a864 = 271: c14277f Add a GitHub workflow to monitor component updates
261: 0de8e5c = 272: 42a6032 Modify the GitHub Pull Request template (to reflect Git for Windows)
266: b323ddb = 273: 4d93659 reset: reinstate support for the deprecated --stdin option
277: a6edfa6 = 274: d4badbe Merge branch 'un-revert-editor-save-and-reset'
267: bd6c06e = 275: f45adea fsmonitor: reintroduce core.useBuiltinFSMonitor
268: e6f0b91 = 276: b01288b dependabot: help keeping GitHub Actions versions up to date
269: f1b4b1d = 277: a898bbb SECURITY.md: document Git for Windows' policies
278: 8bbb985 = 278: 2f7677f Merge branch 'phase-out-reset-stdin'
279: 502ef22 = 279: 129f489 Merge branch 'deprecate-core.useBuiltinFSMonitor'
280: 11ed7f4 = 280: 1d6a863 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
281: 4d1d893 = 281: e48e716 Merge 'readme' into HEAD
282: 27dec29 = 282: e653c9e build(deps): bump actions/cache from 4 to 5 (build(deps): bump actions/cache from 4 to 5 git#6004)