Rebase shears/main: 1 conflict(s) (0 skipped, 1 resolved) (#26713905065)#212
Open
gitforwindowshelper[bot] wants to merge 311 commits into
Open
Rebase shears/main: 1 conflict(s) (0 skipped, 1 resolved) (#26713905065)#212gitforwindowshelper[bot] wants to merge 311 commits into
gitforwindowshelper[bot] wants to merge 311 commits into
Conversation
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>
A change between versions 2.4.1 and 2.6.0 of the MSYS2 runtime modified how Cygwin's runtime (and hence Git for Windows' MSYS2 runtime derivative) handles locales: d16a56306d (Consolidate wctomb/mbtowc calls for POSIX-1.2008, 2016-07-20). An unintended side-effect is that "cold-calling" into the POSIX emulation will start with a locale based on the current code page, something that Git for Windows is very ill-prepared for, as it expects to be able to pass a command-line containing non-ASCII characters to the shell without having those characters munged. One symptom of this behavior: when `git clone` or `git fetch` shell out to call `git-upload-pack` with a path that contains non-ASCII characters, the shell tried to interpret the entire command-line (including command-line parameters) as executable path, which obviously must fail. This fixes git-for-windows#1036 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Ignore the `-fno-stack-protector` compiler argument when building with MSVC. This will be used in a later commit that needs to build a Win32 GUI app. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This implements the Windows-specific support code, because everything is slightly different on Windows, even loading shared libraries. Note: I specifically do _not_ use the code from `compat/win32/lazyload.h` here because that code is optimized for loading individual functions from various system DLLs, while we specifically want to load _many_ functions from _one_ DLL here, and distinctly not a system DLL (we expect libcurl to be located outside `C:\Windows\system32`, something `INIT_PROC_ADDR` refuses to work with). Also, the `curl_easy_getinfo()`/`curl_easy_setopt()` functions are declared as vararg functions, which `lazyload.h` cannot handle. Finally, we are about to optionally override the exact file name that is to be loaded, which is a goal contrary to `lazyload.h`'s design. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Since we are already walking our reachable objects using the path-walk API,
let's now collect lists of the paths that contribute most to different
metrics. Specifically, we care about
* Number of versions.
* Total size on disk.
* Total inflated size (no delta or zlib compression).
This information can be critical to discovering which parts of the
repository are causing the most growth, especially on-disk size. Different
packing strategies might help compress data more efficiently, but the toal
inflated size is a representation of the raw size of all snapshots of those
paths. Even when stored efficiently on disk, that size represents how much
information must be processed to complete a command such as 'git blame'.
The exact disk size seems to be not quite robust enough for testing, as
could be seen by the `linux-musl-meson` job consistently failing, possibly
because of zlib-ng deflates differently: t8100.4(git survey
(default)) was failing with a symptom like this:
TOTAL OBJECT SIZES BY TYPE
===============================================
Object Type | Count | Disk Size | Inflated Size
------------+-------+-----------+--------------
- Commits | 10 | 1523 | 2153
+ Commits | 10 | 1528 | 2153
Trees | 10 | 495 | 1706
Blobs | 10 | 191 | 101
- Tags | 4 | 510 | 528
+ Tags | 4 | 547 | 528
This means: the disk size is unlikely something we can verify robustly.
Since zlib-ng seems to increase the disk size of the tags from 528 to
547, we cannot even assume that the disk size is always smaller than the
inflated size. We will most likely want to either skip verifying the
disk size altogether, or go for some kind of fuzzy matching, say, by
replacing `s/ 1[45][0-9][0-9] / ~1.5k /` and `s/ [45][0-9][0-9] / ~½k /`
or something like that.
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Special-casing even more configurations simply does not make sense. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows wants to add `git.exe` to the users' `PATH`, without cluttering the latter with unnecessary executables such as `wish.exe`. To that end, it invented the concept of its "Git wrapper", i.e. a tiny executable located in `C:\Program Files\Git\cmd\git.exe` (originally a CMD script) whose sole purpose is to set up a couple of environment variables and then spawn the _actual_ `git.exe` (which nowadays lives in `C:\Program Files\Git\mingw64\bin\git.exe` for 64-bit, and the obvious equivalent for 32-bit installations). Currently, the following environment variables are set unless already initialized: - `MSYSTEM`, to make sure that the MSYS2 Bash and the MSYS2 Perl interpreter behave as expected, and - `PLINK_PROTOCOL`, to force PuTTY's `plink.exe` to use the SSH protocol instead of Telnet, - `PATH`, to make sure that the `bin` folder in the user's home directory, as well as the `/mingw64/bin` and the `/usr/bin` directories are included. The trick here is that the `/mingw64/bin/` and `/usr/bin/` directories are relative to the top-level installation directory of Git for Windows (which the included Bash interprets as `/`, i.e. as the MSYS pseudo root directory). Using the absence of `MSYSTEM` as a tell-tale, we can detect in `git.exe` whether these environment variables have been initialized properly. Therefore we can call `C:\Program Files\Git\mingw64\bin\git` in-place after this change, without having to call Git through the Git wrapper. Obviously, above-mentioned directories must be _prepended_ to the `PATH` variable, otherwise we risk picking up executables from unrelated Git installations. We do that by constructing the new `PATH` value from scratch, appending `$HOME/bin` (if `HOME` is set), then the MSYS2 system directories, and then appending the original `PATH`. Side note: this modification of the `PATH` variable is independent of the modification necessary to reach the executables and scripts in `/mingw64/libexec/git-core/`, i.e. the `GIT_EXEC_PATH`. That modification is still performed by Git, elsewhere, long after making the changes described above. While we _still_ cannot simply hard-link `mingw64\bin\git.exe` to `cmd` (because the former depends on a couple of `.dll` files that are only in `mingw64\bin`, i.e. calling `...\cmd\git.exe` would fail to load due to missing dependencies), at least we can now avoid that extra process of running the Git wrapper (which then has to wait for the spawned `git.exe` to finish) by calling `...\mingw64\bin\git.exe` directly, via its absolute path. Testing this is in Git's test suite tricky: we set up a "new" MSYS pseudo-root and copy the `git.exe` file into the appropriate location, then verify that `MSYSTEM` is set properly, and also that the `PATH` is modified so that scripts can be found in `$HOME/bin`, `/mingw64/bin/` and `/usr/bin/`. This addresses git-for-windows#2283 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Move the default `-ENTRY` and `-SUBSYSTEM` arguments for MSVC=1 builds from `config.mak.uname` into `clink.pl`. These args are constant for console-mode executables. Add support to `clink.pl` for generating a Win32 GUI application using the `-mwindows` argument (to match how GCC does it). This changes the `-ENTRY` and `-SUBSYSTEM` arguments accordingly. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
The previous commits introduced a compile-time option to load libcurl lazily, but it uses the hard-coded name "libcurl-4.dll" (or equivalent on platforms other than Windows). To allow for installing multiple libcurl flavors side by side, where each supports one specific SSL/TLS backend, let's first look whether `libcurl-<backend>-4.dll` exists, and only use `libcurl-4.dll` as a fall back. That will allow us to ship with a libcurl by default that only supports the Secure Channel backend for the `https://` protocol. This libcurl won't suffer from any dependency problem when upgrading OpenSSL to a new major version (which will change the DLL name, and hence break every program and library that depends on it). This is crucial because Git for Windows relies on libcurl to keep working when building and deploying a new OpenSSL package because that library is used by `git fetch` and `git clone`. Note that this feature is by no means specific to Windows. On Ubuntu, for example, a `git` built using `LAZY_LOAD_LIBCURL` will use `libcurl.so.4` for `http.sslbackend=openssl` and `libcurl-gnutls.so.4` for `http.sslbackend=gnutls`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The 'git survey' builtin provides several detail tables, such as "top files by on-disk size". The size of these tables defaults to 10, currently. Allow the user to specify this number via a new --top=<N> option or the new survey.top config key. Signed-off-by: Derrick Stolee <stolee@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>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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
…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
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>
This corresponds to gitgitgadget#2097.
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).
…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>
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.
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.
…-for-windows#6232) This closes two gaps in the current `AGENTS.md` that came up while drafting git-for-windows#6231 and git-for-windows#2104: 1. The `Fixup Commits` section only covered `fixup!`. `amend!` has different semantics (replaces the target's commit message and combines diffs to produce any final state), and the "amend! whose body is the upstream commit and whose diff aligns the squashed result with that upstream commit" pattern is precisely how the first commit of git-for-windows#6231 anticipates the in-flight nedmalloc removal in `seen` as `e576abb9f8`. That pattern is undocumented today. 2. There is no top-level "Contributing to Git for Windows" section, only "Contributing to Upstream Git via GitGitGadget". The cross-fork `gh pr create` invocation, the conditions under which a PR is naturally a fixup/amend-only series against existing thicket commits, and the upstream-aligning `amend!` shape were all things I inferred from context rather than the guide. Add subsections that cover those gaps. Nothing in the existing text changes.
mingw: stop using nedmalloc The vendored nedmalloc allocator under compat/nedmalloc/ has been unmaintained upstream for a very long time: the original repository at https://github.com/ned14/nedmalloc received its last commit on July 5, 2014, and was archived (made read-only) by its owner on March 15, 2019. Our copy has been carried forward unchanged ever since. The Git for Windows commit that introduced mimalloc as a replacement on Windows ("mingw: use mimalloc", 2019-06-24, present in the Git for Windows branch thicket but not upstream) already observed at that time that nedmalloc had ceased to see any updates for several years. This came to a head when the Git for Windows SDK upgraded to GCC 16: the `add_segment()` function in `compat/nedmalloc/malloc.c.h` declares `int nfences = 0` and only references it inside an `assert()`, which GCC 16 now flags as `-Wunused-but-set-variable`. Combined with the `-Werror` enabled by `DEVELOPER=1`, this turns into a hard build failure: compat/nedmalloc/malloc.c.h: In function 'add_segment': compat/nedmalloc/malloc.c.h:3897:7: error: variable 'nfences' set but not used [-Werror=unused-but-set-variable=] 3897 | int nfences = 0; | ^~~~~~~ cc1.exe: all warnings being treated as errors The same source built without complaint under GCC 15.2.0; the regression was bisected to the SDK package update at git-for-windows/git-sdk-64@188d93dd455 (`mingw-w64-x86_64-gcc 15.2.0-14 -> 16.1.0-1`), with the failing CI run captured at https://github.com/git-for-windows/git-sdk-64/actions/runs/25244795074. Rather than patch the unmaintained vendored sources to silence the warning, stop opting into nedmalloc altogether on MINGW. The platform allocator is what every non-MINGW build already uses, and a fresh build of git.git's master against a minimal Git for Windows SDK upgraded to GCC 16, with `USE_NED_ALLOCATOR` removed from the MINGW section, completes successfully. The compat/nedmalloc/ subtree itself is left in place to keep this change minimal; nothing in the build links against it any longer, so it can be removed in a follow-up if desired. Assisted-by: Claude Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Re-running the `git repack -adfq` benchmark from 6a29c2d ("mingw: use mimalloc", 2019-06-24) against the platform's *current* default allocator (so without `nedmalloc` in the picture at all) shows mimalloc is no longer faster than the system allocator on any of Windows, macOS, or Linux, neither for the original ~30-second `linux v2.6.20` workload nor for a 4x larger `linux v3.0` workload where each individual run takes ~2 minutes (and the noise floor on Linux is below 0.3% of the mean, so even small differences would be visible if any existed). `mimalloc` was originally chosen over nedmalloc, not over the system allocator. Six years on, with nedmalloc now being dropped from the codebase entirely, the allocator that mimalloc has to beat is whatever the OS ships by default; modern Windows segment-heap, glibc malloc, and the macOS libsystem allocator have all closed the gap, and there is no longer a measurable benefit to keep maintaining a custom allocator. The actual benchmark methodology, the per-platform numbers, and links to the workflow runs that produced them are spelled out in the PR description rather than repeated across each fixup. The `fixup!` subject is so that the next rebase against an upstream Git that already lacks this commit will autosquash this revert into the original (which becomes empty and is dropped), leaving the tree free of `mimalloc`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Part of the series that drops the vendored `mimalloc` from this fork; the rationale (no measurable speedup over the platform allocator on any of Windows, macOS, or Linux) is in the second commit of the series and the PR description. The `fixup!` subject is so the next rebase against an upstream Git that already lacks the target commit autosquashes this revert into it, dropping the original cleanly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Part of the series that drops the vendored `mimalloc` from this fork; the rationale (no measurable speedup over the platform allocator on any of Windows, macOS, or Linux) is in the second commit of the series and the PR description. The `fixup!` subject is so the next rebase against an upstream Git that already lacks the target commit autosquashes this revert into it, dropping the original cleanly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Part of the series that drops the vendored `mimalloc` from this fork; the rationale (no measurable speedup over the platform allocator on any of Windows, macOS, or Linux) is in the second commit of the series and the PR description. The `fixup!` subject is so the next rebase against an upstream Git that already lacks the target commit autosquashes this revert into it, dropping the original cleanly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Part of the series that drops the vendored `mimalloc` from this fork; the rationale (no measurable speedup over the platform allocator on any of Windows, macOS, or Linux) is in the second commit of the series and the PR description. The original commit was a preparation step for vendoring `mimalloc` in (which forces C11 mode under mingw-w64 GCC and so implicitly links libwinpthread, clashing with Git's own emulation). With `mimalloc` gone the rename is no longer needed, so this revert restores the plain `pthread_create` / `pthread_self` names. The `fixup!` subject is so the next rebase against an upstream Git that already lacks the target commit autosquashes this revert into it, dropping the original cleanly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When 6a29c2d ("mingw: use mimalloc", 2019-06-24) introduced the vendored mimalloc, the comparison was against `nedmalloc` (which by then had not seen an upstream commit since 2014, and whose repository was archived in 2019). The two were essentially at parity in that benchmark; mimalloc was chosen because it was actively developed. I do not really recall whether the platform's *default* allocator was not part of the comparison; If it was, the performance was still worse than mimalloc, if it wasn't, I forgot to test ;-) Six years on, with `nedmalloc` safely on its way to being dropped from the upstream codebase entirely (gitgitgadget#2104, currently in `seen` as e576abb), the question is no longer "mimalloc vs nedmalloc" but "mimalloc vs the OS allocator". Re-running the same `git repack -adfq` benchmark against each platform's current default allocator finds no measurable speedup from mimalloc on any of Windows, macOS, or Linux. ## Methods I recapitulated the same benchmark as cited in 6a29c2d (the original comparison was nedmalloc vs mimalloc on `git repack -adfq` over a subset of `linux.git`), now extended to the three GitHub-hosted runners (`ubuntu-latest`, `macos-latest`, `windows-latest`). Each job built two `git` binaries from the same source tree, vanilla and `USE_MIMALLOC=YesPlease`, then prepared a fresh bare clone of `linux.git` to a fixed `SHA`, and ran the repacks with both built `git`s in randomized order for five iterations. Each iteration ran both binaries exactly once on a freshly `copytree`-ed copy of the immutable template repository; the order *within* an iteration was randomized so any per-iteration confounder (cache state, runner warm-up, neighbour-VM contention) would be shared symmetrically between variants. Timings excluded the `copytree`. The full driver is the Python script `ci/bench-mimalloc.py` on the [`mimalloc-benchmark` branch](https://github.com/dscho/git/tree/mimalloc-benchmark/ci). ## Results: original `linux v2.6.20`-era workload (49,917 commits, 431,605 objects, ~204 MB pack) | Platform | vanilla mean ± stdev | mimalloc mean ± stdev | Δ (mimalloc − vanilla) | |---|---|---|---| | `ubuntu-latest` | 27.089s ± 0.060s | 27.041s ± 0.065s | −0.048s (−0.18%) | | `macos-latest` | 23.259s ± 1.206s | 25.076s ± 2.279s | +1.817s (+7.8%) | | `windows-latest` | 29.828s ± 1.651s | 30.329s ± 2.428s | +0.501s (+1.7%) | Workflow run: https://github.com/dscho/git/actions/runs/25374127848 ## Results: 4x larger `linux v3.0` workload (255,039 commits, 2,059,429 objects, ~788 MB pack) | Platform | vanilla mean ± stdev | mimalloc mean ± stdev | Δ (mimalloc − vanilla) | |---|---|---|---| | `ubuntu-latest` | 134.723s ± **0.329s** | 134.801s ± **0.191s** | +0.078s (+0.06%) | | `macos-latest` | 130.183s ± 19.098s | 133.292s ± 18.991s | +3.109s (+2.4%) | | `windows-latest` | 145.183s ± 1.272s | 146.271s ± 4.161s | +1.088s (+0.75%) | Workflow run: https://github.com/dscho/git/actions/runs/25376885309 ## Discussion The Linux numbers on the larger workload are particularly clear: stdev is below 0.3% of the mean for both variants, and the difference is well inside that floor. Glibc's allocator and the vendored mimalloc are statistically indistinguishable for `git repack -adfq` here. `windows-latest` runners are noisier (per-run variance ~1-4%, mostly neighbour-VM scheduling), but mimalloc never beats vanilla in either workload. With the original justification for keeping a custom allocator gone (the modern Windows segment-heap is no longer the slow Windows-XP-era `HeapAlloc` that drove the original 2009 nedmalloc adoption), there is nothing left to motivate the maintenance cost of a vendored allocator. `macos-latest` is too noisy at n=5 (stdev 14% of the mean) to draw a firm conclusion, but the visible point-estimate goes the wrong way and there is no plausible mechanism by which Apple's `libsystem_malloc` would be slower than mimalloc. ## What this PR does *not* do It does not by itself remove `nedmalloc` from the tree; that is still promised as a follow-up of the in-flight upstream patch gitgitgadget#2104, presently in `seen` as e576abb. The first commit here is an `amend!` whose autosquashed result is byte-identical to that upstream commit, so once the next merging-rebase picks up the upstream patch the two will collapse cleanly. The five remaining `fixup!` reverts target each of the original mimalloc-vendoring commits in reverse chronological order; once autosquashed, the pairs cancel out to empty commits which the rebase will drop, leaving the tree free of `compat/mimalloc/`, the `USE_MIMALLOC` build infrastructure, and the supporting changes (`compat/posix.h` `_DEFAULT_SOURCE` guard, `win32_pthread_*` renames) that only existed to support the vendored allocator.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: main
From: c26366f36c (Drop mimalloc (git-for-windows#6231), 2026-05-26) (ba4c40710e..c26366f36c)
Resolved: 869c34c (AGENTS.md: document
amend!, fixup-only PRs, and direct GfW PRs (git-for-windows#6232), 2026-05-26)Resolved by taking HEAD for all non-AGENTS.md files (upstream already integrated) and keeping the new amend!/fixup/contributing sections in AGENTS.md
Range-diff
1: 869c34c ! 1: 291162a AGENTS.md: document
amend!, fixup-only PRs, and direct GfW PRs (AGENTS.md: documentamend!, fixup-only PRs, and direct GfW PRs git#6232)@@ Commit message changes. ## AGENTS.md ## + remerge CONFLICT (add/add): Merge conflict in AGENTS.md + index 6a276bcd05..c60945448f 100644 + --- AGENTS.md + +++ AGENTS.md @@ AGENTS.md: gets squashed into. Run affected tests before finalizing. -+### `amend!` Commits -+ -+A `fixup!` commit keeps the target's commit message and merely combines -+its diff into the target. An `amend!` commit additionally **replaces** -+the target's commit message with its own body. Use `amend!` when the -+fix changes the meaning of the target sufficiently that the original -+subject or body is no longer accurate, or when the goal is to align a -+downstream commit with a specific upstream replacement. -+ -+The format is rigid: the first line of an `amend!` commit must be -+exactly `amend! <subject of target>`, followed by a blank line and then -+the **new** commit message that should replace the target's, starting -+with the new subject line: -+ -+``` -+amend! mingw: use mimalloc -+ -+mingw: stop using nedmalloc -+ -+The vendored nedmalloc allocator under compat/nedmalloc/ has been -+unmaintained upstream... -+``` -+ -+After autosquash, the resulting commit has the new subject (`mingw: -+stop using nedmalloc`), the new body, and a diff that is the -+composition of the target's diff and the `amend!`'s diff. Crafting the -+`amend!` diff so that the composition equals a known upstream commit's -+diff is the canonical way to align a downstream branch-thicket commit -+with an in-flight upstream replacement: when the next merging-rebase -+picks up the upstream commit, the byte-identical downstream commit -+collapses into it cleanly. -+ -+### PRs Composed Entirely of `fixup!` and `amend!` Commits -+ -+Adjusting or removing a feature that lives in the branch thicket is -+often best expressed as a PR that consists *only* of `fixup!` and -+`amend!` commits targeting the existing thicket commits. Each pair -+autosquashes during the next merging-rebase. Pairs whose diffs cancel -+exactly produce empty commits, which the rebase drops with -+`--empty=drop`. The end state is *as if the original commits had been -+edited or removed in place*, while preserving review-friendly atomic -+patches in the PR. -+ -+This is the preferred pattern for reverting a multi-commit downstream -+feature. Order the fixups in **reverse** of the originals so each -+revert applies cleanly to the worktree as you build the series. -+ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) +-================================ + ### `amend!` Commits + + A `fixup!` commit keeps the target's commit message and merely combines +@@ AGENTS.md: This is the preferred pattern for reverting a multi-commit downstream + feature. Order the fixups in **reverse** of the originals so each + revert applies cleanly to the worktree as you build the series. + +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) ### Common Adaptation Patterns **Struct field moves**: When upstream moves fields between structs, update @@ AGENTS.md: On Windows, `unsigned long` is 32 bits even on 64-bit systems. Use `s for sizes that may exceed 4GB. Be careful with format strings: use `PRIuMAX` with a cast for `size_t` values. -+## Contributing to Git for Windows -+ -+The primary contribution path for this fork is a PR against -+`git-for-windows/git`'s `main` branch. The repository is laid out as a -+branch thicket on top of an upstream Git base; see -+[Merging-Rebases](#merging-rebases) and -+[Analyzing Branch Thickets](#analyzing-branch-thickets) for the -+mechanics. -+ -+### Opening a PR -+ -+Push the topic branch to a personal fork on GitHub, then: -+ -+```bash -+gh pr create \ -+ --repo git-for-windows/git \ -+ --base main \ -+ --head <you>:<branch> \ -+ --title "<subject>" \ -+ --body-file <path/to/body.md> -+``` -+ -+Unlike upstream contributions, the PR body is rendered as Markdown on -+GitHub, not sent as email. Use the formatting that aids review: -+fenced code blocks, tables, links to workflow runs. -+ -+### When the PR Adjusts the Thicket Itself -+ -+If the PR's purpose is to edit, remove, or replace existing -+branch-thicket commits, the natural form is a series of `fixup!` or -+`amend!` commits targeting the affected originals. See -+[Fixup Commits](#fixup-commits), -+[`amend!` Commits](#amend-commits), and -+[PRs Composed Entirely of `fixup!` and `amend!` Commits](#prs-composed-entirely-of-fixup-and-amend-commits). -+The merging-rebase that produces the next `main` autosquashes these -+into the thicket; the PR exists for review of the individual -+adjustments. -+ -+### When an Upstream Patch Will Replace a Thicket Commit -+ -+If an upstream patch is in flight (for instance, on `gitgitgadget/git` -+in `seen` or `next`) that replaces a downstream thicket commit, an -+`amend!` commit whose body is a verbatim copy of the upstream commit -+message and whose diff aligns the autosquashed target with the -+upstream commit's diff is the canonical pattern. The next -+merging-rebase that picks up the upstream commit will recognize the -+two as byte-identical and collapse them. -+ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) +-================================ + ## Contributing to Git for Windows + + The primary contribution path for this fork is a PR against +@@ AGENTS.md: upstream commit's diff is the canonical pattern. The next + merging-rebase that picks up the upstream commit will recognize the + two as byte-identical and collapse them. + +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) ## Contributing to Upstream Git via GitGitGadget ### Overview + + ## Documentation/config/sideband.adoc ## + remerge CONFLICT (add/add): Merge conflict in Documentation/config/sideband.adoc + index 6007b5d4b2..96fade7f5f 100644 + --- Documentation/config/sideband.adoc + +++ Documentation/config/sideband.adoc +@@ Documentation/config/sideband.adoc: sideband.allowControlCharacters:: + By default, control characters that are delivered via the sideband + are masked, except ANSI color sequences. This prevents potentially + unwanted ANSI escape sequences from being sent to the terminal. Use +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + this config setting to override this behavior (the value can be + a comma-separated list of the following keywords): + + +@@ Documentation/config/sideband.adoc: sideband.allowControlCharacters:: + sideband.<url>.*:: + Apply the `sideband.*` option selectively to specific URLs. The + same URL matching logic applies as for `http.<url>.*` settings. +-======= +- this config setting to override this behavior: +-+ +--- +- color:: +- Allow ANSI color sequences, line feeds and horizontal tabs, +- but mask all other control characters. This is the default. +- false:: +- Mask all control characters other than line feeds and +- horizontal tabs. +- true:: +- Allow all control characters to be sent to the terminal. +--- +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + + ## Makefile ## + remerge CONFLICT (content): Merge conflict in Makefile + index 01fb643622..0c136b7430 100644 + --- Makefile + +++ Makefile +@@ Makefile: CLAR_TEST_SUITES += u-hashmap + CLAR_TEST_SUITES += u-list-objects-filter-options + CLAR_TEST_SUITES += u-mem-pool + CLAR_TEST_SUITES += u-mingw +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + CLAR_TEST_SUITES += u-odb-inmemory +-======= +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + CLAR_TEST_SUITES += u-oid-array + CLAR_TEST_SUITES += u-oidmap + CLAR_TEST_SUITES += u-oidtree +@@ Makefile: $(MIMALLOC_OBJS): COMPAT_CFLAGS += \ + endif + endif + +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + +-======= +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + ifdef OVERRIDE_STRDUP + COMPAT_CFLAGS += -DOVERRIDE_STRDUP + COMPAT_OBJS += compat/strdup.o + + ## compat/mingw.c ## + remerge CONFLICT (content): Merge conflict in compat/mingw.c + index 8d94cae59c..940243e0a3 100644 + --- compat/mingw.c + +++ compat/mingw.c +@@ compat/mingw.c: int mingw_unlink(const char *pathname, int handle_in_use_error) + return -1; + + if (use_legacy_delete < 0) +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + use_legacy_delete = git_env_bool("GIT_TEST_LEGACY_DELETE", 0); +-======= +- use_legacy_delete = !!getenv("GIT_TEST_LEGACY_DELETE"); +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + + if (try_delete_file(wpathname, use_legacy_delete)) + return 0; + + ## config.mak.dev ## + remerge CONFLICT (content): Merge conflict in config.mak.dev + index d8e26e34bb..9906065b15 100644 + --- config.mak.dev + +++ config.mak.dev +@@ config.mak.dev: endif + endif + + ifneq ($(uname_S),FreeBSD) +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + ifneq ($(filter gcc6,$(COMPILER_FEATURES)),) +-======= +-ifneq ($(or $(filter gcc6,$(COMPILER_FEATURES)),$(filter clang7,$(COMPILER_FEATURES))),) +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + ifndef USE_MIMALLOC + DEVELOPER_CFLAGS += -std=gnu99 + endif + + ## contrib/buildsystems/CMakeLists.txt ## + remerge CONFLICT (content): Merge conflict in contrib/buildsystems/CMakeLists.txt + index 655e4d5228..9077b187e5 100644 + --- contrib/buildsystems/CMakeLists.txt + +++ contrib/buildsystems/CMakeLists.txt +@@ contrib/buildsystems/CMakeLists.txt: if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + add_compile_definitions(HAVE_ALLOCA_H NO_POSIX_GOODIES NATIVE_CRLF NO_UNIX_SOCKETS WIN32 + _CONSOLE DETECT_MSYS_TTY STRIP_EXTENSION=".exe" NO_SYMLINK_HEAD UNRELIABLE_FSTAT + NOGDI OBJECT_CREATION_MODE=1 __USE_MINGW_ANSI_STDIO=0 +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + OVERRIDE_STRDUP MMAP_PREVENTS_DELETE USE_WIN32_MMAP +-======= +- USE_NED_ALLOCATOR OVERRIDE_STRDUP MMAP_PREVENTS_DELETE USE_WIN32_MMAP +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + HAVE_WPGMPTR HAVE_RTLGENRANDOM) + if(CMAKE_GENERATOR_PLATFORM STREQUAL "x64") + add_compile_definitions(ENSURE_MSYSTEM_IS_SET="MINGW64" MINGW_PREFIX="mingw64") +@@ contrib/buildsystems/CMakeLists.txt: if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + compat/win32/trace2_win32_process_info.c + compat/win32/dirent.c + compat/win32/wsl.c +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) +-======= +- compat/nedmalloc/nedmalloc.c +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + compat/strdup.c + compat/win32/fscache.c) + set(NO_UNIX_SOCKETS 1) + + ## sideband.c ## + remerge CONFLICT (content): Merge conflict in sideband.c + index 20fd644398..1523a53e1d 100644 + --- sideband.c + +++ sideband.c +@@ sideband.c: static struct keyword_entry keywords[] = { + }; + + static enum { +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + ALLOW_CONTROL_SEQUENCES_UNSET = -1, + ALLOW_NO_CONTROL_CHARACTERS = 0, + ALLOW_ANSI_COLOR_SEQUENCES = 1<<0, +@@ sideband.c: void sideband_apply_url_config(const char *url) + string_list_clear(&config.vars, 1); + urlmatch_config_release(&config); + } +-======= +- ALLOW_NO_CONTROL_CHARACTERS = 0, +- ALLOW_ALL_CONTROL_CHARACTERS = 1, +- ALLOW_ANSI_COLOR_SEQUENCES = 2 +-} allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + + /* Returns a color setting (GIT_COLOR_NEVER, etc). */ + static enum git_colorbool use_sideband_colors(void) +@@ sideband.c: static enum git_colorbool use_sideband_colors(void) + if (use_sideband_colors_cached != GIT_COLOR_UNKNOWN) + return use_sideband_colors_cached; + +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + if (allow_control_characters == ALLOW_CONTROL_SEQUENCES_UNSET) { + if (!repo_config_get_value(the_repository, "sideband.allowcontrolcharacters", &value)) + sideband_allow_control_characters_config("sideband.allowcontrolcharacters", value); + + if (allow_control_characters == ALLOW_CONTROL_SEQUENCES_UNSET) + allow_control_characters = ALLOW_DEFAULT_ANSI_SEQUENCES; +-======= +- switch (repo_config_get_maybe_bool(the_repository, "sideband.allowcontrolcharacters", &i)) { +- case 0: /* Boolean value */ +- allow_control_characters = i ? ALLOW_ALL_CONTROL_CHARACTERS : +- ALLOW_NO_CONTROL_CHARACTERS; +- break; +- case -1: /* non-Boolean value */ +- if (repo_config_get_string_tmp(the_repository, "sideband.allowcontrolcharacters", +- &value)) +- ; /* huh? `get_maybe_bool()` returned -1 */ +- else if (!strcmp(value, "color")) +- allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; +- else +- warning(_("unrecognized value for `sideband." +- "allowControlCharacters`: '%s'"), value); +- break; +- default: +- break; /* not configured */ +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + } + + if (!repo_config_get_string_tmp(the_repository, key, &value)) +@@ sideband.c: void list_config_color_sideband_slots(struct string_list *list, const char *pref + list_config_item(list, prefix, keywords[i].keyword); + } + +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + static int handle_ansi_sequence(struct strbuf *dest, const char *src, int n) +-======= +-static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int n) +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + { + int i; + +@@ sideband.c: static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int + * Valid ANSI color sequences are of the form + * + * ESC [ [<n> [; <n>]*] m +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + * + * These are part of the Select Graphic Rendition sequences which + * contain more than just color sequences, for more details see +@@ sideband.c: static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int + strchr("ABCDEFGHf", src[i])) || + ((allow_control_characters & ALLOW_ANSI_ERASE) && + strchr("JKMPX", src[i]))) { +-======= +- */ +- +- if (allow_control_characters != ALLOW_ANSI_COLOR_SEQUENCES || +- n < 3 || src[0] != '\x1b' || src[1] != '[') +- return 0; +- +- for (i = 2; i < n; i++) { +- if (src[i] == 'm') { +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + strbuf_add(dest, src, i + 1); + return i; + } +@@ sideband.c: static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) + { + int i; + +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + if ((allow_control_characters & ALLOW_ALL_CONTROL_CHARACTERS)) { +-======= +- if (allow_control_characters == ALLOW_ALL_CONTROL_CHARACTERS) { +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + strbuf_add(dest, src, n); + return; + } + + strbuf_grow(dest, n); + for (; n && *src; src++, n--) { +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + if (!iscntrl(*src) || *src == '\t' || *src == '\n') { + strbuf_addch(dest, *src); + } else if (allow_control_characters != ALLOW_NO_CONTROL_CHARACTERS && + (i = handle_ansi_sequence(dest, src, n))) { +-======= +- if (!iscntrl(*src) || *src == '\t' || *src == '\n') +- strbuf_addch(dest, *src); +- else if ((i = handle_ansi_color_sequence(dest, src, n))) { +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + src += i; + n -= i; + } else { + strbuf_addch(dest, '^'); +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + strbuf_addch(dest, *src == 0x7f ? '?' : 0x40 + *src); +-======= +- strbuf_addch(dest, 0x40 + *src); +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + } + } + } + + ## t/meson.build ## + remerge CONFLICT (content): Merge conflict in t/meson.build + index 6b22f6da9e..bd4b2e9c69 100644 + --- t/meson.build + +++ t/meson.build +@@ t/meson.build: clar_test_suites = [ + 'unit-tests/u-list-objects-filter-options.c', + 'unit-tests/u-mem-pool.c', + 'unit-tests/u-mingw.c', +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + 'unit-tests/u-odb-inmemory.c', +-======= +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + 'unit-tests/u-oid-array.c', + 'unit-tests/u-oidmap.c', + 'unit-tests/u-oidtree.c', + + ## t/t5409-colorize-remote-messages.sh ## + remerge CONFLICT (content): Merge conflict in t/t5409-colorize-remote-messages.sh + index 1c34186390..3010913bb1 100755 + --- t/t5409-colorize-remote-messages.sh + +++ t/t5409-colorize-remote-messages.sh +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'disallow (color) control sequences in sideband' ' + printf "error: Have you \\033[31mread\\033[m this?\\a\\n" >&2 + exec "$@" + EOF +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + test_config_global uploadPack.packObjectsHook ./color-me-surprised && +-================================ +- test_config_global uploadPack.packObjectshook ./color-me-surprised && +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + test_commit need-at-least-one-commit && + + git clone --no-local . throw-away 2>stderr && +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'disallow (color) control sequences in sideband' ' + test_file_not_empty actual + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + test_decode_csi() { + awk '{ + while (match($0, /\033/) != 0) { +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'allow all control sequences for a specific URL' ' + test_grep ! "\\^\\[\\[K" decoded + ' + +-================================ +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + test_done + + ## t/t5563-simple-http-auth.sh ## + remerge CONFLICT (content): Merge conflict in t/t5563-simple-http-auth.sh + index 2001fa78e0..aba09dccfe 100755 + --- t/t5563-simple-http-auth.sh + +++ t/t5563-simple-http-auth.sh +@@ t/t5563-simple-http-auth.sh: test_expect_success 'access using three-legged auth' ' + EOF + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + test_lazy_prereq SPNEGO 'curl --version | grep -qi "SPNEGO\|GSS-API\|Kerberos\|negotiate"' + + test_expect_success SPNEGO 'http.emptyAuth=auto attempts Negotiate before credential_fill' ' +@@ t/t5563-simple-http-auth.sh: test_expect_success SPNEGO 'http.emptyAuth=false skips Negotiate' ' + test_line_count = 1 actual_401s + ' + +-================================ +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + test_lazy_prereq NTLM 'curl --version | grep -q NTLM' + + test_expect_success NTLM 'access using NTLM auth' ' + + ## t/t9200-git-cvsexportcommit.sh ## + remerge CONFLICT (content): Merge conflict in t/t9200-git-cvsexportcommit.sh + index 4314589de1..e2a86d7a90 100755 + --- t/t9200-git-cvsexportcommit.sh + +++ t/t9200-git-cvsexportcommit.sh +@@ t/t9200-git-cvsexportcommit.sh: case "$PWD" in + ;; + esac + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + if ! cvs version >/dev/null 2>&1 +-================================ +-cvs >/dev/null 2>&1 +-if test $? -ne 1 +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + then + skip_all='skipping git cvsexportcommit tests, cvs not found' + test_done + + ## t/test-lib.sh ## + remerge CONFLICT (content): Merge conflict in t/test-lib.sh + index fafeeaee31..30a1681884 100644 + --- t/test-lib.sh + +++ t/test-lib.sh +@@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see https://www.gnu.org/licenses/ . + +-<<<<<<< ac1e486013 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + # Enable the use of errexit so that any unexpected failures will cause us to + # abort tests, even when outside of a specific test case. + # +@@ t/test-lib.sh: case "${GIT_TEST_USE_SET_E:-false}" in + ;; + esac + +-======= +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + # On Unix/Linux, the path separator is the colon, on other systems it + # may be different, though. On Windows, for example, it is a semicolon. + # If the PATH variable contains semicolons, it is pretty safe to assumeTo: 5c9e9d9d76 (Drop mimalloc (git-for-windows#6231), 2026-05-26) (31d49d807a..5c9e9d9d76)
Statistics
Range-diff (click to expand)
1: 22f1834 = 1: dcd6d3f ci(dockerized): reduce the PID limit for private repositories
2: 9e3c837 = 2: 53e0192 mingw: skip symlink type auto-detection for network share targets
3: d467d4b = 3: 9b90583 Merge branch 'fix-ci'
4: ae5e204 = 4: e371580 unix-socket: avoid leak when initialization fails
5: 147e067 = 5: b1a2220 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: 91a6434 = 6: f9ee847 grep: prevent
^$false match at end of file7: d6bbf32 = 7: bb13553 Merge branch 'v2.53.0.windows.3'
8: 1a6740b = 8: 9cc62e6 Merge branch 'fixes-from-the-git-mailing-list'
9: 6c057da = 9: f37f615 t9350: point out that refs are not updated correctly
27: 6b2eaf3 = 10: df0a1b8 transport-helper: add trailing --
33: cf6c99e = 11: 22eb9e8 remote-helper: check helper status after import/export
43: d07213e = 12: 315d12f Always auto-gc after calling a fast-import transport
10: d3fd40a = 13: d1d6340 vcpkg_install: detect lack of Git
11: e1fb7ac = 14: 6447410 vcpkg_install: add comment regarding slow network connections
12: 1aef65d = 15: 687b307 vcbuild: install ARM64 dependencies when building ARM64 binaries
13: 59fc9e6 = 16: 60a9cd6 vcbuild: add an option to install individual 'features'
14: 06ad3f7 = 17: 7544fd9 cmake: allow building for Windows/ARM64
15: 5f9bee4 = 18: 2e315a1 mingw: include the Python parts in the build
16: da7579b = 19: a2e04b6 ci(vs-build) also build Windows/ARM64 artifacts
17: 4a4dce9 ! 20: ef63b92 win32/pthread: avoid name clashes with winpthread
18: c31f3a9 = 21: f605c73 Add schannel to curl installation
19: 536055d = 22: d7e531d hash-object: demonstrate a >4GB/LLP64 problem
20: c3dd27e = 23: ff417e3 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
21: 4dfa336 = 24: 953d71d cmake(): allow setting HOST_CPU for cross-compilation
22: 46f7292 = 25: 7e6fdb1 object-file.c: use size_t for header lengths
23: ea5b866 = 26: 1b529b1 Import the source code of mimalloc v2.2.7
24: 9c3ecca = 27: 30ec20c CMake: default Visual Studio generator has changed
25: f7b5595 = 28: 3bd42a3 hash algorithms: use size_t for section lengths
26: 3ebaa53 = 29: a296d22 mimalloc: adjust for building inside Git
28: ac55f8a = 30: ec86a8a mingw: demonstrate a
git addissue with NTFS junctions29: b92bcce = 31: 29ba4a2 .gitignore: add Visual Studio CMakeSetting.json file
30: 24a3309 = 32: ba5324c hash-object --stdin: verify that it works with >4GB/LLP64
31: ecfff97 = 33: 7b87d03 mimalloc: offer a build-time option to enable it
32: 5c084db = 34: 64ca47c t5505/t5516: allow running without
.git/branches/in the templates34: d9e74e9 = 35: 3f11962 clean: do not traverse mount points
35: 187aa9a = 36: e7880e4 strbuf_realpath(): use platform-dependent API if available
36: 912321c = 37: 67126b3 http: use new "best effort" strategy for Secure Channel revoke checking
37: 32d0cea = 38: 814b678 subtree: update
contrib/subtreetesttarget38: 848a5d6 = 39: ad72d6f CMakeLists: add default "x64-windows" arch for Visual Studio
39: 9321a7b = 40: e37c7e5 hash-object: add another >4GB/LLP64 test case
42: f851387 = 41: 5658540 setup: properly use "%(prefix)/" when in WSL
40: 1375627 = 42: da6bdd9 mingw: use mimalloc
41: 66a8f46 = 43: eb1b277 t5505/t5516: fix white-space around redirectors
44: b8029d0 = 44: 81b8b93 mingw: prevent regressions with "drive-less" absolute paths
45: b4a1611 = 45: 24cdf07 clean: remove mount points when possible
46: b41a173 = 46: b66be00 transport: optionally disable side-band-64k
47: 1d2bdfc = 47: 9837702 mingw: fix fatal error working on mapped network drives on Windows
48: 9bf8759 = 48: 440cac8 clink.pl: fix MSVC compile script to handle libcurl-d.lib
49: 037d8b5 = 49: b6e66e9 mingw: implement a platform-specific
strbuf_realpath()50: 9fb990d = 50: 151a1d0 t3701: verify that we can add lots of files interactively
51: d52cd27 = 51: 0155377 commit: accept "scissors" with CR/LF line endings
52: aea5c73 = 52: be9b2d0 t0014: fix indentation
53: 35374fb = 53: ed6c787 git-gui: accommodate for intent-to-add files
54: 37cd782 = 54: 93f2e76 mingw: allow for longer paths in
parse_interpreter()55: 249c742 = 55: 275d6f0 compat/vcbuild: document preferred way to build in Visual Studio
56: 9e30705 = 56: 057d545 http: optionally send SSL client certificate
57: b985aa0 = 57: 2755646 ci: run
contrib/subtreetests in CI builds58: 2ee99a9 = 58: a20a2eb CMake: show Win32 and Generator_platform build-option values
59: bb26799 = 59: 8265008 hash-object: add a >4GB/LLP64 test case using filtered input
94: 8cab0a3 = 60: 30be89d compat/mingw.c: do not warn when failing to get owner
95: 454bf34 = 61: 752ee98 mingw: $env:TERM="xterm-256color" for newer OSes
60: 069b23d = 62: dfb7d37 windows: skip linking
git-<command>for built-ins61: d3429a6 = 63: 6155da5 mingw: stop hard-coding
CC = gcc62: 35ab013 = 64: c85c6ff mingw: drop the -D_USE_32BIT_TIME_T option
63: ca2b479 = 65: de11a12 mingw: only use -Wl,--large-address-aware for 32-bit builds
64: b4361cb = 66: ed9dc74 mingw: avoid over-specifying
--pic-executable65: 2c8cacd = 67: cff8163 mingw: set the prefix and HOST_CPU as per MSYS2's settings
66: f328d3c = 68: 1850898 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
67: 9126344 = 69: b5b2609 mingw: rely on MSYS2's metadata instead of hard-coding it
68: 8525fa5 = 70: 786aab7 mingw: always define
ETC_*for MSYS2 environments69: ba13901 = 71: 30eeec0 max_tree_depth: lower it for clang builds in general on Windows
70: 3dae5bf = 72: 4e3b1b0 mingw: ensure valid CTYPE
74: b1e71f5 = 73: 0018d8e ci: work around a problem with HTTP/2 vs libcurl v8.10.0
71: 14731a1 = 74: ff72941 mingw: allow
git.exeto be used instead of the "Git wrapper"76: 995f30f = 75: 4f4d0a3 revision: create mark_trees_uninteresting_dense()
72: 1e91fbd = 76: 389c461 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
78: 7711052 = 77: 947db8b survey: stub in new experimental 'git-survey' command
73: 9b19a05 = 78: 2a8ab9f Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
80: 9176f83 = 79: 9858b44 survey: add command line opts to select references
75: 7913ef3 = 80: e8d7137 clink.pl: fix libexpatd.lib link error when using MSVC
83: 04849ae = 81: 22b6254 survey: start pretty printing data in table form
77: 63b7008 = 82: e5fa676 Makefile: clean up .ilk files when MSVC=1
86: 9cdf990 = 83: 4c18b1c survey: add object count summary
79: 22a2f9d = 84: fa89578 vcbuild: add support for compiling Windows resource files
89: ba80c74 = 85: 10ff6bd survey: summarize total sizes by object type
81: fc9adea = 86: e75788f config.mak.uname: add git.rc to MSVC builds
82: 3b19032 = 87: c8fedf6 MinGW: link as terminal server aware
93: 5bf011a = 88: 4dcc123 survey: show progress during object walk
84: e13c707 = 89: fe9880c clink.pl: ignore no-stack-protector arg on MSVC=1 builds
85: b4abc61 = 90: 5f2759b http: optionally load libcurl lazily
110: f8715b7 = 91: 4974476 survey: add ability to track prioritized lists
87: f68c40c = 92: 57230a3 clink.pl: move default linker options for MSVC=1 builds
88: 0c9cd40 = 93: 28a1132 http: support lazy-loading libcurl also on Windows
111: 932cb4c = 94: 264447c survey: add report of "largest" paths
90: 2f9f91f = 95: d50daab Add config option
windows.appendAtomically91: 2eccc1f = 96: b699a8e cmake: install headless-git.
92: 0a5c54a = 97: 56f0d6e http: when loading libcurl lazily, allow for multiple SSL backends
112: f75da0c = 98: 30b78f2 survey: add --top= option and config
96: c64d708 = 99: 1cf3f02 winansi: check result and Buffer before using Name
97: e04bda0 = 100: 94c184d mingw: change core.fsyncObjectFiles = 1 by default
98: de50107 = 101: df92c8d Fix Windows version resources
99: a9f26d8 = 102: fa34b11 status: fix for old-style submodules with commondir
100: 49dfe19 = 103: bca33d3 git.rc: include winuser.h
101: f83198e = 104: f5e968e mingw: do load libcurl dynamically by default
102: 347b3c4 = 105: e8d50a5 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
103: ac72d5b = 106: 7fac707 mingw: suggest
windows.appendAtomicallyin more cases104: d141b24 = 107: 13d3583 win32: use native ANSI sequence processing, if possible
105: 7d8998d = 108: 0c7f56f common-main.c: fflush stdout buffer upon exit
106: 6f686ec = 109: 4c2c4f7 t5601/t7406(mingw): do run tests with symlink support
107: a793c8f = 110: 9480326 win32: ensure that
localtime_r()is declared even in i686 builds108: 08710d5 = 111: ef93645 Fallback to AppData if XDG_CONFIG_HOME is unset
109: f288637 = 112: b530f5a run-command: be helpful with Git LFS fails on Windows 7
114: a67fa12 = 113: cd062fb survey: clearly note the experimental nature in the output
115: d5dd991 = 114: 201e693 Merge 'remote-hg-prerequisites' into HEAD
116: c5a47f9 = 115: 4a2dc21 Merge branch 'drive-prefix'
118: 582de17 = 116: b38c4b7 Merge branch 'dont-clean-junctions'
121: 23673fa = 117: 2a2c188 Merge branch 'msys2-python'
124: bc66f74 = 118: 39e8c0f Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
127: dbd0b6f = 119: af9a371 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
135: 23ce02f = 120: 21de02c Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
136: 74422e5 = 121: 97d2b3e Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
137: a4630f1 = 122: 392584b Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction138: 395e5f3 = 123: 7397909 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
139: 257d8e1 = 124: dc09ee4 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
140: 1349886 = 125: 1265aba Merge 'add-p-many-files'
141: 1d43288 = 126: df4592d Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
142: 056fe29 = 127: dc64c86 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
143: f5f1047 = 128: 61905f3 Merge 'git-gui/js/intent-to-add'
144: 74187e7 = 129: 42fd30f Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
145: 30e3266 = 130: eacf527 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
113: c75cd72 = 131: 18c5c51 mingw: make sure
errnois set correctly when socket operations fail117: ac38bff = 132: 0e1c5d6 t5563: verify that NTLM authentication works
146: 6fec5c4 = 133: 946bb7c Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
119: 383761d = 134: 4e9ee39 compat/mingw: handle WSA errors in strerror
120: 1160fad = 135: 09310de http: disallow NTLM authentication by default
147: 2257091 = 136: 12d7036 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path122: 89c6abd = 137: ad9adaa compat/mingw: drop outdated comment
123: 69267bb = 138: d5aaa6d http: warn if might have failed because of NTLM
148: 35a6c3b = 139: 0c576fb Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
125: dca3004 = 140: 0b5513c t0301: actually test credential-cache on Windows
126: 439e22b = 141: 5a5a587 credential: advertise NTLM suppression and allow helpers to re-enable
149: 88419f9 = 142: 71b1bab Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
128: d872319 = 143: 31f0ecf credential-cache: handle ECONNREFUSED gracefully
129: ff321a6 = 144: 855a195 reftable: do make sure to use custom allocators
130: 8698d6a = 145: d037646 check-whitespace: avoid alerts about upstream commits
131: c073593 = 146: 51be6d4 t/t5571-prep-push-hook.sh: Add test with writing to stderr
132: 7e5ffdb = 147: 3ad4ab9 dir: do not traverse mount points
133: 5873cc7 = 148: 559274d win32: thread-utils: handle multi-socket systems
134: cc4d32c = 149: fb29887 t5563: add tests for http.emptyAuth with Negotiate
150: 987fac1 = 150: 536bf21 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests151: 8a1591f = 151: 6d3cdc1 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
152: 971aa56 = 152: b57cd85 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t153: 4775a99 = 153: 714e730 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory154: d0c819d = 154: c69cae7 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
155: 70e0f49 = 155: 164d010 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
156: ff4cd31 = 156: 0abe2f6 Merge branch 'optionally-dont-append-atomically-on-windows'
157: 6db1079 = 157: 6d89e16 Merge branch 'fsync-object-files-always'
158: 059d84c = 158: c133497 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
159: 807aede = 159: d4349fe Fix Windows version resources (Fix Windows version resources git#4092)
160: f25e36e = 160: d73953c Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
161: a8a0f51 = 161: 4678a5a Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)162: 76a0837 = 162: d3dfd9e Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)163: 9049df2 = 163: c8c2ff8 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283164: 3950ba5 = 164: 3834508 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
165: 9650b14 = 165: 62042d6 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
166: f5be6a1 = 166: 59eac50 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: d918815 = 167: 4ff4321 Merge branch 'nano-server'
168: a1cced8 = 168: 127ab30 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
169: 9b8b0f5 = 169: 996c57a win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
170: 2546a19 = 170: d68c785 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
171: cff8e9d = 171: 8529b8a Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
172: 1a6be54 = 172: 9465a43 Merge branch 'Fix-i686-build-with-GCC-v14'
173: 221c93e = 173: 499349e Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
174: 6f1d4dd = 174: df59e1b Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
175: 0a9a3c9 = 175: 877963c pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
176: 5dee906 = 176: 66e4634 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: 46eca1a = 177: efef017 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
178: fd53982 = 178: fe48b5e credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
179: d87398c = 179: d06b1a3 Merge branch 'reftable-vs-custom-allocators'
180: e09d86d = 180: e23efdd Merge branch 'check-whitespace-only-downstream'
181: dba0133 = 181: f5b8cae 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: c13d18e = 182: 15c24e9 Merge branch 'disallow-ntlm-auth-by-default'
183: c9ca3be = 183: 4bc465d Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)184: 6fa402c = 184: a115b9a Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
185: d875035 = 185: 242c9e4 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
186: a32c7f7 = 186: 077d6bd Merge branch 'ready-for-upstream'
187: 8a309fe = 187: e528b4f ci(macos): skip the
git p4tests188: cbf5dd8 = 188: 10b9f77 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)189: ca67ec3 = 189: 36b835e Win32: make FILETIME conversion functions public
190: bd33b16 = 190: 0ed736a Win32: dirent.c: Move opendir down
191: 278261c = 191: 4da569b mingw: make the dirent implementation pluggable
192: 18a6140 = 192: 45cdcf4 Win32: make the lstat implementation pluggable
193: 9279517 = 193: 2ebab49 mingw: add infrastructure for read-only file system level caches
195: 0c3db63 = 194: 413fd0e mingw: add a cache below mingw's lstat and dirent implementations
197: b31a27a = 195: 3966f09 fscache: load directories only once
199: 3257f1f = 196: 054a3a2 fscache: add key for GIT_TRACE_FSCACHE
200: a66ac8b = 197: dde5d90 fscache: remember not-found directories
201: a48c16b = 198: 37da902 fscache: add a test for the dir-not-found optimization
202: 4683793 = 199: d63f601 add: use preload-index and fscache for performance
203: 04f5144 = 200: 278ba00 dir.c: make add_excludes aware of fscache during status
204: f79cf1e = 201: 9c73766 fscache: make fscache_enabled() public
205: 87608c4 = 202: e441078 dir.c: regression fix for add_excludes with fscache
206: b919cf3 = 203: 132d2a2 fetch-pack.c: enable fscache for stats under .git/objects
207: e82499c = 204: a081832 checkout.c: enable fscache for checkout again
208: 2b158cf = 205: 0a30f9b Enable the filesystem cache (fscache) in refresh_index().
209: 9cd4383 = 206: 31175ab fscache: use FindFirstFileExW to avoid retrieving the short name
194: bf0e610 = 207: 993510a git-gui--askyesno: fix funny text wrapping
210: 68cd50d = 208: 6f54078 fscache: add GIT_TEST_FSCACHE support
196: da110e1 = 209: e84f55b git-gui--askyesno (mingw): use Git for Windows' icon, if available
211: ec2cc8a = 210: d3677a7 fscache: add fscache hit statistics
198: 8bf8e24 = 211: 80d38b3 Merge branch 'git-gui-askyesno'
212: 583ea94 = 212: ed89f10 unpack-trees: enable fscache for sparse-checkout
213: 6c91c5e = 213: 50554c0 status: disable and free fscache at the end of the status command
214: 2732469 = 214: 5eea1b9 mem_pool: add GIT_TRACE_MEMPOOL support
215: c701589 = 215: 5a49a3d fscache: fscache takes an initial size
216: 06d938e = 216: 1f54c30 fscache: update fscache to be thread specific instead of global
217: b458a1b = 217: 1b005ba fscache: teach fscache to use mempool
218: 1ec2557 = 218: 0ebb7c6 fscache: make fscache_enable() thread safe
219: a5adaa2 = 219: 42349ee fscache: teach fscache to use NtQueryDirectoryFile
220: 07e1b70 = 220: ef8926c fscache: remember the reparse tag for each entry
221: 316a346 = 221: 4badbe3 Merge branch 'fscache'
222: 964c02b = 222: 150c65b fscache: implement an FSCache-aware is_mount_point()
223: ea41bed = 223: 0aacc01 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: 39a80ca = 224: 0b88163 clean: make use of FSCache
225: 9a45f98 = 225: e4b280f Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
226: 9d92775 = 226: 63d8369 Merge branch 'dont-clean-junctions-fscache'
227: 9a2f730 = 227: 9cd46ef pack-objects (mingw): demonstrate a segmentation fault with large deltas
228: 54b5531 = 228: b3be7a9 mingw: support long paths
229: 1caa569 = 229: dba8ccf win32(long path support): leave drive-less absolute paths intact
230: 49986b7 = 230: 515da1b compat/fsmonitor/fsm-*-win32: support long paths
231: 436ab48 = 231: 8af90c8 clean: suggest using
core.longPathsif paths are too long to remove232: 5e9ef26 = 232: 04d8890 mingw: Support
git_terminal_promptwith more terminals233: e12c188 = 233: 3aeb9c9 compat/terminal.c: only use the Windows console if bash 'read -r' fails
234: dd77870 = 234: 7ffabed mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
235: e9c567f = 235: a662ef1 Win32: symlink: move phantom symlink creation to a separate function
236: c14be56 = 236: 67bf811 Introduce helper to create symlinks that knows about index_state
237: d73c850 = 237: 8c837ed mingw: allow to specify the symlink type in .gitattributes
238: 5bdcd04 = 238: 7c4f871 Win32: symlink: add test for
symlinkattribute239: 0619b0b = 239: 7e52ce8 mingw: explicitly specify with which cmd to prefix the cmdline
240: f37a7af = 240: 76f0843 mingw: when path_lookup() failed, try BusyBox
241: 3ded6f1 = 241: 1047426 test-tool: learn to act as a drop-in replacement for
iconv243: a44bc7b = 242: 09daf6a tests(mingw): if
iconvis unavailable, usetest-helper --iconv245: 5dabdbc = 243: 6f6f203 gitattributes: mark .png files as binary
247: 4926f4f = 244: 94b9a54 tests: move test PNGs into t/lib-diff/
249: 1074487 = 245: 4af367d tests: only override sort & find if there are usable ones in /usr/bin/
251: 99a1047 = 246: 62b934b tests: use the correct path separator with BusyBox
252: c488ea2 = 247: 599a6ae mingw: only use Bash-ism
builtin pwd -Wwhen available253: b2ab2af = 248: f2ae956 tests (mingw): remove Bash-specific pwd option
242: f55202f = 249: 0050269 mingw: introduce code to detect whether we're inside a Windows container
254: 690aa5b = 250: 60003b6 test-lib: add BUSYBOX prerequisite
244: e5ce8cd = 251: e314df3 mingw: when running in a Windows container, try to rename() harder
256: ec15c74 = 252: 81e6bd4 t5003: use binary file from t/lib-diff/
246: 38e826d = 253: c7b107e mingw: move the file_attr_to_st_mode() function definition
258: 09c75f2 = 254: 14b0ec5 t5532: workaround for BusyBox on Windows
248: 206c183 = 255: 4f2dbfd mingw: Windows Docker volumes are not symbolic links
261: 1db666a = 256: ec0b04b t5605: special-case hardlink test for BusyBox-w32
250: 1f9bb3f = 257: fb0a0bd mingw: work around rename() failing on a read-only file
264: 5db8e2f = 258: 5edbb1d t5813: allow for $PWD to be a Windows path
255: 60d091e = 259: 4c68613 Merge branch 'gitk-and-git-gui-patches'
257: a069db3 = 260: 38f7ee8 Merge branch 'long-paths'
259: 410779f = 261: 4cf1e2b Merge branch 'msys2'
262: 6aefef4 = 262: 9f313b9 Merge 'docker-volumes-are-no-symlinks'
265: 01c0d97 = 263: 033aa00 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
267: 00289c5 = 264: 0a9a4a2 t9200: skip tests when $PWD contains a colon
268: 0e8fb4d = 265: 63b5768 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
260: 8f973b7 = 266: 0696a01 Describe Git for Windows' architecture
270: 9968b45 = 267: fa81fe9 mingw: kill child processes in a gentler way
271: 9f0ccfa = 268: 42fa577 mingw: optionally enable wsl compability file mode bits
272: ad07e5f = 269: 6758047 Merge branch 'busybox-w32'
263: bec1e56 = 270: d35f6bb Modify the Code of Conduct for Git for Windows
274: 21a085c = 271: b020d1b mingw: really handle SIGINT
275: 20e9f26 = 272: befbb77 Merge branch 'wsl-file-mode-bits'
266: 7e99908 = 273: b0f4d32 CONTRIBUTING.md: add guide for first-time contributors
278: 168fb55 = 274: ea20954 Partially un-revert "editor: save and reset terminal after calling EDITOR"
279: 52a61f9 = 275: b1c8d9e Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
269: 69f1c6a = 276: 62f3d2a README.md: Add a Windows-specific preamble
280: 441db65 = 277: ad96f2b reset: reinstate support for the deprecated --stdin option
284: 4e80a7e = 278: 4dbd552 Merge branch 'un-revert-editor-save-and-reset'
273: ee949d8 = 279: 2b68013 Add an issue template
276: 16f0107 = 280: 1e25568 Add a GitHub workflow to monitor component updates
281: bcd6278 = 281: 3e154ae fsmonitor: reintroduce core.useBuiltinFSMonitor
285: 4c9c3d1 = 282: 42b7e07 Merge branch 'phase-out-reset-stdin'
277: b4ff906 = 283: 8f264a7 Modify the GitHub Pull Request template (to reflect Git for Windows)
282: 7fd8ce0 = 284: 83f30cf dependabot: help keeping GitHub Actions versions up to date
286: 1c50a09 = 285: 9239a8c Merge branch 'deprecate-core.useBuiltinFSMonitor'
283: 4e80bf1 = 286: 502519d SECURITY.md: document Git for Windows' policies
287: 92ae7d6 = 287: 23862ef Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
288: 6f4cb9f = 288: 92363f7 Merge 'readme' into HEAD
289: 9fe63b8 = 289: bf21844 Add an AGENTS.md file to help with AI-assisted debugging/development
290: 76f1e88 = 290: 18ba8cb fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
291: c817518 = 291: 399c82d fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
292: b7a5f03 = 292: 4761298 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
293: 65e0d6c = 293: 498637c fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
294: bd0941a = 294: 2ff3f66 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
295: c4fecc8 = 295: 8f1e9d8 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: f23b88f = 296: 44123ba fixup! ci: work around a problem with HTTP/2 vs libcurl v8.10.0
297: 3318afc = 297: c8e8a4d fixup! revision: create mark_trees_uninteresting_dense()
298: f0cb362 = 298: cf6c94e Drop obsolete downstream patches (Drop obsolete downstream patches git#6208)
299: 156cfb1 = 299: 025e319 Merge branch 'pr-2097'
300: 169f7e5 = 300: a968015 fixup! Add a GitHub workflow to verify that Git/Scalar work in Nano Server
301: 4f57345 = 301: 3cc2295 Update GitHub Actions versions used in the GitHub workflows (Update GitHub Actions versions used in the GitHub workflows git#6220)
302: 3d8650a = 302: c604235 build: tolerate use of _Generic from glibc 2.43 with Clang
303: 1c895d8 = 303: ac1e486 build: tolerate use of _Generic from glibc 2.43 with Clang (build: tolerate use of _Generic from glibc 2.43 with Clang git#6233)
304: 869c34c = 304: 291162a AGENTS.md: document
amend!, fixup-only PRs, and direct GfW PRs (AGENTS.md: documentamend!, fixup-only PRs, and direct GfW PRs git#6232)305: fa6b16a = 305: 2d7c3fd amend! mingw: use mimalloc
306: e30c652 = 306: 2e7a5ed fixup! mimalloc: offer a build-time option to enable it
307: 052b5c4 = 307: 142c763 fixup! mimalloc: adjust for building inside Git
308: 822c295 = 308: 435a3e0 fixup! Import the source code of mimalloc v2.2.7
309: 57cfd5a = 309: 51e3ec8 fixup! git-compat-util: avoid redeclaring _DEFAULT_SOURCE
310: 0a34dcf ! 310: 99e0f25 fixup! win32/pthread: avoid name clashes with winpthread
311: c26366f = 311: 5c9e9d9 Drop mimalloc (Drop mimalloc git#6231)