Rebase shears/main: 1 conflict(s) (0 skipped, 1 resolved) (#27423262167)#232
Open
gitforwindowshelper[bot] wants to merge 286 commits into
Open
Rebase shears/main: 1 conflict(s) (0 skipped, 1 resolved) (#27423262167)#232gitforwindowshelper[bot] wants to merge 286 commits into
gitforwindowshelper[bot] wants to merge 286 commits into
Conversation
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>
These fixes have been sent to the Git mailing list but have not been picked up by the Git project yet. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Start work on a new 'git survey' command to scan the repository for monorepo performance and scaling problems. The goal is to measure the various known "dimensions of scale" and serve as a foundation for adding additional measurements as we learn more about Git monorepo scaling problems. The initial goal is to complement the scanning and analysis performed by the GO-based 'git-sizer' (https://github.com/github/git-sizer) tool. It is hoped that by creating a builtin command, we may be able to take advantage of internal Git data structures and code that is not accessible from GO to gain further insight into potential scaling problems. Co-authored-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
This is no longer true in general, not with supporting Clang out of the box. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
By default we will scan all references in "refs/heads/", "refs/tags/" and "refs/remotes/". Add command line opts let the use ask for all refs or a subset of them and to include a detached HEAD. Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When 'git survey' provides information to the user, this will be presented in one of two formats: plaintext and JSON. The JSON implementation will be delayed until the functionality is complete for the plaintext format. The most important parts of the plaintext format are headers specifying the different sections of the report and tables providing concreted data. Create a custom table data structure that allows specifying a list of strings for the row values. When printing the table, check each column for the maximum width so we can create a table of the correct size from the start. The table structure is designed to be flexible to the different kinds of output that will be implemented in future changes. Signed-off-by: Derrick Stolee <stolee@gmail.com>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
While it may seem super convenient to some old Unix hands to simpy require Perl to be available when running the test suite, this is a major hassle on Windows, where we want to verify that Perl is not, actually, required in a NO_PERL build. As a super ugly workaround, we "install" a script into /usr/bin/perl reading like this: #!/bin/sh # We'd much rather avoid requiring Perl altogether when testing # an installed Git. Oh well, that's why we cannot have nice # things. exec c:/git-sdk-64/usr/bin/perl.exe "$@" The problem with that is that BusyBox assumes that the #! line in a script refers to an executable, not to a script. So when it encounters the line #!/usr/bin/perl in t5532's proxy-get-cmd, it barfs. Let's help this situation by simply executing the Perl script with the "interpreter" specified explicitly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When trying to ensure that long paths are handled correctly, we first normalize absolute paths as we encounter them. However, if the path is a so-called "drive-less" absolute path, i.e. if it is relative to the current drive but _does_ start with a directory separator, we would want the normalized path to be such a drive-less absolute path, too. Let's do that, being careful to still include the drive prefix when we need to go through the `\\?\` dance (because there, the drive prefix is absolutely required). This fixes git-for-windows#4586. 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>
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>
Update wchar_t buffers to use MAX_LONG_PATH instead of MAX_PATH and call xutftowcs_long_path() in the Win32 backend source files. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
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>
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>
In this time and age, AI is everywhere. However, it's sometimes not very easy to use. For green-field projects it works quite a bit better than for existing legacy projects. And Git's source code is _quite_ as legacy code as they come... 😁 Now, the only way how AI can be used efficiently with legacy code is by providing enough information by way of prompt context for the AI to have a chance to make any sense of the code. The structure and the architecture is, after all, not designed for AI, but rather the opposite: By virtue of having grown organically over two decades, there is no design that AI coding models would readily grasp. So here is a document that describes all kinds of aspects about this project. The idea is to help AI by providing information that it does not have ingrained in its weights. The idea is to provide information that a human prompter might take for granted, but no coding model will have been trained on specifically. Assisted-by: Claude Opus 4.5 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, git repositories may have extra files which need cleaned (e.g., a build directory) that may be arbitrarily deep. Suggest using `core.longPaths` if such situations are encountered. Fixes: git-for-windows#2715 Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
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>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
These are Git for Windows' Git GUI and gitk patches. We will have to decide at some point what to do about them, but that's a little lower priority (as Git GUI seems to be unmaintained for the time being, and the gitk maintainer keeps a very low profile on the Git mailing list, too). 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>
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>
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>
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>
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>
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 hidden in v2.55.0-rc0's own CI because of an omission in 5ba8291 (ci: enable EXPENSIVE for contributor builds, 2026-05-11) which fails to enable EXPENSIVE tests for tags. Due to 7d78d5f (ci: skip GitHub workflow runs for already-tested commits/trees, 2020-10-08), the CI of `master` is now also mistakenly green because it reuses the tag's CI run to prove that it's solid. This is an evil merge by necessity because `survey.c` needs to adapt to the changed function signatures. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. 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: 7c13083021 (ci: only run the expensive tests in the Windows tests for now, 2026-06-12) (f93873a027..7c13083021)
Resolved: 916bb18 (Merge 'objects-larger-than-4gb-on-windows-pt2', 2026-06-12)
took HEAD side for both conflicts; the functions (read_object_info_from_path, odb_source_loose_new/free, odb_source_loose_read_object_stream) were moved upstream to odb/source-loose.c
Range-diff
1: 916bb18 ! 1: 7343e51 Merge 'objects-larger-than-4gb-on-windows-pt2'
@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> - ## builtin/survey.c ## -@@ builtin/survey.c: static void survey_phase_refs(struct survey_context *ctx) - - ctx->report.refs.refs_nr = ctx->ref_array.nr; - for (int i = 0; i < ctx->ref_array.nr; i++) { -- unsigned long size; -+ size_t size; - struct ref_array_item *item = ctx->ref_array.items[i]; - - switch (item->kind) { -@@ builtin/survey.c: static void increment_totals(struct survey_context *ctx, - for (size_t i = 0; i < oids->nr; i++) { - struct object_info oi = OBJECT_INFO_INIT; - unsigned oi_flags = OBJECT_INFO_FOR_PREFETCH; -- unsigned long object_length = 0; -+ size_t object_length = 0; - off_t disk_sizep = 0; - enum object_type type; - - ## object-file.c ## remerge CONFLICT (content): Merge conflict in object-file.c - index 43827d1237..afab23eda0 100644 + index 6bb128cf84..d5ad88df20 100644 --- object-file.c +++ object-file.c +@@ object-file.c: int parse_loose_header(const char *hdr, struct object_info *oi) + } + + if (oi->sizep) +- *oi->sizep = size; ++ *oi->sizep = cast_size_t_to_ulong(size); + + /* + * The length must be followed by a zero byte @@ object-file.c: int parse_loose_header(const char *hdr, struct object_info *oi) return 0; } --<<<<<<< 08500dd7c4 (Merge 'readme' into HEAD) +-<<<<<<< 3a305c3257 (Merge 'readme' into HEAD) -======= -static int read_object_info_from_path(struct odb_source *source, - const char *path, @@ object-file.c: int parse_loose_header(const char *hdr, struct object_info *oi) static void hash_object_body(const struct git_hash_algo *algo, struct git_hash_ctx *c, const void *buf, size_t len, struct object_id *oid, +@@ object-file.c: int force_object_loose(struct odb_source *source, + struct odb_source_files *files = odb_source_files_downcast(source); + const struct git_hash_algo *compat = source->odb->repo->compat_hash_algo; + void *buf; +- size_t len; ++ unsigned long len; + struct object_info oi = OBJECT_INFO_INIT; + struct object_id compat_oid; + enum object_type type; +@@ object-file.c: int read_loose_object(struct repository *repo, + unsigned long mapsize; + git_zstream stream; + char hdr[MAX_HEADER_LEN]; +- size_t *size = oi->sizep; ++ unsigned long *size = oi->sizep; + + fd = git_open(path); + if (fd >= 0) @@ object-file.c: struct odb_transaction *odb_transaction_files_begin(struct odb_source *source) return &transaction->base; } --<<<<<<< 08500dd7c4 (Merge 'readme' into HEAD) +-<<<<<<< 3a305c3257 (Merge 'readme' into HEAD) -======= - -struct odb_source_loose *odb_source_loose_new(struct odb_source *source) @@ object-file.c: struct odb_transaction *odb_transaction_files_begin(struct odb_so - return -1; -} ->>>>>>> f3aeae983a (odb: use size_t for object_info.sizep and the size APIs) - - ## odb/source-loose.c ## -@@ odb/source-loose.c: static int read_object_info_from_path(struct odb_source_loose *loose, - void *map = NULL; - git_zstream stream, *stream_to_end = NULL; - char hdr[MAX_HEADER_LEN]; -- unsigned long size_scratch; -+ size_t size_scratch; - enum object_type type_scratch; - struct stat st; - -@@ odb/source-loose.c: static int odb_source_loose_read_object_stream(struct odb_read_stream **out, - struct object_info oi = OBJECT_INFO_INIT; - struct odb_loose_read_stream *st; - unsigned long mapsize; -- unsigned long size_ul; - void *mapped; - - mapped = odb_source_loose_map_object(loose, oid, &mapsize); -@@ odb/source-loose.c: static int odb_source_loose_read_object_stream(struct odb_read_stream **out, - * Note: loose objects >4GB would still truncate here, but such - * large loose objects are uncommon (they'd normally be packed). - */ -- oi.sizep = &size_ul; -+ oi.sizep = &st->base.size; - oi.typep = &st->base.type; - - if (parse_loose_header(st->hdr, &oi) < 0 || st->base.type < 0) - goto error; -- st->base.size = size_ul; - - st->mapped = mapped; - st->mapsize = mapsize;To: d4d63234de (ci: only run the expensive tests in the Windows tests for now, 2026-06-12) (d37d7547f0..d4d63234de)
Statistics
Range-diff (click to expand)
1: 97d2c53 = 1: 2832b55 ci(dockerized): reduce the PID limit for private repositories
2: 5d8cf76 = 2: 39f3315 mingw: skip symlink type auto-detection for network share targets
3: 38567e9 = 3: 08c06f0 Merge branch 'fix-ci'
4: 66c5814 = 4: bc4ec8a unix-socket: avoid leak when initialization fails
5: 22bc1ff = 5: 03d4475 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: cc3da5c = 6: 243e5e9 grep: prevent
^$false match at end of file7: 99a0cd5 = 7: e47da76 Merge branch 'v2.53.0.windows.3'
8: 9b12c0a = 8: 13f2687 Merge branch 'fixes-from-the-git-mailing-list'
14: 0ec139a = 9: 4156596 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
15: 6cc3788 = 10: a55ccc8 vcpkg_install: detect lack of Git
16: b3e58a0 = 11: 972a877 vcpkg_install: add comment regarding slow network connections
17: b3c2c62 = 12: 4b2c053 vcbuild: install ARM64 dependencies when building ARM64 binaries
18: 4ff855d = 13: 3fb433a vcbuild: add an option to install individual 'features'
19: 5c89564 = 14: 426a7f2 cmake: allow building for Windows/ARM64
20: 43de4d2 = 15: 40ab0d0 ci(vs-build) also build Windows/ARM64 artifacts
21: 1469de7 = 16: f42dcd1 Add schannel to curl installation
45: c498686 = 17: 0553a82 hash-object: demonstrate a >4GB/LLP64 problem
22: a25a40b = 18: 2cae16b cmake(): allow setting HOST_CPU for cross-compilation
50: 42db5a4 ! 19: e3200e1 object-file.c: use size_t for header lengths
9: 688ac8f = 20: 6974171 t9350: point out that refs are not updated correctly
23: b3a0980 = 21: 5bd5bc8 CMake: default Visual Studio generator has changed
52: 7ddc61f = 22: f518694 hash algorithms: use size_t for section lengths
10: d16318f = 23: 011fd12 transport-helper: add trailing --
24: f20700d = 24: 4bdb266 mingw: demonstrate a
git addissue with NTFS junctions25: a19f9aa = 25: 6904faf .gitignore: add Visual Studio CMakeSetting.json file
54: eef44f4 = 26: 3c43318 hash-object --stdin: verify that it works with >4GB/LLP64
26: a6d0cc9 = 27: 2c77c91 t5505/t5516: allow running without
.git/branches/in the templates11: 4ab2898 = 28: fddc7f3 remote-helper: check helper status after import/export
27: e781ba1 = 29: 05100cc strbuf_realpath(): use platform-dependent API if available
28: e010eb1 = 30: e3cc2ec http: use new "best effort" strategy for Secure Channel revoke checking
29: f1f8c0c = 31: e44c2a5 subtree: update
contrib/subtreetesttarget30: ee9dd58 = 32: 4f1e606 CMakeLists: add default "x64-windows" arch for Visual Studio
56: 14ed8ef = 33: 4954771 hash-object: add another >4GB/LLP64 test case
57: 8ccdb70 = 34: 2d8fa74 setup: properly use "%(prefix)/" when in WSL
58: 33d278a = 35: df25b25 Add config option
windows.appendAtomically31: 029d12c = 36: 07a05e6 mingw: include the Python parts in the build
32: 949f83e = 37: 679bfdd t5505/t5516: fix white-space around redirectors
12: cece40b = 38: 9d04ea6 Always auto-gc after calling a fast-import transport
13: 074fe17 = 39: 348d7c4 mingw: prevent regressions with "drive-less" absolute paths
33: d0a1a74 = 40: d632131 transport: optionally disable side-band-64k
34: 1e6ce31 = 41: b228aa1 mingw: fix fatal error working on mapped network drives on Windows
35: 93e278a = 42: f352883 clink.pl: fix MSVC compile script to handle libcurl-d.lib
36: b52af29 = 43: 4b2a9a0 mingw: implement a platform-specific
strbuf_realpath()37: 67066bf = 44: 268cf61 t3701: verify that we can add lots of files interactively
38: 14d38bb = 45: d313595 commit: accept "scissors" with CR/LF line endings
39: c73f470 = 46: b1f83c1 t0014: fix indentation
40: 3d8e3d1 = 47: 8e3d47f git-gui: accommodate for intent-to-add files
41: 7de0dae = 48: 0d95122 mingw: allow for longer paths in
parse_interpreter()42: 8e4b896 = 49: f6a87b0 compat/vcbuild: document preferred way to build in Visual Studio
43: e703c1c = 50: 468079a http: optionally send SSL client certificate
44: ca671a5 = 51: bb6095b ci: run
contrib/subtreetests in CI builds46: 1016f5e = 52: be96df6 CMake: show Win32 and Generator_platform build-option values
61: e8e3e38 = 53: c43d391 hash-object: add a >4GB/LLP64 test case using filtered input
62: 7d73b7b = 54: 98a5ec9 compat/mingw.c: do not warn when failing to get owner
63: 243342c = 55: 405cb13 mingw: $env:TERM="xterm-256color" for newer OSes
64: d079720 = 56: 75686d4 winansi: check result and Buffer before using Name
65: 939f1f9 = 57: 9b53a9a mingw: change core.fsyncObjectFiles = 1 by default
47: ac38c97 = 58: a03cceb windows: skip linking
git-<command>for built-ins48: 8adc573 = 59: 18abbef mingw: stop hard-coding
CC = gcc49: 77610ff = 60: b019bca mingw: drop the -D_USE_32BIT_TIME_T option
51: dbd5c1f = 61: 3572a8a mingw: only use -Wl,--large-address-aware for 32-bit builds
53: f9e6d64 = 62: 9d36417 mingw: avoid over-specifying
--pic-executable55: 0f3a1cd = 63: ece10f9 mingw: set the prefix and HOST_CPU as per MSYS2's settings
59: 9ac6ea5 = 64: 98dcec2 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
68: 43624e6 = 65: 4bdbdf8 mingw: rely on MSYS2's metadata instead of hard-coding it
69: 179943a = 66: 6f1d3da mingw: always define
ETC_*for MSYS2 environments70: e3cbc74 = 67: c9c8360 max_tree_depth: lower it for clang builds in general on Windows
71: 0a59904 = 68: 7a0017b mingw: ensure valid CTYPE
72: 7dfc3df = 69: 6bf1a49 mingw: allow
git.exeto be used instead of the "Git wrapper"82: 5cd1bf5 = 70: ed66f47 revision: create mark_trees_uninteresting_dense()
73: 7b378fe = 71: e305f51 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
83: b57297a = 72: f12a99d survey: stub in new experimental 'git-survey' command
74: 82418ed = 73: addecf2 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
84: 7172449 = 74: 3718b96 survey: add command line opts to select references
75: e0ab140 = 75: 9467ca5 clink.pl: fix libexpatd.lib link error when using MSVC
85: 09f8796 = 76: 2c63273 survey: start pretty printing data in table form
76: 863d3eb = 77: 8dd9af2 Makefile: clean up .ilk files when MSVC=1
86: db2a0b5 = 78: e4336c8 survey: add object count summary
77: 979a557 = 79: 72718d6 vcbuild: add support for compiling Windows resource files
87: 0231c3d = 80: d73b56a survey: summarize total sizes by object type
78: d38143f = 81: 8197ba7 config.mak.uname: add git.rc to MSVC builds
60: 512e2c6 = 82: 2d5a5bc MinGW: link as terminal server aware
88: 3474c2d = 83: 4ec8d8e survey: show progress during object walk
95: 4719139 = 84: ea6d5d8 mingw: make sure
errnois set correctly when socket operations fail114: d93fe09 ! 85: cf0ef1e t5563: verify that NTLM authentication works
79: 55b1f23 = 86: a38ca2f clink.pl: ignore no-stack-protector arg on MSVC=1 builds
89: 68952af = 87: db55dca http: optionally load libcurl lazily
90: 826e316 = 88: 1058f09 survey: add ability to track prioritized lists
107: b4dc6a8 = 89: d6ad7b8 compat/mingw: handle WSA errors in strerror
115: 901a299 = 90: ec6aa85 http: disallow NTLM authentication by default
80: 9b35a73 = 91: 94f873e clink.pl: move default linker options for MSVC=1 builds
91: bdb71bc = 92: e6047f1 http: support lazy-loading libcurl also on Windows
92: 1d37d59 = 93: f0b5843 survey: add report of "largest" paths
108: b104b8b = 94: 3c71cb1 compat/mingw: drop outdated comment
116: 8c9187a = 95: 5f14c80 http: warn if might have failed because of NTLM
81: c5b58c5 = 96: 7bdf405 cmake: install headless-git.
93: 3e7b87c = 97: 72068de http: when loading libcurl lazily, allow for multiple SSL backends
94: cb2717b = 98: bca21a9 survey: add --top= option and config
109: 0ab017b = 99: a56922e t0301: actually test credential-cache on Windows
117: facef88 = 100: dc915a9 credential: advertise NTLM suppression and allow helpers to re-enable
66: 4bf2427 = 101: b3bf760 Fix Windows version resources
67: 34cc0b0 = 102: 58cd081 status: fix for old-style submodules with commondir
96: c261d3e = 103: 24c221f git.rc: include winuser.h
97: 25339ab = 104: a358ca5 mingw: do load libcurl dynamically by default
98: e160717 = 105: 7b8b3f2 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
99: 57edd21 = 106: 67f2e8f mingw: suggest
windows.appendAtomicallyin more cases100: 651d21f = 107: 4349b50 win32: use native ANSI sequence processing, if possible
101: c72f16f = 108: 9f6cfa1 common-main.c: fflush stdout buffer upon exit
102: 6d3b1f5 = 109: 437379f t5601/t7406(mingw): do run tests with symlink support
103: a8a5fad = 110: f213595 win32: ensure that
localtime_r()is declared even in i686 builds104: c1d1977 = 111: 75c7e0c Fallback to AppData if XDG_CONFIG_HOME is unset
105: 98b1967 = 112: 8f1f544 run-command: be helpful with Git LFS fails on Windows 7
106: 9c0c118 = 113: 638cbdf survey: clearly note the experimental nature in the output
110: 765c3a9 = 114: 339ece4 credential-cache: handle ECONNREFUSED gracefully
111: 9b480b0 = 115: 13f314a reftable: do make sure to use custom allocators
112: 452fcd3 = 116: e8a5994 check-whitespace: avoid alerts about upstream commits
113: 271ad04 = 117: 8c8cfed t/t5571-prep-push-hook.sh: Add test with writing to stderr
118: b9db842 = 118: bae2e77 dir: do not traverse mount points
142: 26f4350 = 119: e38355a Merge 'remote-hg-prerequisites' into HEAD
143: a0b408b = 120: ca3fe88 Merge branch 'drive-prefix'
144: 23df6b2 = 121: ab0aee8 Merge branch 'msys2-python'
145: e729b19 = 122: c071d54 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
146: b25357e = 123: 9b4c4de Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
147: dff18d4 = 124: 01199ac Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
148: 7c31ffc = 125: 4d0fd8f Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction149: ba436ea = 126: e0bd143 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
150: d6ae6b1 = 127: ccd460a Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
123: 7d8c269 = 128: 95feb0a mingw: Support
git_terminal_promptwith more terminals151: 565c7fe = 129: 8d4f611 Merge 'add-p-many-files'
124: b7f71f8 = 130: 9acf59c compat/terminal.c: only use the Windows console if bash 'read -r' fails
152: 5beb209 = 131: 0d917a0 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
125: 22faf28 = 132: db33a7a mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
153: 7abd21d = 133: 713fa56 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
126: caeb308 = 134: 1512b71 Win32: symlink: move phantom symlink creation to a separate function
154: 5ccfe3f = 135: b4adc02 Merge 'git-gui/js/intent-to-add'
127: d95e643 = 136: e349c0c mingw: introduce code to detect whether we're inside a Windows container
128: 0cb203e = 137: 5a20222 Introduce helper to create symlinks that knows about index_state
155: fedc11c = 138: b7772da Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
129: f09fcf8 = 139: ecdfc32 mingw: when running in a Windows container, try to rename() harder
130: 03cfc93 = 140: 2eb1f7a mingw: allow to specify the symlink type in .gitattributes
156: df481e8 = 141: b068961 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
131: aea00d2 = 142: 3862b2e mingw: move the file_attr_to_st_mode() function definition
132: 89b3c21 = 143: 736ecf0 Win32: symlink: add test for
symlinkattribute157: aac83f8 = 144: 664dddc Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
133: 6b1472b = 145: 15e1f0d mingw: Windows Docker volumes are not symbolic links
134: 884fc60 = 146: fcf69e7 clean: do not traverse mount points
139: e316a21 = 147: 4454c70 mingw: kill child processes in a gentler way
158: e4a0a71 = 148: 5abdc23 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path119: abc2ad2 = 149: 7863ef5 win32: thread-utils: handle multi-socket systems
120: 1112c36 < -: ---------- http: extract http_reauth_prepare() from retry paths
121: ab4bff6 < -: ---------- http: attempt Negotiate auth in http.emptyAuth=auto mode
122: 94bcdea = 150: a2706da t5563: add tests for http.emptyAuth with Negotiate
135: 79d6ec0 = 151: 1a2018e entry: flush fscache after creating directories and writing files
136: 4d66026 = 152: 33cab03 ci(macos): skip the
git p4tests137: bb24cf3 = 153: ab310c3 mingw: work around rename() failing on a read-only file
138: f76baab = 154: 860a10a clean: remove mount points when possible
140: b112221 = 155: c8fedff mingw: optionally enable wsl compability file mode bits
141: 932a77a = 156: 7e38194 mingw: really handle SIGINT
159: f6a19f3 = 157: 2dbf7b0 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
160: 16929ce = 158: 22a4490 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
161: f59dbec = 159: 9578de7 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests162: cb297ea = 160: 57b7423 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
163: e2757b2 = 161: 41040c9 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t164: e7d9e7f = 162: bf56824 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory165: 6bff967 = 163: 1b5a7bb Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
166: e65dac2 = 164: 67d0464 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
167: 3a92ca8 = 165: 5588348 Merge branch 'optionally-dont-append-atomically-on-windows'
168: 3fee814 = 166: ee4c7cd Merge branch 'fsync-object-files-always'
169: f53079d = 167: b33fb41 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
170: eb82046 = 168: 657a6ad Fix Windows version resources (Fix Windows version resources git#4092)
171: 9456657 = 169: bd6a8f1 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
172: ba87146 = 170: c1f3502 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)173: b83f30b = 171: cd18443 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)174: 5e72fc0 = 172: e3abe2d Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283175: 81af124 = 173: 0193b29 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
176: e87776a = 174: 0dce513 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
177: 300b8b6 = 175: c66ae63 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
178: 1e03ffe = 176: 2d54937 Merge branch 'nano-server'
179: bbdc5b9 = 177: 3af711a Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
180: a68daf2 = 178: 3417dce win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
181: 6f29351 = 179: 8f8c35d common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
182: 24c2e57 = 180: 2ff812d Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
183: da97d40 = 181: 62f8e8f Merge branch 'Fix-i686-build-with-GCC-v14'
184: b2194d2 = 182: e799056 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
185: ba976ac = 183: 58e14fc Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
186: 3ad11a4 = 184: 7ef6d2e Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
187: 6885a01 = 185: 2beb641 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
188: e65cc05 = 186: 008e0e3 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
189: 0df17f2 = 187: 2c5d015 Merge branch 'reftable-vs-custom-allocators'
190: a60f279 = 188: 2a8bdd8 Merge branch 'check-whitespace-only-downstream'
191: a323dd1 = 189: d524024 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)
192: 1cff7f2 = 190: cf924a6 Merge branch 'disallow-ntlm-auth-by-default'
193: 8f443e5 = 191: 7a26c26 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)194: af5cdbe = 192: 6d2f749 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
195: 2419c24 = 193: cb43e49 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
196: 4c8c81a = 194: 6af34a5 entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
197: 777cb02 = 195: 5a831f1 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)198: c6ecd9a = 196: 3f0b8c3 Merge branch 'msys2'
199: 8b379fc = 197: 3d97f28 Merge 'docker-volumes-are-no-symlinks'
200: e6a7d21 = 198: 4c0cde8 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
201: bd27be7 = 199: ebc44f5 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
202: fdb28ff = 200: 0636051 Merge branch 'dont-clean-junctions'
203: a39ad5f = 201: 73efb57 Merge branch 'wsl-file-mode-bits'
204: abcdcdc = 202: 31f509b Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
205: 0af6aff = 203: 64c24e3 Merge branch 'ready-for-upstream'
206: 404b0ba = 204: 8e7e9b3 Win32: make FILETIME conversion functions public
207: 6709849 = 205: 931bb37 Win32: dirent.c: Move opendir down
208: 867d120 = 206: 1c28f1f mingw: make the dirent implementation pluggable
209: 046469f = 207: eccb936 Win32: make the lstat implementation pluggable
211: fc18727 = 208: 4034bf3 mingw: add infrastructure for read-only file system level caches
213: 4c19541 ! 209: 41b251b mingw: add a cache below mingw's lstat and dirent implementations
214: 5f72258 = 210: 1d84d7c fscache: load directories only once
215: 7b25e7b = 211: 74b2db5 fscache: add key for GIT_TRACE_FSCACHE
216: 2c40328 = 212: 4b0252f fscache: remember not-found directories
217: c389393 = 213: c21d7a3 fscache: add a test for the dir-not-found optimization
218: 0a649f5 = 214: b596a71 add: use preload-index and fscache for performance
219: a9e1cf1 ! 215: 5a1b0a2 dir.c: make add_excludes aware of fscache during status
220: d9917e4 ! 216: 230098b fscache: make fscache_enabled() public
221: f195463 = 217: 0bb7548 dir.c: regression fix for add_excludes with fscache
222: d80f86d = 218: 9d0ecc5 fetch-pack.c: enable fscache for stats under .git/objects
210: 49f7de7 = 219: 92884b0 git-gui--askyesno: fix funny text wrapping
223: fffabb8 ! 220: 3f6bb77 checkout.c: enable fscache for checkout again
212: c6da9a9 = 221: 1091727 git-gui--askyesno (mingw): use Git for Windows' icon, if available
224: b6c2bad = 222: 2d8e2be Enable the filesystem cache (fscache) in refresh_index().
225: e7d0d42 = 223: 3d34ced fscache: use FindFirstFileExW to avoid retrieving the short name
226: d3882dc = 224: 6bd1232 fscache: add GIT_TEST_FSCACHE support
227: 845da06 = 225: c15f7f7 fscache: add fscache hit statistics
228: f2d02fd = 226: 9c36bdf unpack-trees: enable fscache for sparse-checkout
229: 6e61fc0 = 227: 844f0e4 status: disable and free fscache at the end of the status command
230: 6f653cf = 228: 39302e0 mem_pool: add GIT_TRACE_MEMPOOL support
231: f9c7101 ! 229: 7c7ba54 fscache: fscache takes an initial size
232: b336137 ! 230: 86be023 fscache: update fscache to be thread specific instead of global
233: be33ed4 = 231: d3d0cd5 fscache: teach fscache to use mempool
234: 78ebff8 = 232: 7a467d8 fscache: make fscache_enable() thread safe
235: bcfb029 = 233: 5b09a93 fscache: teach fscache to use NtQueryDirectoryFile
236: 0e18da2 = 234: e87666a fscache: remember the reparse tag for each entry
237: c735842 = 235: 6bc299e fscache: Windows Docker volumes are not symbolic links
238: d5ff573 = 236: c1911e6 fscache: optionally enable wsl compability file mode bits
239: 9671860 = 237: c2bfbcf Merge branch 'fscache'
240: 7835be3 = 238: 792043c fscache: implement an FSCache-aware is_mount_point()
241: 9337019 = 239: 8775de1 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
242: 6331322 = 240: ef6a2ba clean: make use of FSCache
243: 45ebe2d = 241: ade21fc Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
244: 3c51124 = 242: 3a8c37c Merge branch 'dont-clean-junctions-fscache'
245: 88ed5f4 = 243: 2cc06ca pack-objects (mingw): demonstrate a segmentation fault with large deltas
246: d8a9595 = 244: 0e6b8cc mingw: support long paths
247: 0c5ca8e = 245: 8f8560f win32(long path support): leave drive-less absolute paths intact
248: d514256 = 246: 9fd9d70 compat/fsmonitor/fsm-*-win32: support long paths
249: b2ee2f3 = 247: b11444a clean: suggest using
core.longPathsif paths are too long to remove250: 6da9ee4 = 248: c95a981 mingw: explicitly specify with which cmd to prefix the cmdline
251: 44e60c6 = 249: 512ac5d mingw: when path_lookup() failed, try BusyBox
252: 967b006 = 250: 866f94e test-tool: learn to act as a drop-in replacement for
iconv253: e683840 = 251: e2214af tests(mingw): if
iconvis unavailable, usetest-helper --iconv254: 062b952 = 252: f30f04e gitattributes: mark .png files as binary
255: 3feee8c = 253: 28d4f41 tests: move test PNGs into t/lib-diff/
256: 4619b9c = 254: 99c903d tests: only override sort & find if there are usable ones in /usr/bin/
257: 1ed0925 ! 255: 0774585 tests: use the correct path separator with BusyBox
258: a531c4b = 256: 8e6d3bb mingw: only use Bash-ism
builtin pwd -Wwhen available259: ebe3596 = 257: 92c5302 tests (mingw): remove Bash-specific pwd option
260: 0e6eec2 = 258: d49e207 test-lib: add BUSYBOX prerequisite
261: e3742c7 = 259: 00faae5 t5003: use binary file from t/lib-diff/
262: 0994d7f = 260: b75f28f t5532: workaround for BusyBox on Windows
263: 1b32b90 = 261: b684633 t5605: special-case hardlink test for BusyBox-w32
264: aed3c22 = 262: 2cdf48e t5813: allow for $PWD to be a Windows path
265: 00aaba9 = 263: 4a601ee t9200: skip tests when $PWD contains a colon
271: 16d04dc = 264: 7ed3c51 Describe Git for Windows' architecture
266: 2d9ba34 = 265: 62f7e29 Add a GitHub workflow to monitor component updates
272: 78a5f37 = 266: 0b28c04 Add an AGENTS.md file to help with AI-assisted debugging/development
267: db1406e = 267: 3430b7e Partially un-revert "editor: save and reset terminal after calling EDITOR"
268: 611f00c = 268: 3dabb82 reset: reinstate support for the deprecated --stdin option
269: 6fcc287 = 269: 37a9983 fsmonitor: reintroduce core.useBuiltinFSMonitor
270: e6b6f47 = 270: 5e60d83 dependabot: help keeping GitHub Actions versions up to date
273: 768f9b5 = 271: eb6bd29 Merge branch 'gitk-and-git-gui-patches'
274: 439c1a0 = 272: b6a1ef4 Modify the Code of Conduct for Git for Windows
275: 0202000 = 273: 1b1adce Merge branch 'long-paths'
276: 2aac26d = 274: 5128cc3 CONTRIBUTING.md: add guide for first-time contributors
277: 95854b1 = 275: 2e71474 Merge branch 'busybox-w32'
278: 8ec6070 = 276: f913ece README.md: Add a Windows-specific preamble
279: 740de9c = 277: ea7d723 Merge branch 'un-revert-editor-save-and-reset'
280: 9b65a11 = 278: d3be260 Add an issue template
281: d5b7a78 = 279: 2d5a81c Merge branch 'phase-out-reset-stdin'
282: 0993c95 = 280: 201de46 Modify the GitHub Pull Request template (to reflect Git for Windows)
283: 22c1151 = 281: 16076c9 Merge branch 'deprecate-core.useBuiltinFSMonitor'
284: 92d6230 = 282: 8ed04c9 SECURITY.md: document Git for Windows' policies
285: 3ee72c5 = 283: 8e83257 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
286: c46f63e = 284: 3a305c3 Merge 'readme' into HEAD
-: ---------- > 285: 7343e51 Merge 'objects-larger-than-4gb-on-windows-pt2'
-: ---------- > 286: d4d6323 ci: only run the expensive tests in the Windows tests for now