Rebase shears/main (#23968805475)#92
Open
gitforwindowshelper[bot] wants to merge 286 commits intobase/shears/main-23968805475from
Open
Rebase shears/main (#23968805475)#92gitforwindowshelper[bot] wants to merge 286 commits intobase/shears/main-23968805475from
gitforwindowshelper[bot] wants to merge 286 commits intobase/shears/main-23968805475from
Conversation
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>
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>
This is no longer true in general, not with supporting Clang out of the box. 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 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>
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>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib` rather than `libexpat.lib`. It appears that the `vcpkg` package for "libexpat" has changed and now creates `libexpatd.lib` for debug mode builds. Previously, both debug and release builds created a ".lib" with the same basename. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
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>
In bf2d5d8 (Don't let ld strip relocations, 2016-01-16) (picked from git-for-windows@6a237925bf10), Git for Windows introduced the `-Wl,-pic-executable` flag, specifying the exact entry point via `-e`. This required discerning between i686 and x86_64 code because the former required the symbol to be prefixed with an underscore, the latter did not. As per https://sourceware.org/bugzilla/show_bug.cgi?id=10865, the specified symbols are already the default, though. So let's drop the overly-specific definition. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
At the moment, nothing is obvious about the reason for the use of the
path-walk API, but this will become more prevelant in future iterations. For
now, use the path-walk API to sum up the counts of each kind of object.
For example, this is the reachable object summary output for my local repo:
REACHABLE OBJECT SUMMARY
========================
Object Type | Count
------------+-------
Tags | 1343
Commits | 179344
Trees | 314350
Blobs | 184030
Signed-off-by: Derrick Stolee <stolee@gmail.com>
MSYS2 already defines a couple of helpful environment variables, and we can use those to infer the installation location as well as the CPU. No need for hard-coding ;-) 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>
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>
This is a companion patch of 3b9b2c2 (compat/posix: introduce writev(3p) wrapper, 2026-03-13) where support for using the `writev()` wrapper was introduced in the `Makefile` and the Meson-based build, but the CMake build still needs that treatment, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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: main
From: a2409caf40 (cmake: use writev(3p) wrapper as needed, 2026-04-02) (0935e6b916..a2409caf40)
To: 0ed8985fdc (cmake: use writev(3p) wrapper as needed, 2026-04-02) (5f0c62ce5c..0ed8985fdc)
Statistics
Range-diff (click to expand)
1: 2154d0a = 1: 1bf14b7 sideband: mask control characters
2: d186bc6 = 2: 440c721 sideband: introduce an "escape hatch" to allow control characters
3: 9d166b3 = 3: ec7482f sideband: do allow ANSI color sequences by default
4: 15c8fd4 = 4: 2a365a0 unix-socket: avoid leak when initialization fails
5: e96c1e2 = 5: 92d9859 Merge branch 'disallow-control-characters-in-sideband-channel'
6: d49c638 = 6: dfceeda grep: prevent
^$false match at end of file7: fe9339f = 7: 0220124 Merge branch 'fixes-from-the-git-mailing-list'
18: 4bc74bc = 8: a05ef0a vcpkg_install: detect lack of Git
19: c9074e6 = 9: cbf9482 vcpkg_install: add comment regarding slow network connections
20: de736f0 = 10: 1c556bc vcbuild: install ARM64 dependencies when building ARM64 binaries
21: 6cca6ac = 11: 91d8726 vcbuild: add an option to install individual 'features'
23: b1a327f = 12: 5fe1c5e cmake: allow building for Windows/ARM64
9: 75f06ce = 13: 5e3729b mingw: include the Python parts in the build
25: b4ba157 = 14: fed45d0 ci(vs-build) also build Windows/ARM64 artifacts
11: 093ead6 = 15: aa47171 win32/pthread: avoid name clashes with winpthread
27: ca6b1b5 = 16: afc76ed Add schannel to curl installation
14: 3e55b87 = 17: 00fa75b git-compat-util: avoid redeclaring _DEFAULT_SOURCE
30: f694d3f = 18: 016663c cmake(): allow setting HOST_CPU for cross-compilation
22: 29148e6 = 19: 5582efc Import the source code of mimalloc v2.2.7
8: c20522a = 20: 211b363 t9350: point out that refs are not updated correctly
33: c8c4a3c = 21: 37310aa CMake: default Visual Studio generator has changed
24: c3db639 = 22: 5cac4ea mimalloc: adjust for building inside Git
28: 1693b48 = 23: 26e9b52 hash-object: demonstrate a >4GB/LLP64 problem
10: b57926d = 24: 79b65b4 transport-helper: add trailing --
36: 73e83d8 = 25: 0e0ee83 mingw: demonstrate a
git addissue with NTFS junctions37: abd1841 = 26: a73c7c0 .gitignore: add Visual Studio CMakeSetting.json file
26: 57b530f = 27: f95cf83 mimalloc: offer a build-time option to enable it
40: 7d67e5b = 28: 86bba95 t5505/t5516: allow running without
.git/branches/in the templates31: 3ca1ffe = 29: 6dd5594 object-file.c: use size_t for header lengths
12: db17357 = 30: 098110c remote-helper: check helper status after import/export
13: 04a62e9 = 31: 3a75097 clean: do not traverse mount points
41: 7734d49 = 32: c732835 strbuf_realpath(): use platform-dependent API if available
42: 186e2ba = 33: b3cfd46 http: use new "best effort" strategy for Secure Channel revoke checking
43: 2b822df = 34: 40930b6 subtree: update
contrib/subtreetesttarget44: 32d7da5 = 35: 7c7b7a7 CMakeLists: add default "x64-windows" arch for Visual Studio
29: 2b63ddb = 36: b088b36 mingw: use mimalloc
49: f2fada8 = 37: 1b887d8 t5505/t5516: fix white-space around redirectors
34: f52613d = 38: 8a3efeb hash algorithms: use size_t for section lengths
15: 2b3b7d9 = 39: c25c3ac Always auto-gc after calling a fast-import transport
16: 6329629 = 40: bc018a8 mingw: prevent regressions with "drive-less" absolute paths
17: 1884c17 = 41: 3e2e7aa clean: remove mount points when possible
51: aab9a97 = 42: c8124ac transport: optionally disable side-band-64k
52: 8af6d23 = 43: 11df52f mingw: fix fatal error working on mapped network drives on Windows
53: c16707e = 44: da67904 clink.pl: fix MSVC compile script to handle libcurl-d.lib
54: f84cf3c = 45: 46461cb mingw: implement a platform-specific
strbuf_realpath()55: 226a3b1 = 46: 2ca31a7 t3701: verify that we can add lots of files interactively
56: d141ce6 = 47: ec70c55 commit: accept "scissors" with CR/LF line endings
57: a0ca887 = 48: be76109 t0014: fix indentation
58: 5a51831 = 49: b0ed47a git-gui: accommodate for intent-to-add files
59: 6cd8178 = 50: 04a1b0d mingw: allow for longer paths in
parse_interpreter()60: 0663d55 = 51: 988142e compat/vcbuild: document preferred way to build in Visual Studio
61: bd1349e = 52: 59ef892 http: optionally send SSL client certificate
62: 1114dda = 53: 0390cb6 ci: run
contrib/subtreetests in CI builds63: 84f5ad0 = 54: 23678cd CMake: show Win32 and Generator_platform build-option values
32: a6e1fb6 = 55: ab9cb76 windows: skip linking
git-<command>for built-ins35: 58638af = 56: 65d9d79 mingw: stop hard-coding
CC = gcc39: 352998e = 57: 5eac691 mingw: drop the -D_USE_32BIT_TIME_T option
48: d394ccb = 58: bd719c3 mingw: only use -Wl,--large-address-aware for 32-bit builds
71: 996949b = 59: afb1732 mingw: avoid over-specifying
--pic-executable72: 51b47a5 = 60: 3b433b6 mingw: set the prefix and HOST_CPU as per MSYS2's settings
73: 0b35dfd = 61: 81c511f mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
74: 6a98acb = 62: 08148d7 mingw: rely on MSYS2's metadata instead of hard-coding it
75: 4bc7157 = 63: 569d490 mingw: always define
ETC_*for MSYS2 environments76: c371aa5 = 64: 8959a92 max_tree_depth: lower it for clang builds in general on Windows
77: 2cc72a3 = 65: b58a045 mingw: ensure valid CTYPE
79: d1b060c = 66: 9ecbafd mingw: allow
git.exeto be used instead of the "Git wrapper"78: 37481c7 = 67: 200db7a ci: work around a problem with HTTP/2 vs libcurl v8.10.0
81: 71be58f = 68: 9cbcb51 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
80: 7430763 = 69: b769ff8 revision: create mark_trees_uninteresting_dense()
83: 2d8d785 = 70: f958cdb Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
82: ccf0ff1 ! 71: 0658817 survey: stub in new experimental 'git-survey' command
@@ builtin/survey.c (new) + +#include "builtin.h" +#include "config.h" ++#include "environment.h" +#include "parse-options.h" + +static const char * const survey_usage[] = {85: 0e88248 = 72: 370d10a clink.pl: fix libexpatd.lib link error when using MSVC
84: fe1aa57 ! 73: 7d17d2b survey: add command line opts to select references
87: bf51dfb = 74: 9ec2a47 Makefile: clean up .ilk files when MSVC=1
86: a2f22b2 = 75: 0c3a6dd survey: start pretty printing data in table form
90: 85c6c51 = 76: e4226cb vcbuild: add support for compiling Windows resource files
88: 30915bf ! 77: ca948dc survey: add object count summary
93: 6b1ba35 = 78: e17d5c3 config.mak.uname: add git.rc to MSVC builds
50: d022639 = 79: b05cd36 MinGW: link as terminal server aware
91: d2fd20c = 80: ca5a44d survey: summarize total sizes by object type
97: fd78e15 = 81: 359d807 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
98: fb88cb8 = 82: 7e1bd53 http: optionally load libcurl lazily
38: ce63dfd = 83: f6582a3 hash-object --stdin: verify that it works with >4GB/LLP64
94: 2e55e94 = 84: c7730d0 survey: show progress during object walk
102: 33cc42d = 85: 2052ca7 clink.pl: move default linker options for MSVC=1 builds
103: 8df8897 = 86: 5c52089 http: support lazy-loading libcurl also on Windows
45: d361762 = 87: ca567d4 hash-object: add another >4GB/LLP64 test case
46: c36f40c = 88: d9fee55 setup: properly use "%(prefix)/" when in WSL
99: 801e3b2 = 89: d98e49e survey: add ability to track prioritized lists
47: 0319277 = 90: 9b9da07 Add config option
windows.appendAtomically107: 90e8794 = 91: e3bfde5 cmake: install headless-git.
108: 0232c31 = 92: d11d45f http: when loading libcurl lazily, allow for multiple SSL backends
64: 9caab70 = 93: dba0734 hash-object: add a >4GB/LLP64 test case using filtered input
65: 3eaeb3e = 94: 2366c5b compat/mingw.c: do not warn when failing to get owner
104: 1125e00 = 95: c520561 survey: add report of "largest" paths
66: e4e29c4 = 96: a55de19 mingw: $env:TERM="xterm-256color" for newer OSes
67: 47cd6c3 = 97: ddf09dd winansi: check result and Buffer before using Name
68: e8978b7 = 98: 89e3e02 mingw: change core.fsyncObjectFiles = 1 by default
69: 207da7a = 99: d1b98ce Fix Windows version resources
70: 9f544dc = 100: bbb705a status: fix for old-style submodules with commondir
112: 6be40a1 = 101: 8565f91 git.rc: include winuser.h
113: db8f006 = 102: 364ace1 mingw: do load libcurl dynamically by default
114: 0f48df3 = 103: 74a9425 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
115: 39f42f8 = 104: e9b0774 mingw: suggest
windows.appendAtomicallyin more cases116: 4aad375 = 105: 1be2204 win32: use native ANSI sequence processing, if possible
117: 15054b9 = 106: 295fc4a common-main.c: fflush stdout buffer upon exit
118: 11e2673 = 107: 93dc7ae t5601/t7406(mingw): do run tests with symlink support
119: bb5cb57 = 108: 785f90c win32: ensure that
localtime_r()is declared even in i686 builds120: 3648dfd = 109: 2240f9e Fallback to AppData if XDG_CONFIG_HOME is unset
121: 420e796 = 110: a114ffc run-command: be helpful with Git LFS fails on Windows 7
89: 7d442d5 = 111: 2389e1f Merge 'remote-hg-prerequisites' into HEAD
92: 27ac62c = 112: 4afb097 Merge branch 'drive-prefix'
96: c99e60c = 113: 1d353f0 Merge branch 'dont-clean-junctions'
101: 2a378bc = 114: 472de00 Merge branch 'msys2-python'
106: 9b23cfc = 115: fc39fb0 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
111: c75b5ef = 116: 13e8810 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
127: 283d58a = 117: 13fb516 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
128: a74b000 = 118: 65d8db9 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
129: 8546191 = 119: ef7aa29 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction130: 1fa15cb = 120: 66b7fd0 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
131: f219e64 = 121: 3a9aa82 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
132: 5dc3886 = 122: bc9e82f Merge 'add-p-many-files'
133: 0437b65 = 123: be580f8 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
134: 8b17bd1 = 124: fc52408 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
135: f8c88c0 = 125: d5e1ad7 Merge 'git-gui/js/intent-to-add'
136: 8753484 = 126: 857583b Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
137: e37951c = 127: a4f6f40 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
138: 9859fe3 = 128: f178ac1 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
139: 6355280 = 129: 7d88f19 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path140: 2576f5b = 130: ee36af9 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
141: c6e95f0 = 131: 64ea10d Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
142: 16ed8ab = 132: 841fe5f Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests95: d410cae = 133: bc23c58 mingw: make sure
errnois set correctly when socket operations fail143: dc6bcc7 = 134: 3a74614 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
100: e5bb4e6 = 135: 14befce compat/mingw: handle WSA errors in strerror
279: 6c29d74 ! 136: 24fdc0a Merge branch 'disallow-ntlm-auth-by-default'
144: 9663f2d = 137: 00563d5 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t105: 28159f5 = 138: ce84a3f compat/mingw: drop outdated comment
-: ---------- > 139: 5367ad6 http: disallow NTLM authentication by default
145: 1e4bc80 = 140: bdab976 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory109: 99c3ca1 = 141: df99063 survey: add --top= option and config
110: 735a2af = 142: 80e2b4e t0301: actually test credential-cache on Windows
-: ---------- > 143: 5d75505 http: warn if might have failed because of NTLM
146: ef10d72 = 144: 74989b6 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
122: b52dccc = 145: ffc21fd survey: clearly note the experimental nature in the output
123: bc24d83 = 146: 1b1bf63 credential-cache: handle ECONNREFUSED gracefully
124: a5fb0b3 < -: ---------- reftable: do make sure to use custom allocators
-: ---------- > 147: b1cde77 reftable: do make sure to use custom allocators
125: 775d944 = 148: 992c71a check-whitespace: avoid alerts about upstream commits
126: 5097829 = 149: 0c68c3c t/t5571-prep-push-hook.sh: Add test with writing to stderr
-: ---------- > 150: ef5d909 credential: advertise NTLM suppression and allow helpers to re-enable
-: ---------- > 151: 6691c23 mingw: use strftime() directly in UCRT builds
286: 90176b1 = 152: 6d426e5 dir: do not traverse mount points
147: 52be839 = 153: a2c401b Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
148: e4a0cd8 = 154: f3f8647 Merge branch 'optionally-dont-append-atomically-on-windows'
149: d7e02f3 = 155: 19d01a1 Merge branch 'fsync-object-files-always'
150: 28b0455 = 156: 5d7db53 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
151: 7809c23 = 157: 94a0142 Fix Windows version resources (Fix Windows version resources git#4092)
152: 8e55cdf = 158: 8a791fd Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
153: 1540fb9 = 159: 134b582 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)154: 557a350 = 160: b50ff99 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)155: 50d9aed = 161: 66b8534 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283156: 0f00409 = 162: 00557b0 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
157: e777433 = 163: 5286c73 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
158: 4a4052a = 164: 791c26a Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
159: a95be67 = 165: cdd0b05 Merge branch 'nano-server'
160: 146129f = 166: c1c7561 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
161: 059f840 = 167: de7f195 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
162: 07f065b = 168: 06d6824 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
163: a8aa9b5 = 169: 2e791e4 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
164: c8e634d = 170: 503c3fc Merge branch 'Fix-i686-build-with-GCC-v14'
165: ed30cd3 = 171: f4f921f Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
166: 32d749e = 172: 08d7393 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
167: 303e1cd = 173: 8300da4 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
168: fd49ee7 = 174: 2eae5e2 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
169: 1a1277f = 175: 6b1ef1d Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
170: 3192156 = 176: 49fbb97 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
171: 889b9dc = 177: d1e108e Merge branch 'reftable-vs-custom-allocators'
172: 5c8e7fc = 178: ed642d1 Merge branch 'check-whitespace-only-downstream'
173: f22e7a8 = 179: 7bd51a2 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)
-: ---------- > 180: 8619ef1 Merge branch 'disallow-ntlm-auth-by-default'
-: ---------- > 181: 23db48c mingw: use strftime() directly in UCRT builds (mingw: use strftime() directly in UCRT builds git#6130)
287: 81cfb41 = 182: d6b76b0 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)174: 21ede64 = 183: 8f53ffa Merge branch 'ready-for-upstream'
175: 4479ac2 < -: ---------- git-svn: mark it as unsupported by the Git for Windows project
176: fb5033d = 184: d0c5fc5 ci(macos): skip the
git p4tests177: 7c66bd4 < -: ---------- git-svn: mark it as unsupported by the Git for Windows project (git-svn: mark it as unsupported by the Git for Windows project git#5923)
178: c37acc8 = 185: 4f6d793 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)179: e6917da = 186: 7fb5869 Win32: make FILETIME conversion functions public
180: 3351a3b = 187: fe16864 Win32: dirent.c: Move opendir down
186: 81ff99a = 188: bd0061b git-gui--askyesno: fix funny text wrapping
181: 6ff85e4 = 189: 4981b87 mingw: make the dirent implementation pluggable
188: 3384766 = 190: 51d7f98 git-gui--askyesno (mingw): use Git for Windows' icon, if available
182: 930d43f = 191: e86ddb0 Win32: make the lstat implementation pluggable
190: a418b11 = 192: be240f1 Merge branch 'git-gui-askyesno'
183: c28e1c4 = 193: 325502f mingw: add infrastructure for read-only file system level caches
184: d5035fe ! 194: 77103f4 mingw: add a cache below mingw's lstat and dirent implementations
185: 074c9a7 = 195: 1f9d534 fscache: load directories only once
187: 67751a9 = 196: cbfc7a5 fscache: add key for GIT_TRACE_FSCACHE
189: 4b5bee4 = 197: c556da1 fscache: remember not-found directories
191: 670d4f1 = 198: 01ed7d4 fscache: add a test for the dir-not-found optimization
192: 67f66fa = 199: 1cc31c1 add: use preload-index and fscache for performance
193: 03b4636 ! 200: 004ff76 dir.c: make add_excludes aware of fscache during status
194: 6af5dcf ! 201: 92efc64 fscache: make fscache_enabled() public
195: 014ba27 = 202: 1a29265 dir.c: regression fix for add_excludes with fscache
196: db564a5 = 203: f0b976c fetch-pack.c: enable fscache for stats under .git/objects
197: 965225d = 204: 73c9052 checkout.c: enable fscache for checkout again
198: 7071edd = 205: 181a02f Enable the filesystem cache (fscache) in refresh_index().
199: 854de71 = 206: 588931f fscache: use FindFirstFileExW to avoid retrieving the short name
200: b13202c = 207: f287f53 fscache: add GIT_TEST_FSCACHE support
201: 116b1f1 = 208: 20f9512 fscache: add fscache hit statistics
202: 99b1ed4 ! 209: 22000a2 unpack-trees: enable fscache for sparse-checkout
203: 5601047 = 210: 90db9de status: disable and free fscache at the end of the status command
204: ffca416 = 211: c5f81ea mem_pool: add GIT_TRACE_MEMPOOL support
205: ca80ba4 ! 212: e077965 fscache: fscache takes an initial size
206: 98fc9d5 = 213: 7ac0aaf fscache: update fscache to be thread specific instead of global
207: 81ac682 ! 214: d68b2c1 fscache: teach fscache to use mempool
208: a8788b4 = 215: 523a1b2 fscache: make fscache_enable() thread safe
209: d28e59c ! 216: 253a459 fscache: teach fscache to use NtQueryDirectoryFile
210: a6a873c = 217: eb1d45d fscache: remember the reparse tag for each entry
211: d832b89 = 218: 66010d7 Merge branch 'fscache'
212: 02de0a9 = 219: 656a567 fscache: implement an FSCache-aware is_mount_point()
213: 8daa441 = 220: 608fb3d Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
214: bdc58cd = 221: 08850b8 clean: make use of FSCache
215: bff2fee = 222: 50fb3bd Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
216: e7bf4a3 = 223: c5f3700 Merge branch 'dont-clean-junctions-fscache'
217: 2a1508d = 224: e7b8ced pack-objects (mingw): demonstrate a segmentation fault with large deltas
218: 2611757 ! 225: 951bb08 mingw: support long paths
219: 555b1d6 = 226: b020ac4 win32(long path support): leave drive-less absolute paths intact
220: c85a240 = 227: 648d554 compat/fsmonitor/fsm-*-win32: support long paths
221: 0ae46e3 = 228: c7d76be clean: suggest using
core.longPathsif paths are too long to remove222: 6fb26d0 = 229: e31c493 mingw: Support
git_terminal_promptwith more terminals223: eadf0cf = 230: 0098e3d compat/terminal.c: only use the Windows console if bash 'read -r' fails
224: 45c3497 = 231: fab498a mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
225: b29629a = 232: 7f95b37 Win32: symlink: move phantom symlink creation to a separate function
226: 2acc53f = 233: 9f9d696 Introduce helper to create symlinks that knows about index_state
227: 72df00c = 234: b7b2447 mingw: allow to specify the symlink type in .gitattributes
228: 82b5285 = 235: 2a98779 Win32: symlink: add test for
symlinkattribute229: fad3a4f = 236: cbd87fd mingw: explicitly specify with which cmd to prefix the cmdline
230: 3cd6990 = 237: aef1955 mingw: when path_lookup() failed, try BusyBox
231: 92d14e8 = 238: 1653af4 test-tool: learn to act as a drop-in replacement for
iconv232: 1fb09d0 = 239: 1741278 tests(mingw): if
iconvis unavailable, usetest-helper --iconv233: d828185 = 240: 8bfa4bf gitattributes: mark .png files as binary
239: 5daaa4e = 241: 3c6cf78 mingw: introduce code to detect whether we're inside a Windows container
234: 0f2509f = 242: 549e06f tests: move test PNGs into t/lib-diff/
241: 0f39299 ! 243: 813c1b6 mingw: when running in a Windows container, try to rename() harder
@@ compat/mingw.c: int mingw_rename(const char *pold, const char *pnew) + if (gle == ERROR_ACCESS_DENIED && is_inside_windows_container()) { + /* Fall back to copy to destination & remove source */ -+ if (CopyFileW(wpold, wpnew, FALSE) && !mingw_unlink(pold)) ++ if (CopyFileW(wpold, wpnew, FALSE) && !mingw_unlink(pold, 1)) + return 0; + gle = GetLastError(); + }235: d2b7237 = 244: 96aaf84 tests: only override sort & find if there are usable ones in /usr/bin/
243: f687771 = 245: 9a3230c mingw: move the file_attr_to_st_mode() function definition
236: 81c8e77 = 246: fbb3f40 tests: use the correct path separator with BusyBox
245: d15f606 ! 247: 31b78cf mingw: Windows Docker volumes are not symbolic links
237: 299b11c = 248: e213036 mingw: only use Bash-ism
builtin pwd -Wwhen available247: d70cefc ! 249: 3e345cd mingw: work around rename() failing on a read-only file
@@ compat/mingw.c: int mingw_rename(const char *pold, const char *pnew) - if (gle == ERROR_ACCESS_DENIED && is_inside_windows_container()) { - /* Fall back to copy to destination & remove source */ -- if (CopyFileW(wpold, wpnew, FALSE) && !mingw_unlink(pold)) +- if (CopyFileW(wpold, wpnew, FALSE) && !mingw_unlink(pold, 1)) - return 0; - gle = GetLastError(); + if (gle == ERROR_ACCESS_DENIED) {238: 5e8f8a0 = 250: c1c6d0d tests (mingw): remove Bash-specific pwd option
240: 2ef0e1a = 251: 930f195 test-lib: add BUSYBOX prerequisite
248: 90944ed = 252: 7821917 Merge branch 'gitk-and-git-gui-patches'
242: c55479c = 253: 276e42e t5003: use binary file from t/lib-diff/
249: 2a96dc9 = 254: cd345a7 Merge branch 'long-paths'
244: 60bcf0d = 255: 0ca6289 t5532: workaround for BusyBox on Windows
250: c3a5c8d = 256: caf81ee Merge branch 'msys2'
246: 6b21b04 = 257: baa3181 t5605: special-case hardlink test for BusyBox-w32
251: 5cb0743 = 258: a22eed3 Merge 'docker-volumes-are-no-symlinks'
252: ddb8290 = 259: c701865 t5813: allow for $PWD to be a Windows path
253: 9998d1e = 260: 6c1be2e mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
254: 0ff3b1d = 261: 5efefa8 t9200: skip tests when $PWD contains a colon
255: 5f50bce = 262: 97dad00 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
256: c828ba7 = 263: 2806137 Describe Git for Windows' architecture [no ci]
257: e3a1d4a = 264: a6c7b97 mingw: kill child processes in a gentler way
258: e50a822 = 265: ddd6128 mingw: optionally enable wsl compability file mode bits
259: 01e69db = 266: 49dc996 Merge branch 'busybox-w32'
260: 9acc816 = 267: 69ed7c5 Modify the Code of Conduct for Git for Windows
261: 6ab1758 = 268: e43349e mingw: really handle SIGINT
262: 848aadd = 269: 679668d Merge branch 'wsl-file-mode-bits'
263: 9e8827f = 270: 864895c CONTRIBUTING.md: add guide for first-time contributors
264: 7be891d = 271: 8ea2249 Partially un-revert "editor: save and reset terminal after calling EDITOR"
265: daf49d5 = 272: 5fafb9d Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
266: be6d9c7 = 273: 271a25a README.md: Add a Windows-specific preamble
267: 36388cc = 274: d36c88e reset: reinstate support for the deprecated --stdin option
268: 9789163 = 275: cf4554e Merge branch 'un-revert-editor-save-and-reset'
269: 8c6c119 = 276: c9d2da1 Add an issue template
270: 782e404 = 277: 9e37847 Add a GitHub workflow to monitor component updates
271: 314ebcc = 278: ad65c05 fsmonitor: reintroduce core.useBuiltinFSMonitor
272: b7384be = 279: 6d46843 Merge branch 'phase-out-reset-stdin'
273: f5e2f0f = 280: 6a3509c Modify the GitHub Pull Request template (to reflect Git for Windows)
274: 7aed7ac = 281: 59b0dfd dependabot: help keeping GitHub Actions versions up to date
275: 1163ac5 = 282: 62d3438 Merge branch 'deprecate-core.useBuiltinFSMonitor'
276: 6f82964 = 283: c83bd15 SECURITY.md: document Git for Windows' policies
277: 9c2cdac = 284: 3f0e691 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
278: 752df9a = 285: f561615 Merge 'readme' into HEAD
280: 65a6ef1 < -: ---------- osx-clang: work around Homebrew's clang lacking REG_ENHANCED
281: 9fa7afe < -: ---------- http: fix bug in ntlm_allow=1 handling
282: 68266f0 < -: ---------- http: fix bug in ntlm_allow=1 handling (http: fix bug in ntlm_allow=1 handling git#6136)
283: 2f25634 < -: ---------- fixup! git-svn: mark it as unsupported by the Git for Windows project
284: ff1dd09 < -: ----------
git svn: remove deprecation note (since it is no longer included in Git for Windows, anyway) (git svn: remove deprecation note (since it is no longer included in Git for Windows, anyway) git#6142)285: cd0c27a < -: ---------- mingw: use strftime() directly in UCRT builds (mingw: use strftime() directly in UCRT builds git#6130)
-: ---------- > 286: 0ed8985 cmake: use writev(3p) wrapper as needed