Rebase shears/next: 1 conflict(s) (1 skipped, 0 resolved) (#25662111224)#156
Open
gitforwindowshelper[bot] wants to merge 303 commits into
Open
Rebase shears/next: 1 conflict(s) (1 skipped, 0 resolved) (#25662111224)#156gitforwindowshelper[bot] wants to merge 303 commits into
gitforwindowshelper[bot] wants to merge 303 commits into
Conversation
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>
The winsock2 library provides functions that work on different data types than file descriptors, therefore we wrap them. But that is not the only difference: they also do not set `errno` but expect the callers to enquire about errors via `WSAGetLastError()`. Let's translate that into appropriate `errno` values whenever the socket operations fail so that Git's code base does not have to change its expectations. This closes git-for-windows#2404 Helped-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
This patch introduces support to set special NTFS attributes that are interpreted by the Windows Subsystem for Linux as file mode bits, UID and GID. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and Philip Oakley. Helped-by: Clive Chan <cc@clive.io> Helped-by: Adric Norris <landstander668@gmail.com> Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com> Helped-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Brendan Forster <brendan@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Handle Ctrl+C in Git Bash nicely Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
…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>
…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
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>
…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
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>
…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
…updates Start monitoring updates of Git for Windows' component in the open
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>
…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>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
…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).
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.
This corresponds to gitgitgadget#2097.
…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>
When building with `make DEVELOPER=1` we explicitly pass "-std=gnu99" to
the compiler so that we don't start leaning on features exposed by more
recent versions of the C standard. Unfortunately though, glibc 2.43
started to use type-generic expressions. This works alright with GCC,
but when compiling with Clang this leads to errors:
$ make DEVELOPER=1 CC=clang
CC daemon.o
In file included from daemon.c:3:
./git-compat-util.h:344:11: error: '_Generic' is a C11 extension [-Werror,-Wc11-extensions]
344 | return !!strchr(path, '/');
| ^
/usr/include/string.h:265:3: note: expanded from macro 'strchr'
265 | __glibc_const_generic (S, const char *, strchr (S, C))
| ^
/usr/include/x86_64-linux-gnu/sys/cdefs.h:838:3: note: expanded from macro '__glibc_const_generic'
838 | _Generic (0 ? (PTR) : (void *) 1, \
| ^
In theory, the `__glibc_const_generic` macro does have feature gating:
#if !defined __cplusplus \
&& (__GNUC_PREREQ (4, 9) \
|| __glibc_has_extension (c_generic_selections) \
|| (!defined __GNUC__ && defined __STDC_VERSION__ \
&& __STDC_VERSION__ >= 201112L))
# define __HAVE_GENERIC_SELECTION 1
#else
# define __HAVE_GENERIC_SELECTION 0
#endif
But this feature gating isn't effective because `_has_extension()` will
always evaluate to true as C generics _are_ available as a language
extension to GNU C99 when using Clang. This would have been different if
`_has_feature()` was used instead, in which case it would have properly
evaluated to `false`.
Unfortunately, there is no easy way for us to work around the warning.
We cannot define `__HAVE_GENERIC_SELECTION` ourselves as that would lead
to a redefinition, and given that the conditions are or'd together we
cannot disable any of those, either.
Instead, work around the issue by not using -std=gnu99 with Clang when
using the Makefile and by disabling warnings about C11 extensions when
using Meson. This isn't ideal, but we at least retain the ability to
detect the (mis-)use of features from newer standards with GCC.
An alternative to this might be to simply bump the required C standard
to C11, which is 15 years old by now and should have support on most
platforms out there. But some more esoteric platforms may not have it.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…windows#6220) This includes gitgitgadget#2097 and a `fixup!` for a workflow that is not upstream (Nano Server).
…indows#6233) The `linux-{asan-ubsan,sha256,reftable}` jobs run inside `ubuntu:rolling`, which now resolves to Ubuntu 26.04 with glibc 2.43; that pulls `_Generic` into `<sys/cdefs.h>` and breaks our `-std=gnu99 -Werror` Clang builds. Concrete failure: https://github.com/git-for-windows/git/actions/runs/25390480083/job/74463338845. Picking up Patrick Steinhardt's fix from https://lore.kernel.org/git/20260505-b4-pks-ci-tolerate-glibc-generic-v1-1-5786386fe512@pks.im/ ahead of its upstream merge so the GfW CI goes green again. The diff conflicts with `fe5704a3695c "mimalloc: offer a build-time option to enable it"`, which wraps the affected `config.mak.dev` block in `ifndef USE_MIMALLOC`; the resolution preserves that wrap on the `gcc6`-only branch surviving Patrick's patch. `meson.build` auto-merged.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: next
From: 62cb552f76 (build: tolerate use of _Generic from glibc 2.43 with Clang (git-for-windows#6233), 2026-05-08) (444ae97691..62cb552f76)
Skipped: eb8ae7a (maintenance(geometric): avoid deadlocks on Windows 10 (git-for-windows#6215), 2026-04-28)
Upstream equivalent: 4bb086c (maintenance(geometric): do release the
.idxfiles before repacking, 2026-05-07)Range-diff
1: eb8ae7a ! 1: 4bb086c maintenance(geometric): avoid deadlocks on Windows 10 (maintenance(geometric): avoid deadlocks on Windows 10 git#6215)
To: 73f7e31554 (build: tolerate use of _Generic from glibc 2.43 with Clang (git-for-windows#6233), 2026-05-08) (6eb916d9ba..73f7e31554)
Statistics
Range-diff (click to expand)
1: accd546 = 1: 40e51b3 ci(dockerized): reduce the PID limit for private repositories
2: fa6bece = 2: 8cadda8 mingw: skip symlink type auto-detection for network share targets
3: f265984 = 3: c7fa5ae Merge branch 'fix-ci'
4: ffaa6fc = 4: dc67796 unix-socket: avoid leak when initialization fails
5: d0a4b33 = 5: 7dddf1f Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: 6993048 = 6: 10e39f5 grep: prevent
^$false match at end of file7: 20b7dfc = 7: 37ecc7e Merge branch 'v2.53.0.windows.3'
8: 5153090 = 8: 2e8ade1 Merge branch 'fixes-from-the-git-mailing-list'
9: 10dd98f = 9: 1d9ac80 t9350: point out that refs are not updated correctly
10: cb0b197 = 10: 36f694b transport-helper: add trailing --
11: c78fbbf = 11: 3e64122 remote-helper: check helper status after import/export
13: fb9abdd = 12: 1123167 Always auto-gc after calling a fast-import transport
14: e37ff15 = 13: 4403861 mingw: prevent regressions with "drive-less" absolute paths
16: 121aea6 = 14: afd700a vcpkg_install: detect lack of Git
17: fab25b8 = 15: d403329 vcpkg_install: add comment regarding slow network connections
18: cf2ba0d = 16: fafe728 vcbuild: install ARM64 dependencies when building ARM64 binaries
19: cb7165d = 17: c85bd37 vcbuild: add an option to install individual 'features'
20: 30ccbe2 = 18: 6ea8389 cmake: allow building for Windows/ARM64
21: 23bc8d6 = 19: 7add7c1 mingw: include the Python parts in the build
22: cf5b86d = 20: 7d8cb40 ci(vs-build) also build Windows/ARM64 artifacts
23: 2971667 = 21: 8eb18af win32/pthread: avoid name clashes with winpthread
24: 19c5a3d = 22: 3a6f282 Add schannel to curl installation
25: 7a52930 = 23: ac2a10c hash-object: demonstrate a >4GB/LLP64 problem
26: 1217332 = 24: c0b3b63 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
27: bdaa204 = 25: bc927e5 cmake(): allow setting HOST_CPU for cross-compilation
28: 84cc7dc = 26: b74ac60 object-file.c: use size_t for header lengths
29: 80052a7 = 27: 9fa98d5 Import the source code of mimalloc v2.2.7
30: 32d58ef = 28: 18f30f9 CMake: default Visual Studio generator has changed
31: 091d478 = 29: 4ac6c18 hash algorithms: use size_t for section lengths
32: 1cec28b = 30: 15b52c9 mimalloc: adjust for building inside Git
33: cabba6d = 31: e8d592f mingw: demonstrate a
git addissue with NTFS junctions34: 54665bd = 32: e9f6cca .gitignore: add Visual Studio CMakeSetting.json file
35: 8048ee7 = 33: 77e6ceb hash-object --stdin: verify that it works with >4GB/LLP64
36: af73df2 = 34: 5a661fe mimalloc: offer a build-time option to enable it
37: 0c5e5de = 35: 54ecdf4 t5505/t5516: allow running without
.git/branches/in the templates12: e9ac7bf = 36: 0da8512 clean: do not traverse mount points
38: 84285fe = 37: aba6294 strbuf_realpath(): use platform-dependent API if available
39: 44b60a2 = 38: e27e80b http: use new "best effort" strategy for Secure Channel revoke checking
40: 0865a28 = 39: a1e6cb5 subtree: update
contrib/subtreetesttarget41: c194d59 = 40: bf72700 CMakeLists: add default "x64-windows" arch for Visual Studio
42: f694743 = 41: 2e779f4 hash-object: add another >4GB/LLP64 test case
43: c65b7f2 = 42: 3da9d0a setup: properly use "%(prefix)/" when in WSL
44: cdfd991 = 43: 4ffaaca mingw: use mimalloc
45: 481381a = 44: 812d15b t5505/t5516: fix white-space around redirectors
15: 01c4a79 = 45: 6b5417c clean: remove mount points when possible
47: 14f821f = 46: 0796df9 transport: optionally disable side-band-64k
48: a486125 = 47: 9a6e178 mingw: fix fatal error working on mapped network drives on Windows
49: fcb8abc = 48: 0b96c57 clink.pl: fix MSVC compile script to handle libcurl-d.lib
50: f8d5d9a = 49: bfc1de7 mingw: implement a platform-specific
strbuf_realpath()51: 8d56f48 = 50: e618438 t3701: verify that we can add lots of files interactively
52: 6c5f6f1 = 51: 0be532c commit: accept "scissors" with CR/LF line endings
53: 52ca618 = 52: 08c7fb8 t0014: fix indentation
54: bd35465 = 53: 976866e git-gui: accommodate for intent-to-add files
55: 716b0d7 = 54: ec43e11 mingw: allow for longer paths in
parse_interpreter()56: c548af7 = 55: 121b3e0 compat/vcbuild: document preferred way to build in Visual Studio
57: 14571ef = 56: 2c52df3 http: optionally send SSL client certificate
58: 5df38d7 = 57: 5502587 ci: run
contrib/subtreetests in CI builds59: 1047f01 = 58: eda3dc7 CMake: show Win32 and Generator_platform build-option values
60: 4f2be76 = 59: 5804660 hash-object: add a >4GB/LLP64 test case using filtered input
61: 69c5db3 = 60: bfb5871 compat/mingw.c: do not warn when failing to get owner
62: b36a3e4 = 61: fcd0eb8 mingw: $env:TERM="xterm-256color" for newer OSes
63: 599d40a = 62: bd1f19a winansi: check result and Buffer before using Name
64: cd12119 = 63: d014854 windows: skip linking
git-<command>for built-ins65: b4b58a2 = 64: d633d24 mingw: stop hard-coding
CC = gcc66: 462d7da = 65: b5c4778 mingw: drop the -D_USE_32BIT_TIME_T option
67: 1dfeb23 = 66: b7fc36e mingw: only use -Wl,--large-address-aware for 32-bit builds
68: 31726d8 = 67: 44708b6 mingw: avoid over-specifying
--pic-executable69: a41ed44 = 68: f5eb08f mingw: set the prefix and HOST_CPU as per MSYS2's settings
70: 0196dd7 = 69: 9dda54f mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
71: 830e1ee = 70: 41dfdea mingw: rely on MSYS2's metadata instead of hard-coding it
72: 5ef324d = 71: db9331d mingw: always define
ETC_*for MSYS2 environments73: 2468846 = 72: 76b012f max_tree_depth: lower it for clang builds in general on Windows
74: 65b62eb = 73: 02bafaa mingw: ensure valid CTYPE
75: 488400c = 74: 590ebc5 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
76: f94b5c9 = 75: b1ba6b6 mingw: allow
git.exeto be used instead of the "Git wrapper"77: ef58814 = 76: 7265f77 revision: create mark_trees_uninteresting_dense()
78: eca7165 = 77: a972e60 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
79: 3ca3b22 = 78: 9a788fe survey: stub in new experimental 'git-survey' command
80: fb15bfc = 79: fef724d Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
81: 65a264f = 80: 894cd82 survey: add command line opts to select references
82: 59a23b4 = 81: 024c92e clink.pl: fix libexpatd.lib link error when using MSVC
83: b07760d = 82: 125da61 survey: start pretty printing data in table form
84: 28c5854 = 83: 5ca8038 Makefile: clean up .ilk files when MSVC=1
85: 8c9561e = 84: 6d51103 survey: add object count summary
86: 8c9577c = 85: 0d0b424 vcbuild: add support for compiling Windows resource files
87: fec880b = 86: b6eaf19 survey: summarize total sizes by object type
88: 6da1f31 = 87: c34a253 config.mak.uname: add git.rc to MSVC builds
89: 79a4c64 = 88: 33b516e MinGW: link as terminal server aware
90: 87a90c2 = 89: 38ed582 survey: show progress during object walk
91: 592ff4b = 90: 6899816 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
92: 158cf32 = 91: 50648ce http: optionally load libcurl lazily
93: c14edc3 = 92: 6916947 survey: add ability to track prioritized lists
97: 717b081 = 93: 50ece24 mingw: make sure
errnois set correctly when socket operations fail94: 03c924c = 94: ba06e70 clink.pl: move default linker options for MSVC=1 builds
95: 33b5b92 = 95: 5233b5d http: support lazy-loading libcurl also on Windows
96: e84e9e5 = 96: ef984b1 survey: add report of "largest" paths
101: 9a15b52 = 97: 40aa5df compat/mingw: handle WSA errors in strerror
46: de010f7 = 98: c173247 Add config option
windows.appendAtomically98: 02aab4a = 99: 0245a1d cmake: install headless-git.
99: e65617a = 100: 6b962c7 http: when loading libcurl lazily, allow for multiple SSL backends
100: acd3afe = 101: cb183cf survey: add --top= option and config
137: 272d966 = 102: 3ada532 compat/mingw: drop outdated comment
102: b9a1188 = 103: 29e8b54 mingw: change core.fsyncObjectFiles = 1 by default
103: 8efc195 = 104: 7759721 Fix Windows version resources
104: f14b148 = 105: e9c9c5a status: fix for old-style submodules with commondir
105: f8c5312 = 106: 514bbb8 git.rc: include winuser.h
106: 70558ce = 107: 0a4ec9d mingw: do load libcurl dynamically by default
107: b6572df = 108: d66a4fd Add a GitHub workflow to verify that Git/Scalar work in Nano Server
108: ef4f6fc = 109: 4ba8f73 mingw: suggest
windows.appendAtomicallyin more cases109: 3294084 = 110: 9b12b55 win32: use native ANSI sequence processing, if possible
110: 923948d = 111: f667769 common-main.c: fflush stdout buffer upon exit
111: f6b7897 = 112: 72ad048 t5601/t7406(mingw): do run tests with symlink support
112: ffdab07 = 113: 3e30238 win32: ensure that
localtime_r()is declared even in i686 builds113: 71188be = 114: 8b833ae Fallback to AppData if XDG_CONFIG_HOME is unset
114: aabfd72 = 115: 672e2ca run-command: be helpful with Git LFS fails on Windows 7
115: 9cf3dd5 = 116: fd4e1b3 survey: clearly note the experimental nature in the output
116: fe837d6 = 117: e46962f Merge 'remote-hg-prerequisites' into HEAD
117: f9c34a6 = 118: 65950b3 Merge branch 'drive-prefix'
118: 9b59065 = 119: 36c0768 Merge branch 'dont-clean-junctions'
119: e8047a0 = 120: 5d9ee77 Merge branch 'msys2-python'
120: 5837bcb = 121: c1e0d56 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
121: 9de0fe8 = 122: 8f3941f Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
122: b4a49af = 123: 84ce3ac Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
123: 5a7eff1 = 124: d4769ae Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
124: ab163a1 = 125: a3040c7 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction125: 6a5b518f22 = 126: dfa53af Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
126: 49bfad4 = 127: 9bc0373 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
127: 9231bc4 = 128: cdfde0d Merge 'add-p-many-files'
128: e24bc5f = 129: d31dbac Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
129: 050fd0e = 130: 20bb046 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
130: a245be1 = 131: cad9436 Merge 'git-gui/js/intent-to-add'
131: 39a9af4 = 132: f29be8e Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
132: 91973a0 = 133: dcf87e8 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
134: 315e311 = 134: b534432 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
136: a032704 = 135: 30b4381 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path139: ac44ee5 = 136: 6b856d7 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
142: 2e46ce9 = 137: 3879bf1 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
133: fb600af = 138: 4a2425d t5563: verify that NTLM authentication works
150: de6e3b8 = 139: 1647cf3 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests135: 721c22a = 140: 8cb6154 http: disallow NTLM authentication by default
151: 4a1211d = 141: f718816 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
138: fa0fce3 = 142: 27150fc http: warn if might have failed because of NTLM
152: 162ac19 = 143: 95ca4ee Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t140: 7035b73 = 144: 00c4264 t0301: actually test credential-cache on Windows
141: 0402dad = 145: 1f2c9d0 credential: advertise NTLM suppression and allow helpers to re-enable
153: 291c7f5 = 146: 04749cc Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory143: 637febd = 147: 06d909a credential-cache: handle ECONNREFUSED gracefully
144: dcd155e = 148: 1abe28c reftable: do make sure to use custom allocators
145: c000e44 = 149: 26dead6 check-whitespace: avoid alerts about upstream commits
146: ec76b23 = 150: 856c0a2 t/t5571-prep-push-hook.sh: Add test with writing to stderr
147: 25c79bc = 151: 79f0099 dir: do not traverse mount points
148: b09af3c = 152: 20c2661 win32: thread-utils: handle multi-socket systems
149: 07cc985 = 153: a5aaa92 t5563: add tests for http.emptyAuth with Negotiate
154: 843f0de = 154: e9a744c Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
155: 4b8070b = 155: 3fda21e Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
156: 304effb = 156: 54a9609 Merge branch 'optionally-dont-append-atomically-on-windows'
157: 8a32067 = 157: 4d5e52d Merge branch 'fsync-object-files-always'
158: 5c884fb = 158: 2689ea9 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
159: 7c96ad4 = 159: 8454561 Fix Windows version resources (Fix Windows version resources git#4092)
160: 5016b3c = 160: f3b35b7 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
161: 7d07264 = 161: b9f6022 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)162: 4e4e242 = 162: b3d43ea Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)163: e0766f3 = 163: 1873ce9 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283164: 0f66d18 = 164: 85416d4 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
165: 664864d = 165: 1b039f7 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
166: 53dcb66 = 166: cbbe087 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: f6177f1 = 167: 37d1a85 Merge branch 'nano-server'
168: 246b039 = 168: e2a2ac0 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
169: 99ed4d4 = 169: e60a67e win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
170: 707b1b1 = 170: f198380 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
171: 9253e55 = 171: c7a4afd Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
172: e53a21b = 172: 7ecbafc Merge branch 'Fix-i686-build-with-GCC-v14'
173: 1cc71ba = 173: c15b295 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
174: 7b16ea6 = 174: 102e29f Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
175: f4950a2 = 175: 7235deb pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
176: 88ec6ee = 176: f54520a 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: 791b051 = 177: 5832e55 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
178: 825911c = 178: dbbcadd credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
179: a7f5883 = 179: 4905f1a Merge branch 'reftable-vs-custom-allocators'
180: 6478075 = 180: 0ae5268 Merge branch 'check-whitespace-only-downstream'
181: e7bc3de = 181: b430c88 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: 208bad4 = 182: 6dc16e8 Merge branch 'disallow-ntlm-auth-by-default'
183: ece7a78 = 183: 38922c7 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)184: e7ec62a = 184: 38b50b9 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
185: 590307f = 185: 4f5f5de http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
186: d077d54 = 186: 65e5973 Merge branch 'ready-for-upstream'
187: def1f76 = 187: 6e85186 ci(macos): skip the
git p4tests188: eff3a83 = 188: 70855c0 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)208: 5b94055 = 189: a28f32d git-gui--askyesno: fix funny text wrapping
210: b1b71db = 190: 186fab2 git-gui--askyesno (mingw): use Git for Windows' icon, if available
189: f1b6da0 = 191: 3e2ccb9 Win32: make FILETIME conversion functions public
190: 75bdf3a = 192: 53258b2 Win32: dirent.c: Move opendir down
191: ab3a0df = 193: c3f7536 mingw: make the dirent implementation pluggable
192: a0ecbc6 = 194: 8942875 Win32: make the lstat implementation pluggable
193: 25f528c = 195: 70b6758 mingw: add infrastructure for read-only file system level caches
194: b44f33c = 196: 84df0e3 mingw: add a cache below mingw's lstat and dirent implementations
195: b1cc521 = 197: 4c867f1 fscache: load directories only once
196: 1896b76 = 198: 2822e62 fscache: add key for GIT_TRACE_FSCACHE
197: 8c72112 = 199: 0da7890 fscache: remember not-found directories
198: 4d37e05 = 200: 6c35189 fscache: add a test for the dir-not-found optimization
199: 3b76032 = 201: 1c00233 add: use preload-index and fscache for performance
200: 0ffbbb5 = 202: 49f7af3 dir.c: make add_excludes aware of fscache during status
201: a304d4d = 203: ff2f3d3 fscache: make fscache_enabled() public
202: c3e1a3d = 204: 3ac53e2 dir.c: regression fix for add_excludes with fscache
203: 45b0f23 = 205: b33bbe1 fetch-pack.c: enable fscache for stats under .git/objects
204: 1452a22 = 206: fe00f15 checkout.c: enable fscache for checkout again
205: 08d3402 = 207: d0be802 Enable the filesystem cache (fscache) in refresh_index().
206: 03fce67 = 208: 049291a fscache: use FindFirstFileExW to avoid retrieving the short name
207: b2f283a = 209: c6778c2 fscache: add GIT_TEST_FSCACHE support
209: 2c13842 = 210: dc633c6 fscache: add fscache hit statistics
211: ef1c064 = 211: c6e4876 unpack-trees: enable fscache for sparse-checkout
213: 19daa8d = 212: 5243490 status: disable and free fscache at the end of the status command
214: 281c979 = 213: 6dc7941 mem_pool: add GIT_TRACE_MEMPOOL support
215: 75328dc = 214: 2d8a2b7 fscache: fscache takes an initial size
216: 38a0681 = 215: ccffac6 fscache: update fscache to be thread specific instead of global
217: ef30bd3 = 216: 6bf1177 fscache: teach fscache to use mempool
218: a5f62fa = 217: 5e4ce4f fscache: make fscache_enable() thread safe
219: e709bab = 218: 9514bd0 fscache: teach fscache to use NtQueryDirectoryFile
220: f00d7cb = 219: 1ea9289 fscache: remember the reparse tag for each entry
221: 7d05c3f = 220: 4e8f446 Merge branch 'fscache'
222: a313fae = 221: ff7333b fscache: implement an FSCache-aware is_mount_point()
223: dd7eace = 222: 7d7564e 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: 058b7b4 = 223: eb47a94 clean: make use of FSCache
225: c04f472 = 224: db2c9cd Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
226: b737517 = 225: 77dc170 Merge branch 'dont-clean-junctions-fscache'
227: 1199224 = 226: 1760d05 pack-objects (mingw): demonstrate a segmentation fault with large deltas
228: 5f7ad5d ! 227: 87e3fe1 mingw: support long paths
229: 2f106a5 = 228: 24c4794 win32(long path support): leave drive-less absolute paths intact
230: 6cfb8f9 = 229: 969c804 compat/fsmonitor/fsm-*-win32: support long paths
231: d0418fe = 230: 7786cb3 clean: suggest using
core.longPathsif paths are too long to remove232: 2dda910 = 231: c64c930 mingw: Support
git_terminal_promptwith more terminals233: 216e756 = 232: 9ad57ad compat/terminal.c: only use the Windows console if bash 'read -r' fails
234: 89b9b5b = 233: 2a77d26 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
235: 78eba84 = 234: d896355 Win32: symlink: move phantom symlink creation to a separate function
236: 05d23ee = 235: 1c88433 Introduce helper to create symlinks that knows about index_state
237: 85e593c = 236: ab1e7d8 mingw: allow to specify the symlink type in .gitattributes
250: 428eae0 = 237: c76fbb7 mingw: introduce code to detect whether we're inside a Windows container
238: e80e193 = 238: 7f15dc7 Win32: symlink: add test for
symlinkattribute252: 5486907 = 239: 1793735 mingw: when running in a Windows container, try to rename() harder
239: add6fe0 = 240: edba2aa mingw: explicitly specify with which cmd to prefix the cmdline
254: ea4bfd4 = 241: d66df66 mingw: move the file_attr_to_st_mode() function definition
240: 5dd95be = 242: 3682db1 mingw: when path_lookup() failed, try BusyBox
256: 56e83a1 = 243: 379215c mingw: Windows Docker volumes are not symbolic links
241: 5e76a91 = 244: c30a767 test-tool: learn to act as a drop-in replacement for
iconv212: 0ae6b65 = 245: e6d76ac Merge branch 'git-gui-askyesno'
258: 25f3644 = 246: 89c62f5 mingw: work around rename() failing on a read-only file
242: 3096ca6 = 247: 5da4f26 tests(mingw): if
iconvis unavailable, usetest-helper --iconv243: 0d07384 = 248: a701835 gitattributes: mark .png files as binary
244: 7fb1d13 = 249: 01c590c tests: move test PNGs into t/lib-diff/
245: 91cfbaa = 250: 6a536a3 tests: only override sort & find if there are usable ones in /usr/bin/
246: 283dd14 = 251: 07d3c63 tests: use the correct path separator with BusyBox
247: ea7dc63 = 252: b631b95 mingw: only use Bash-ism
builtin pwd -Wwhen available248: 85bd480 = 253: d585b6a tests (mingw): remove Bash-specific pwd option
249: a39fcee = 254: abd4ab5 test-lib: add BUSYBOX prerequisite
260: b363a16 = 255: b769b66 Merge branch 'gitk-and-git-gui-patches'
251: bcd94d2 = 256: aec4c10 t5003: use binary file from t/lib-diff/
261: ea6f328 = 257: 33da010 Merge branch 'long-paths'
253: 87a32c9 = 258: 2738b38 t5532: workaround for BusyBox on Windows
262: 1a5aaf6 = 259: 99cbafd Merge branch 'msys2'
255: 0c9c773 = 260: 3f524f9 t5605: special-case hardlink test for BusyBox-w32
263: 2db3975 = 261: a52e792 Merge 'docker-volumes-are-no-symlinks'
266: c45f265 = 262: 059703f Describe Git for Windows' architecture
257: 403bd85 = 263: caa10f7 t5813: allow for $PWD to be a Windows path
264: 25a3434 = 264: 3fa96d0 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
270: c2a460a = 265: 5c34506 Modify the Code of Conduct for Git for Windows
259: bf98706 = 266: 27eff54 t9200: skip tests when $PWD contains a colon
265: 9bec6c1 = 267: c34caf2 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
273: 217de6e = 268: bcc18af CONTRIBUTING.md: add guide for first-time contributors
267: c221dad = 269: ae77533 mingw: kill child processes in a gentler way
268: b072b27 = 270: 43601ca mingw: optionally enable wsl compability file mode bits
269: a5b42a8 = 271: 9ea99f0 Merge branch 'busybox-w32'
276: 7d05e4c = 272: 92dc8f2 README.md: Add a Windows-specific preamble
271: eee33df = 273: 4d88e8c mingw: really handle SIGINT
272: f51689e = 274: 3febce9 Merge branch 'wsl-file-mode-bits'
279: 580aff3 = 275: f89b5eb Add an issue template
274: 1111309 = 276: b63c5e9 Partially un-revert "editor: save and reset terminal after calling EDITOR"
275: afde87a = 277: 1f3ce90 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
280: 34cf2ce = 278: 4608017 Add a GitHub workflow to monitor component updates
283: d4e09b1 = 279: 1f81a98 Modify the GitHub Pull Request template (to reflect Git for Windows)
277: e8d55d4 = 280: 53ae825 reset: reinstate support for the deprecated --stdin option
278: afb6220 = 281: f03cda1 Merge branch 'un-revert-editor-save-and-reset'
281: ac3352b = 282: d9b1a5f fsmonitor: reintroduce core.useBuiltinFSMonitor
284: 2345b9d = 283: 036587f dependabot: help keeping GitHub Actions versions up to date
286: 2585fdc = 284: e00b853 SECURITY.md: document Git for Windows' policies
282: 70eb996 = 285: ed56d3a Merge branch 'phase-out-reset-stdin'
285: 903e535 = 286: 8e3dfa1 Merge branch 'deprecate-core.useBuiltinFSMonitor'
287: 5961dc1 = 287: 215c079 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
288: 26d506f = 288: 45b4741 Merge 'readme' into HEAD
289: 841085a = 289: 428f79d Add an AGENTS.md file to help with AI-assisted debugging/development
290: ac3ade7 = 290: 2889d70 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
291: 4ca6ee9 = 291: 6d937e6 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
292: 8c953ca = 292: 5915534 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
293: 038aa4f = 293: f4210f1 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
294: da5a874 = 294: 69bc53f fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
295: f051450 = 295: 5625354 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: 97d0e1c = 296: f9e2dd0 fixup! ci: work around a problem with HTTP/2 vs libcurl v8.10.0
297: 69cd919 = 297: e984df5 fixup! revision: create mark_trees_uninteresting_dense()
298: 6c3d2d9 = 298: 96020ee Drop obsolete downstream patches (Drop obsolete downstream patches git#6208)
299: eb8ae7a < -: ---------- maintenance(geometric): avoid deadlocks on Windows 10 (maintenance(geometric): avoid deadlocks on Windows 10 git#6215)
300: ca8922b = 299: 7fc7237 Merge branch 'pr-2097'
301: 0667d74 = 300: 201d4b9 fixup! Add a GitHub workflow to verify that Git/Scalar work in Nano Server
302: e6ec201 = 301: bea35f2 Update GitHub Actions versions used in the GitHub workflows (Update GitHub Actions versions used in the GitHub workflows git#6220)
303: e2ff54b = 302: aede3cb build: tolerate use of _Generic from glibc 2.43 with Clang
304: 62cb552 = 303: 73f7e31 build: tolerate use of _Generic from glibc 2.43 with Clang (build: tolerate use of _Generic from glibc 2.43 with Clang git#6233)