Rebase shears/seen: 2 conflict(s) (1 skipped, 1 resolved) (#25298176260)#148
Open
gitforwindowshelper[bot] wants to merge 301 commits intobase/shears/seen-25298176260from
Open
Rebase shears/seen: 2 conflict(s) (1 skipped, 1 resolved) (#25298176260)#148gitforwindowshelper[bot] wants to merge 301 commits intobase/shears/seen-25298176260from
gitforwindowshelper[bot] wants to merge 301 commits intobase/shears/seen-25298176260from
Conversation
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>
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>
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>
Now that we have explored objects by count, we can expand that a bit more to summarize the data for the on-disk and inflated size of those objects. This information is helpful for diagnosing both why disk space (and perhaps clone or fetch times) is growing but also why certain operations are slow because the inflated size of the abstract objects that must be processed is so large. Note: zlib-ng is slightly more efficient even at those small sizes. Even between zlib versions, there are slight differences in compression. To accommodate for that in the tests, not the exact numbers but some rough approximations are validated (the test should validate `git survey`, after all, not zlib). Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
Create a wrapper for the Windows Resource Compiler (RC.EXE) for use by the MSVC=1 builds. This is similar to the CL.EXE and LIB.EXE wrappers used for the MSVC=1 builds. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
The tell-tale is the presence of the `MSYSTEM` value while compiling, of course. In that case, we want to ensure that `MSYSTEM` is set when running `git.exe`, and also enable the magic MSYS2 tty detection. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Teach MSVC=1 builds to depend on the `git.rc` file so that the resulting executables have Windows-style resources and version number information within them. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This compile-time option allows to ask Git to load libcurl dynamically at runtime. Together with a follow-up patch that optionally overrides the file name depending on the `http.sslBackend` setting, this kicks open the door for installing multiple libcurl flavors side by side, and load the one corresponding to the (runtime-)configured SSL/TLS backend. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In future changes, we will make use of these methods. The intention is to keep track of the top contributors according to some metric. We don't want to store all of the entries and do a sort at the end, so track a constant-size table and remove rows that get pushed out depending on the chosen sorting algorithm. Co-authored-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by; Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
MSYS2 defines some helpful environment variables, e.g. `MSYSTEM`. There is code in Git for Windows to ensure that that `MSYSTEM` variable is set, hard-coding a default. However, the existing solution jumps through hoops to reconstruct the proper default, and is even incomplete doing so, as we found out when we extended it to support CLANGARM64. This is absolutely unnecessary because there is already a perfectly valid `MSYSTEM` value we can use at build time. This is even true when building the MINGW32 variant on a MINGW64 system because `makepkg-mingw` will override the `MSYSTEM` value as per the `MINGW_ARCH` array. The same is equally true for the `/mingw64`, `/mingw32` and `/clangarm64` prefix: those values are already available via the `MINGW_PREFIX` environment variable, and we just need to pass that setting through. Only when `MINGW_PREFIX` is not set (as is the case in Git for Windows' minimal SDK, where only `MSYSTEM` is guaranteed to be set correctly), we use as fall-back the top-level directory whose name is the down-cased value of the `MSYSTEM` variable. Incidentally, this also broadens the support to all the configurations supported by the MSYS2 project, i.e. clang64 & ucrt64, too. Note: This keeps the same, hard-coded MSYSTEM platform support for CMake as before, but drops it for Meson (because it is unclear how Meson could do this in a more flexible manner). 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>
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>
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
…opment This adds an extensive section about resolving merge conflicts during rebases, which happens quite often in Git for Windows' day-to-day. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…opment AGENTS.md: add upstream contribution and worktree guidance Add sections covering the GitGitGadget workflow for contributing to upstream Git, commit message conventions specific to the upstream project, how to manage patch series with dependencies (branch thickets), effective worktree usage including --update-refs for history rewrites, and techniques for analyzing merge-structured topic branches with git replay. These learnings come from a session contributing the safe.bareRepository test preparation patches via GitGitGadget. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Assisted-by: Claude Opus 4.6
…opment AGENTS.md: document rebase, staging, and log -L tricks for AI agents Add practical recipes for three workflows that are particularly useful when AI agents work with Git: Non-interactive "interactive" rebases using `sed -i 1ib` as a sequence editor to insert a `break` command, then editing the todo file directly via the path from `git rev-parse --git-path rebase-merge/git-rebase-todo`. This avoids the impossible task of driving an interactive editor from an AI agent. Scripted hunk staging via `printf '%s\n' s y q | git add -p`, which feeds predictable keystrokes to the add-patch protocol to stage individual hunks without human interaction. The `git log -L <start>,+<count>:<file>` trick for finding which commit last touched specific lines, enabling an `hg absorb`-like workflow where the agent can identify the right fixup! target surgically rather than grepping through full diffs. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Assisted-by: Claude Opus 4.6
…opment AGENTS.md: add pre-commit checklist for lint checks Bundle the existing ASCII-only, 80-column, and whitespace validation recipes into a "pre-commit checklist" block that agents should run before every commit. The individual recipes already existed in the Coding Conventions section but were presented as reference material rather than as an actionable workflow step. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Assisted-by: Claude Opus 4.6
…opment AGENTS: document learnings from split-index + fsmonitor investigation While investigating a CI failure in the `linux-TEST-vars` job caused by the interaction between the `pt/fsmonitor-linux` and `hn/git-checkout-m-with-stash` topics in `seen`, several debugging techniques proved essential and were not previously documented. The investigation required bisecting the first-parent history of `seen` while temporarily merging the fsmonitor topic at each step. This revealed that `GIT_TEST_SPLIT_INDEX=yes` corrupts the bisect machinery's own index operations unless it is unset before cleanup checkouts. It also revealed that `fprintf(stderr, ...)` instrumentation in Git's C code is swallowed by the test framework, making Trace2 the correct instrumentation approach. A key insight was that the bug appeared Linux-specific only because `linux-TEST-vars` is the sole CI job setting `GIT_TEST_SPLIT_INDEX=yes`; there is no macOS or Windows equivalent. The actual root cause (the `index.skipHash=true` + split-index interaction producing a null `base_oid` in the shared index) is platform-independent. Add four documentation sections capturing these learnings: bisecting `seen` interactions, reproducing with exact CI variables, verifying CI platform coverage before concluding platform-specificity, and using Trace2 for instrumentation inside the test framework. Assisted-by: Claude Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This was marked as a temporary work-around in 4538ee6 (ci: work around a problem with HTTP/2 vs libcurl v8.10.0 (git-for-windows#5165), 2024-09-24), to help CI builds pass even on macOS. The faulty libcurl version has hence been replaced with plenty of fixed ones, therefore this work-around is no longer necessary. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…it-for-windows#6198) AI-assisted contributions are a reality of open source in 2025 and beyond. Contributors will use AI tools, and that includes the maintainers themselves. Over recent months, I have found AI increasingly useful for the kind of menial, tedious work that does not require much creativity but is highly boring when done by hand: resolving merge conflicts during merging-rebases, chasing down CI failures across platforms, adapting downstream patches to upstream API changes. To that end, I would like to have an `AGENTS.md` file in the code base that helps any LLM to understand the context of the project. A secondary goal of this is to preemptively help outside contributors. The risk is not AI usage per se, but low-quality AI slop: contributions where the human hits "accept" without sufficient context being available to the model (and without proper review by the human, we've all been there), resulting in changes that miss conventions, break patterns, or misunderstand the project's architecture. Git's source code is about as legacy as they come, having grown organically over two decades with no design that AI coding models would readily grasp from a narrow code sample alone. This `AGENTS.md` is designed to raise the floor on AI-assisted contributions by providing enough context that even when a human contributor fails to steer carefully, the model has the information it needs to produce something reasonable. It documents the repository structure, build process, test conventions, the object model and ODB internals, debugging techniques (Trace2, instrumenting tests, bisecting failures), the merging-rebase workflow, conflict resolution patterns, coding conventions (ASCII only, 80 columns, tabs), commit message expectations, and the GitGitGadget contribution workflow. This is information that a human might take for granted, but no coding model will have been trained on specifically. Similar `AGENTS.md` files have recently been added to other repositories in the Git for Windows project: [MINGW-packages](git-for-windows/MINGW-packages#194), [git-for-windows.github.io](git-for-windows/git-for-windows.github.io#88) and [msys2-runtime](git-for-windows/msys2-runtime@1e0ff37).
This was a preparatory commit for the path-walk API, which has since been upstreamed into v2.54.0. During the merging-rebase, the code changes this commit introduced were already present in the new base, leaving it empty. Drop it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The downstream NTLM topic (883674c, "t5563: verify that NTLM authentication works") and upstream commit 7e98eb8 ("t5563: add tests for http.emptyAuth with Negotiate") both added SPNEGO tests to the end of t5563. When both topics landed in shears/seen, the SPNEGO tests were duplicated: the first set appears before the NTLM tests (from upstream), the second set after (from the downstream topic). Since GIT_TRACE_CURL appends to the trace file rather than overwriting it, the second set of tests sees the 401 responses from both runs. Test 21 (auto mode) expects 3 lines in trace-auto but finds 6 (3 + 3), and test 22 (false mode) expects 1 but finds 2 (1 + 1), causing all four macOS CI jobs to fail. Remove the duplicate second set; the first (upstream) copy is sufficient. Assisted-by: Claude Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Over time, as upstream Git absorbs fixes and features that originated in or were carried by Git for Windows, downstream patches accumulate that are no longer needed. The steady stream of merged PRs makes this virtually inevitable. This PR collects fixup! commits to drop three such patches during the next autosquash rebase. The HTTP/2 workaround in `t5551` was a temporary fix for a libcurl v8.10.0 regression on macOS CI runners. The faulty libcurl has long been superseded by fixed versions, making it unnecessary. The `unix-socket: avoid leak when initialization fails` patch changed `return -1` to `goto fail` in `unix_stream_connect()` so cleanup would run when `unix_sockaddr_init()` failed. Upstream fixed the same leak more surgically in c5fe29f (unix-socket: fix memory leak when chdir(3p) fails, 2025-01-30) by having `unix_sockaddr_init()` call `FREE_AND_NULL(ctx->orig_dir)` before returning, making the downstream caller-side fix redundant. The `revision: create mark_trees_uninteresting_dense()` commit was a preparatory patch for the path-walk API. That API has since been upstreamed, and this commit became empty during the merging-rebase because its changes were already in the new base.
…erver Bump actions/checkout from v5 to v6 and git-for-windows/setup-git-for-windows-sdk from v1 to v2. Both bumps are Node.js 20 to Node.js 24 runtime migrations with no functional changes to the actions themselves. checkout v6 moves persisted credentials to `` instead of `.git/config`, which does not affect this workflow since no subsequent steps rely on the credential location. The setup-sdk v2 provisions the same minimal SDK as v1. Risk: very low. The only precondition is a recent Actions Runner, which github.com-hosted runners already satisfy. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…s#6215) This PR is a companion of gitgitgadget#2103. On Windows, `maintenance_task_geometric_repack()` opens pack index files via `pack_geometry_init()` (which `mmap()`s the `.idx` files), then spawns `git repack` as a child process without setting `child.odb_to_close`. The parent's `mmap()`s prevent the child from deleting old `.idx` files. On Windows 10 builds before the POSIX delete semantics change (between Build 17134.1304 and 18363.657, see https://stackoverflow.com/a/60512798), this results in `Unlink of file '.git/objects/pack/pack-<hash>.idx' failed. Should I try again?` during fetch-triggered auto-maintenance with the geometric strategy. The fix adds the missing `child.odb_to_close = the_repository->objects` line, matching all other maintenance tasks. The first commit introduces a `GIT_TEST_LEGACY_DELETE` environment variable to simulate legacy (pre-POSIX) delete semantics on modern Windows, so the regression test can verify the fix even on Windows 11. This fixes git-for-windows#6210. Tested-by: Patryk Miś <foss@patrykmis.com>
…windows#6220) This includes gitgitgadget#2097 and a `fixup!` for a workflow that is not upstream (Nano Server).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: seen
From: 3bd2171464 (Update GitHub Actions versions used in the GitHub workflows (git-for-windows#6220), 2026-04-30) (ee6e578309..3bd2171464)
Resolved: 212f79c (mingw: include the Python parts in the build, 2015-02-16)
dropped USE_NED_ALLOCATOR block removed upstream, kept NO_PYTHON= addition
Range-diff
1: 212f79c ! 1: 5f9d107 mingw: include the Python parts in the build
Skipped: 2fc5be1 (mingw: use mimalloc, 2019-06-24)
Upstream equivalent: e576abb (mingw: stop using nedmalloc, 2026-05-03)
Range-diff
1: 2fc5be1 ! 1: e576abb mingw: use mimalloc
To: 40f9280fb8 (Update GitHub Actions versions used in the GitHub workflows (git-for-windows#6220), 2026-04-30) (75128239ae..40f9280fb8)
Statistics
Range-diff (click to expand)
1: f65514d = 1: e3bfdab ci(dockerized): reduce the PID limit for private repositories
2: f1d0086 = 2: 795ccde mingw: skip symlink type auto-detection for network share targets
3: b9fbf4a = 3: 4acfdff Merge branch 'fix-ci'
4: 6b44128 = 4: 2c0848e unix-socket: avoid leak when initialization fails
5: d899f9d = 5: 49ebfdf Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: c4bbdff = 6: e144272 grep: prevent
^$false match at end of file7: 20584a0 = 7: 727e97d Merge branch 'v2.53.0.windows.3'
8: 3ee7cdb = 8: 92bddad Merge branch 'fixes-from-the-git-mailing-list'
23: 3f9b144 = 9: cb9422e t9350: point out that refs are not updated correctly
27: 707e3d2 = 10: f39f951 transport-helper: add trailing --
33: d10582c = 11: 1890bd4 remote-helper: check helper status after import/export
34: 36591de = 12: 39533d7 clean: do not traverse mount points
42: 8d65775 = 13: 2ca1c2c Always auto-gc after calling a fast-import transport
43: 83ad2cf = 14: bc5c1a6 mingw: prevent regressions with "drive-less" absolute paths
44: 4de327e = 15: 1c83a50 clean: remove mount points when possible
-: ---------- > 16: 5f9d107 mingw: include the Python parts in the build
16: e4fb347 = 17: 4cb78cf win32/pthread: avoid name clashes with winpthread
19: b0867e1 = 18: aa9ec64 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
22: 0dbe12c = 19: 5cd483c Import the source code of mimalloc v2.2.7
26: c1a470d = 20: 50d3211 mimalloc: adjust for building inside Git
31: b655f2b = 21: 65f190b mimalloc: offer a build-time option to enable it
9: ee8c005 = 22: 9372e9c vcpkg_install: detect lack of Git
10: b0edaa8 = 23: 14a7b26 vcpkg_install: add comment regarding slow network connections
11: 4ce039a = 24: 14c24cc vcbuild: install ARM64 dependencies when building ARM64 binaries
12: 1b27649 = 25: 46b7944 vcbuild: add an option to install individual 'features'
13: d8e54a3 = 26: 5056a38 cmake: allow building for Windows/ARM64
14: 212f79c < -: ---------- mingw: include the Python parts in the build
15: 2278ad2 = 27: 00b17e6 ci(vs-build) also build Windows/ARM64 artifacts
17: 8bfb3c7 = 28: 91722d2 Add schannel to curl installation
18: 0651517 = 29: 73de6b6 hash-object: demonstrate a >4GB/LLP64 problem
20: 321a1fb = 30: db622e9 cmake(): allow setting HOST_CPU for cross-compilation
21: ce160fb = 31: 0b4fbd1 object-file.c: use size_t for header lengths
24: 5fad1c0 = 32: 76dca45 CMake: default Visual Studio generator has changed
25: 0edd1e3 = 33: 2947283 hash algorithms: use size_t for section lengths
28: 1784841 = 34: 615f51d mingw: demonstrate a
git addissue with NTFS junctions29: 7b1445d = 35: 63ff53b .gitignore: add Visual Studio CMakeSetting.json file
30: 3580dd5 = 36: 1f0214b hash-object --stdin: verify that it works with >4GB/LLP64
32: 29bfc54 = 37: d6112e0 t5505/t5516: allow running without
.git/branches/in the templates35: 8bddb5c = 38: 2027404 strbuf_realpath(): use platform-dependent API if available
36: ea0a6fd = 39: 58574b9 http: use new "best effort" strategy for Secure Channel revoke checking
37: 6df2f58 = 40: 1cfd7b7 subtree: update
contrib/subtreetesttarget38: 8a61232 = 41: dcfdb86 CMakeLists: add default "x64-windows" arch for Visual Studio
39: 4a2f479 = 42: e84ee7e hash-object: add another >4GB/LLP64 test case
40: 2fc5be1 < -: ---------- mingw: use mimalloc
90: a027351 = 43: 32728ca setup: properly use "%(prefix)/" when in WSL
41: e1846f7 = 44: 3e27684 t5505/t5516: fix white-space around redirectors
45: 78e95c5 = 45: 72be033 transport: optionally disable side-band-64k
46: c241c43 = 46: 3f8beb9 mingw: fix fatal error working on mapped network drives on Windows
47: 9926b35 = 47: b8b388a clink.pl: fix MSVC compile script to handle libcurl-d.lib
48: c5ce4f9 = 48: 49d6f37 mingw: implement a platform-specific
strbuf_realpath()49: b15e822 = 49: 83dd5d0 t3701: verify that we can add lots of files interactively
50: 7c54322 = 50: 3628f2d commit: accept "scissors" with CR/LF line endings
51: 2eae361 = 51: 6348e94 t0014: fix indentation
52: 900a931 = 52: 5d96cce git-gui: accommodate for intent-to-add files
53: b32ce63 = 53: b5f2218 mingw: allow for longer paths in
parse_interpreter()54: 3346194 = 54: efec2ae compat/vcbuild: document preferred way to build in Visual Studio
55: 6ef23cd = 55: f8fbca8 http: optionally send SSL client certificate
56: a5c01c4 = 56: c2fcc4e ci: run
contrib/subtreetests in CI builds57: 179807d = 57: ba379ff CMake: show Win32 and Generator_platform build-option values
58: 74fa844 = 58: 965e80a hash-object: add a >4GB/LLP64 test case using filtered input
95: 1211ebf = 59: 00edc00 compat/mingw.c: do not warn when failing to get owner
96: 71f68c4 = 60: 1925838 mingw: $env:TERM="xterm-256color" for newer OSes
97: 245499b = 61: ed7c81c winansi: check result and Buffer before using Name
59: 31091c1 = 62: 68c4be2 windows: skip linking
git-<command>for built-ins60: 0deeb68 = 63: 488403f mingw: stop hard-coding
CC = gcc61: 2dabc1c = 64: 5babeb1 mingw: drop the -D_USE_32BIT_TIME_T option
62: 51826dc = 65: 989356f mingw: only use -Wl,--large-address-aware for 32-bit builds
63: 8582d26 = 66: cc5a14f mingw: avoid over-specifying
--pic-executable64: 9ac2669 = 67: 4d3b116 mingw: set the prefix and HOST_CPU as per MSYS2's settings
65: 6a3a16d = 68: 5797478 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
66: b405542 = 69: e2c1578 mingw: rely on MSYS2's metadata instead of hard-coding it
67: 373bb38 ! 70: 5941c8f mingw: always define
ETC_*for MSYS2 environments68: edc2762 = 71: a92333e max_tree_depth: lower it for clang builds in general on Windows
69: 6ab44ec = 72: 11a8b9b mingw: ensure valid CTYPE
72: 475d5ec = 73: f0897d3 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
70: 79f95c0 = 74: c6fd098 mingw: allow
git.exeto be used instead of the "Git wrapper"74: 6dc9bcd = 75: cd9c7b7 revision: create mark_trees_uninteresting_dense()
71: 4b5ff02 = 76: 01e490f mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
76: 6aa14bf = 77: fb786d5 survey: stub in new experimental 'git-survey' command
73: e408d53 = 78: aeb29ae Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
78: 96541c1 = 79: e1e5eb9 survey: add command line opts to select references
75: b4ab4e1 = 80: d35d508 clink.pl: fix libexpatd.lib link error when using MSVC
80: 55b6465 = 81: 6015a7f survey: start pretty printing data in table form
77: 46bab8f = 82: 00c4ad2 Makefile: clean up .ilk files when MSVC=1
83: 73c4b79 = 83: b44f697 survey: add object count summary
79: c64a109 = 84: 10e7b04 vcbuild: add support for compiling Windows resource files
86: 601b9c6 = 85: c269797 survey: summarize total sizes by object type
81: afec8cd = 86: edafde3 config.mak.uname: add git.rc to MSVC builds
82: 7ec45c2 = 87: ed4b7df MinGW: link as terminal server aware
89: 1039cca = 88: 7fe732a survey: show progress during object walk
84: 4db17cc = 89: 21ceb08 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
85: dd69644 = 90: 616476b http: optionally load libcurl lazily
94: 7b1073d = 91: a33d75e survey: add ability to track prioritized lists
87: 7d540b4 = 92: 23d791d clink.pl: move default linker options for MSVC=1 builds
88: 9791b6b = 93: 544aa2a http: support lazy-loading libcurl also on Windows
131: ee36fc9 = 94: c76c0ef survey: add report of "largest" paths
91: 6c9c255 = 95: 0e48029 Add config option
windows.appendAtomically92: 85c0199 = 96: 731082c cmake: install headless-git.
93: 2f67f6e = 97: 0d28656 http: when loading libcurl lazily, allow for multiple SSL backends
135: 4fe5724 = 98: 9fc9fd7 survey: add --top= option and config
98: fa7a40d = 99: bc595af mingw: change core.fsyncObjectFiles = 1 by default
99: b66d2d6 = 100: 764c58f Fix Windows version resources
100: 89f1e99 = 101: bd26af2 status: fix for old-style submodules with commondir
101: 8904795 = 102: 97598ac git.rc: include winuser.h
102: 9e9b82d = 103: bd7e061 mingw: do load libcurl dynamically by default
103: 8f1e925 = 104: abd9e22 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
104: 5e5d1e5 = 105: 54802f4 mingw: suggest
windows.appendAtomicallyin more cases105: 85e640b = 106: 2a465c4 win32: use native ANSI sequence processing, if possible
106: 61396b2 = 107: 11bae40 common-main.c: fflush stdout buffer upon exit
107: 990a1e7 = 108: 5008fae t5601/t7406(mingw): do run tests with symlink support
108: 1764e62 = 109: a5282ba win32: ensure that
localtime_r()is declared even in i686 builds109: 67ef69b = 110: 0d40187 Fallback to AppData if XDG_CONFIG_HOME is unset
110: 5d02154 = 111: ef1556d run-command: be helpful with Git LFS fails on Windows 7
139: c1083d5 = 112: fcf4f00 survey: clearly note the experimental nature in the output
111: fc5c982 = 113: afac302 Merge 'remote-hg-prerequisites' into HEAD
112: e4d494a = 114: 9b1ee6b Merge branch 'drive-prefix'
113: c070b40 = 115: 233c31e Merge branch 'dont-clean-junctions'
114: 6c61c3a = 116: 59acb57 Merge branch 'msys2-python'
115: 0759be8 = 117: cad2beb Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
116: 1e3acad = 118: c93f54d Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
117: c77c995 = 119: 055c84f Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
118: b66c0a7 = 120: 5d479f4 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
119: 36f6e7e = 121: 793ccc3 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction120: bba73e3 = 122: fdd9eda Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
121: cc9a3fb = 123: 3ebe87b Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
125: d5cb6dc = 124: 4e34ee4 mingw: make sure
errnois set correctly when socket operations fail126: 3b70b4b = 125: ff7c001 t5563: verify that NTLM authentication works
122: 254379f = 126: 468a026 Merge 'add-p-many-files'
128: 0befc70 = 127: 1e515bf compat/mingw: handle WSA errors in strerror
129: 3ef0440 = 128: b48a104 http: disallow NTLM authentication by default
123: b8a651f = 129: 420bfc0 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
132: 2e5efc3 = 130: d20220d compat/mingw: drop outdated comment
133: 7ee31d4 = 131: 9c70d9f http: warn if might have failed because of NTLM
124: dd428bb = 132: f0ac50b Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
136: e288295 = 133: ea1df19 t0301: actually test credential-cache on Windows
137: 411af4b = 134: ac40d12 credential: advertise NTLM suppression and allow helpers to re-enable
127: 1bb9a81 = 135: 16aa7d0 Merge 'git-gui/js/intent-to-add'
140: c14d0aa = 136: 7c8ec9c credential-cache: handle ECONNREFUSED gracefully
141: e006e24 = 137: fe38442 reftable: do make sure to use custom allocators
142: ba3a705 = 138: 9261520 check-whitespace: avoid alerts about upstream commits
143: 852f387 = 139: 902c1a0 t/t5571-prep-push-hook.sh: Add test with writing to stderr
144: f7483b4 = 140: 65d9a17 dir: do not traverse mount points
145: f4f19df = 141: 3127255 win32: thread-utils: handle multi-socket systems
146: 4fc4510 = 142: 5e0d672 t5563: add tests for http.emptyAuth with Negotiate
130: 5cb6d6e = 143: 3e8dd0a Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
134: 0f8e567 = 144: 8de07ce Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
138: a3f61a1 = 145: cea4130 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
147: d68dc17 = 146: 815b556 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path148: 8e0d16b = 147: 164570b Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
149: e0abce3 = 148: 598ccf3 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
150: 775d46f = 149: a23a580 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests151: d62bd74 = 150: 5e47777 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
152: 2c91b35 = 151: 23793c0 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t153: 879ab9f = 152: 293bcf5 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory154: b506c9b = 153: 32a86f7 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
155: 6fdbfd4 = 154: 52dea32 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
156: 84a0098 = 155: 1f522bb Merge branch 'optionally-dont-append-atomically-on-windows'
157: d2d6cde = 156: 236728d Merge branch 'fsync-object-files-always'
158: a024635 = 157: 4f818c2 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
159: 92cf0c8 = 158: ec94bf2 Fix Windows version resources (Fix Windows version resources git#4092)
160: a49b8f0 = 159: 28e8b0d Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
161: 05f94f3 = 160: 5198214 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)162: d3257e4 = 161: d66ae33 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)163: 5a05e28 = 162: 0211a9a Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283164: 8108cdc = 163: 069ab11 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
165: 25d226a = 164: 1babfdc ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
166: d23c6e0 = 165: 8eccbdb Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
167: c94f73f = 166: 40a08c6 Merge branch 'nano-server'
168: f06a5a3 = 167: 6220d2c Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
169: 67bae2e = 168: 814789d win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
170: 42ea367 = 169: 5cc9672 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
171: ed75378 = 170: 99432f9 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
172: e675cae = 171: 2894391 Merge branch 'Fix-i686-build-with-GCC-v14'
173: f846a83 = 172: 823f3c4 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
174: 252e5a8 = 173: be41d78 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
175: 8aa9af4 = 174: 52f9a78 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
176: c990583 = 175: f472888 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
177: 5d57439 = 176: b9264f9 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
178: dfeb666 = 177: ad03ab0 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
179: f599386 = 178: 1fe8a88 Merge branch 'reftable-vs-custom-allocators'
180: f27a658 = 179: e00efce Merge branch 'check-whitespace-only-downstream'
181: a8307fb = 180: 8447806 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)
182: 565ed1a = 181: e5ab895 Merge branch 'disallow-ntlm-auth-by-default'
183: e5a8012 = 182: 510402f Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)184: f9c94dd = 183: 8f7485f Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
185: 783e07b = 184: 6999bde http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
186: 2640ee3 = 185: 38381db Merge branch 'ready-for-upstream'
187: 1609bb1 = 186: eea9803 ci(macos): skip the
git p4tests188: ed3f726 = 187: 690a291 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)189: 58f169f = 188: aeb61ef Win32: make FILETIME conversion functions public
190: fdb458c = 189: 3621c4e Win32: dirent.c: Move opendir down
191: c024b0a = 190: e897742 mingw: make the dirent implementation pluggable
192: 5ca486e = 191: 6b4575f Win32: make the lstat implementation pluggable
193: a8f9abd = 192: bac6b73 mingw: add infrastructure for read-only file system level caches
194: 85124b9 = 193: 8e0b94a mingw: add a cache below mingw's lstat and dirent implementations
195: 945555d = 194: 2c65f6e fscache: load directories only once
196: f699b23 = 195: 76b2b4a fscache: add key for GIT_TRACE_FSCACHE
197: 7d4f52e = 196: 38e9b0d fscache: remember not-found directories
198: 5f9104d = 197: 7747ce3 fscache: add a test for the dir-not-found optimization
199: aad7034 = 198: 54632ab add: use preload-index and fscache for performance
200: 89db7c2 = 199: 37dd02d dir.c: make add_excludes aware of fscache during status
201: db6778c = 200: 1c170b4 fscache: make fscache_enabled() public
202: 8bf921f = 201: 92a8292 dir.c: regression fix for add_excludes with fscache
203: cd68324 = 202: 9c1e573 fetch-pack.c: enable fscache for stats under .git/objects
205: c8d0c35 = 203: cfd0727 checkout.c: enable fscache for checkout again
207: f0af55d = 204: e15fd94 Enable the filesystem cache (fscache) in refresh_index().
209: ef5b2e3 = 205: 70ac808 fscache: use FindFirstFileExW to avoid retrieving the short name
210: b763a0b = 206: b877ac1 fscache: add GIT_TEST_FSCACHE support
204: cb1224d = 207: 2e9dc0b git-gui--askyesno: fix funny text wrapping
211: d56d028 = 208: 91d0dd2 fscache: add fscache hit statistics
206: 78027fb = 209: 355abf9 git-gui--askyesno (mingw): use Git for Windows' icon, if available
212: 1d6b5dd = 210: 3e5153f unpack-trees: enable fscache for sparse-checkout
208: ed38c95 = 211: 6c49223 Merge branch 'git-gui-askyesno'
213: 37f714e = 212: b53a113 status: disable and free fscache at the end of the status command
214: 56a5418 = 213: 0a7a720 mem_pool: add GIT_TRACE_MEMPOOL support
215: f49c94f = 214: 6d562b4 fscache: fscache takes an initial size
216: 4f4bab1 = 215: 47a089d fscache: update fscache to be thread specific instead of global
217: 6cf5495 = 216: 2a2fb30 fscache: teach fscache to use mempool
218: b453371 = 217: b97d6fa fscache: make fscache_enable() thread safe
219: 0e16599 = 218: 6f78ac7 fscache: teach fscache to use NtQueryDirectoryFile
220: 92b7f11 = 219: 82cc369 fscache: remember the reparse tag for each entry
221: 6844e77 = 220: 2752ad3 Merge branch 'fscache'
222: 715fb4f = 221: aafa529 fscache: implement an FSCache-aware is_mount_point()
223: 4ff05bb = 222: 4762ce4 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
224: f000323 = 223: 367821d clean: make use of FSCache
225: 72acab3 = 224: 366ddb7 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
226: 558e24f = 225: 63bf80e Merge branch 'dont-clean-junctions-fscache'
227: 790a5df = 226: 95b0ac4 pack-objects (mingw): demonstrate a segmentation fault with large deltas
228: c6079fd = 227: 4a97693 mingw: support long paths
229: 71f544e = 228: 00330d0 win32(long path support): leave drive-less absolute paths intact
230: 78a47bb = 229: a1bfd0b compat/fsmonitor/fsm-*-win32: support long paths
231: 6b645bf = 230: 86b8197 clean: suggest using
core.longPathsif paths are too long to remove232: 9a0218c = 231: 382a0c9 mingw: Support
git_terminal_promptwith more terminals233: cd88b55 = 232: 9ce7d02 compat/terminal.c: only use the Windows console if bash 'read -r' fails
234: d7d76cd = 233: 7f83935 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
235: d45d79a = 234: 332bc09 Win32: symlink: move phantom symlink creation to a separate function
236: 9ec26e1 = 235: ca0af1d Introduce helper to create symlinks that knows about index_state
237: 4421289 = 236: 2e8832c mingw: allow to specify the symlink type in .gitattributes
238: 9496458 = 237: cf1ba0c Win32: symlink: add test for
symlinkattribute239: cc97060 = 238: 9cd9f9c mingw: explicitly specify with which cmd to prefix the cmdline
240: f27222f = 239: e94fb98 mingw: when path_lookup() failed, try BusyBox
241: 6543c42 = 240: b12f84b test-tool: learn to act as a drop-in replacement for
iconv242: a967730 = 241: 755ed3f tests(mingw): if
iconvis unavailable, usetest-helper --iconv243: f23c1c7 = 242: afc0300 gitattributes: mark .png files as binary
244: 21ca277 = 243: a0361a4 tests: move test PNGs into t/lib-diff/
245: 82ce39d = 244: 5530740 tests: only override sort & find if there are usable ones in /usr/bin/
246: 9c29847 = 245: 8d4dc28 tests: use the correct path separator with BusyBox
248: 08b8799 = 246: bf7f7cf mingw: only use Bash-ism
builtin pwd -Wwhen available250: c3cb56a = 247: 98f15f2 tests (mingw): remove Bash-specific pwd option
247: 3826c6a = 248: fca7262 mingw: introduce code to detect whether we're inside a Windows container
252: e6b121f = 249: 11356dc test-lib: add BUSYBOX prerequisite
249: 04a0cc5 = 250: a25ca74 mingw: when running in a Windows container, try to rename() harder
254: a5f4a8e = 251: 1d24bcf t5003: use binary file from t/lib-diff/
251: c0da64f = 252: 9adf0d5 mingw: move the file_attr_to_st_mode() function definition
258: df9de3c = 253: e315eb3 t5532: workaround for BusyBox on Windows
253: 346ab4e = 254: d1736d1 mingw: Windows Docker volumes are not symbolic links
260: 2402807 = 255: eb0ad75 t5605: special-case hardlink test for BusyBox-w32
255: e0c0e28 = 256: f841802 mingw: work around rename() failing on a read-only file
262: 45b7ac1 = 257: fd70aee t5813: allow for $PWD to be a Windows path
256: 51e8995 = 258: 45353cb Merge branch 'gitk-and-git-gui-patches'
257: ff0659e = 259: 219099d Merge branch 'long-paths'
259: f416311 = 260: da334f4 Merge branch 'msys2'
261: 72e8f5a = 261: 94f8018 Merge 'docker-volumes-are-no-symlinks'
263: 2dd9e41 = 262: bb181b7 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
264: 0fbf8d3 = 263: 57e7ee8 t9200: skip tests when $PWD contains a colon
265: bf2c23c = 264: 88b64f0 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
266: 7a8d2f7 = 265: 94fc894 Describe Git for Windows' architecture
267: e6b8291 = 266: c7cf9b6 mingw: kill child processes in a gentler way
268: 1e845ee = 267: 5fbcb88 mingw: optionally enable wsl compability file mode bits
269: b4c68c2 = 268: a9f582c Merge branch 'busybox-w32'
270: d801f7b = 269: 2c6bb86 Modify the Code of Conduct for Git for Windows
271: fcdbb4e = 270: 7a90079 mingw: really handle SIGINT
272: 702aa6a = 271: 400f349 Merge branch 'wsl-file-mode-bits'
273: f012a35 = 272: 895687f CONTRIBUTING.md: add guide for first-time contributors
274: ba4bc7d = 273: 2afe82d Partially un-revert "editor: save and reset terminal after calling EDITOR"
275: 2190243 = 274: 7eee99f Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
276: 6f6ecea = 275: 7dd8a95 README.md: Add a Windows-specific preamble
277: 9c54474 = 276: 4044778 reset: reinstate support for the deprecated --stdin option
278: 3fbf7fc = 277: acf3689 Merge branch 'un-revert-editor-save-and-reset'
279: d6183ce = 278: 3c988d3 Add an issue template
280: 7249591 = 279: 7857696 Add a GitHub workflow to monitor component updates
281: 123dfa7 = 280: 3e79b33 fsmonitor: reintroduce core.useBuiltinFSMonitor
282: e3d6547 = 281: 3756cfc Merge branch 'phase-out-reset-stdin'
283: 4b5391d = 282: 0577d75 Modify the GitHub Pull Request template (to reflect Git for Windows)
284: 44e1d3d = 283: 74fbd6c dependabot: help keeping GitHub Actions versions up to date
285: 3b26056 = 284: 8ef5389 Merge branch 'deprecate-core.useBuiltinFSMonitor'
286: a221f22 = 285: 41ac750 SECURITY.md: document Git for Windows' policies
287: 3304ece = 286: bd255f5 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
288: d1a2bad = 287: be7f922 Merge 'readme' into HEAD
289: c4621df = 288: ab05638 Add an AGENTS.md file to help with AI-assisted debugging/development
290: 10815da = 289: f747f4c fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
291: 080381f = 290: 68f6c6c fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
292: 5cbfda8 = 291: 1771b19 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
293: bd1317f = 292: 53f225b fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
294: e1451b1 = 293: 7391f0c fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
295: 0244e1d = 294: c4a3894 Add an AGENTS.md file to help with AI-assisted debugging/development (Add an AGENTS.md file to help with AI-assisted debugging/development git#6198)
296: 37685cd = 295: 98bd000 ??? t5563: add tests for http.emptyAuth with Negotiate
297: 7e542fc = 296: 689799c fixup! ci: work around a problem with HTTP/2 vs libcurl v8.10.0
298: 03fd252 = 297: a96eb87 fixup! revision: create mark_trees_uninteresting_dense()
299: 53d2a7a = 298: 26fd0ba Drop obsolete downstream patches (Drop obsolete downstream patches git#6208)
300: da657a7 = 299: 2165a94 maintenance(geometric): avoid deadlocks on Windows 10 (maintenance(geometric): avoid deadlocks on Windows 10 git#6215)
301: c59e5a2 = 300: 1348621 fixup! Add a GitHub workflow to verify that Git/Scalar work in Nano Server
302: 3bd2171 = 301: 40f9280 Update GitHub Actions versions used in the GitHub workflows (Update GitHub Actions versions used in the GitHub workflows git#6220)