Rebase shears/next: 2 conflict(s) (0 skipped, 2 resolved) (#26928844384)#220
Open
gitforwindowshelper[bot] wants to merge 311 commits into
Open
Rebase shears/next: 2 conflict(s) (0 skipped, 2 resolved) (#26928844384)#220gitforwindowshelper[bot] wants to merge 311 commits into
gitforwindowshelper[bot] wants to merge 311 commits into
Conversation
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>
Continue walking the code path for the >4GB `hash-object --literally`
test to the hash algorithm step for LLP64 systems.
This patch lets the SHA1DC code use `size_t`, making it compatible with
LLP64 data models (as used e.g. by Windows).
The interested reader of this patch will note that we adjust the
signature of the `git_SHA1DCUpdate()` function without updating _any_
call site. This certainly puzzled at least one reviewer already, so here
is an explanation:
This function is never called directly, but always via the macro
`platform_SHA1_Update`, which is usually called via the macro
`git_SHA1_Update`. However, we never call `git_SHA1_Update()` directly
in `struct git_hash_algo`. Instead, we call `git_hash_sha1_update()`,
which is defined thusly:
static void git_hash_sha1_update(git_hash_ctx *ctx,
const void *data, size_t len)
{
git_SHA1_Update(&ctx->sha1, data, len);
}
i.e. it contains an implicit downcast from `size_t` to `unsigned long`
(before this here patch). With this patch, there is no downcast anymore.
With this patch, finally, the t1007-hash-object.sh "files over 4GB hash
literally" test case is fixed.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
Just like the `hash-object --literally` code path, the `--stdin` code path also needs to use `size_t` instead of `unsigned long` to represent memory sizes, otherwise it would cause problems on platforms using the LLP64 data model (such as Windows). To limit the scope of the test case, the object is explicitly not written to the object store, nor are any filters applied. The `big` file from the previous test case is reused to save setup time; To avoid relying on that side effect, it is generated if it does not exist (e.g. when running via `sh t1007-*.sh --long --run=1,41`). Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 defines some helpful environment variables, e.g. `MSYSTEM`. There is code in Git for Windows to ensure that that `MSYSTEM` variable is set, hard-coding a default. However, the existing solution jumps through hoops to reconstruct the proper default, and is even incomplete doing so, as we found out when we extended it to support CLANGARM64. This is absolutely unnecessary because there is already a perfectly valid `MSYSTEM` value we can use at build time. This is even true when building the MINGW32 variant on a MINGW64 system because `makepkg-mingw` will override the `MSYSTEM` value as per the `MINGW_ARCH` array. The same is equally true for the `/mingw64`, `/mingw32` and `/clangarm64` prefix: those values are already available via the `MINGW_PREFIX` environment variable, and we just need to pass that setting through. Only when `MINGW_PREFIX` is not set (as is the case in Git for Windows' minimal SDK, where only `MSYSTEM` is guaranteed to be set correctly), we use as fall-back the top-level directory whose name is the down-cased value of the `MSYSTEM` variable. Incidentally, this also broadens the support to all the configurations supported by the MSYS2 project, i.e. clang64 & ucrt64, too. Note: This keeps the same, hard-coded MSYSTEM platform support for CMake as before, but drops it for Meson (because it is unclear how Meson could do this in a more flexible manner). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
To complement the `--stdin` and `--literally` test cases that verify that we can hash files larger than 4GB on 64-bit platforms using the LLP64 data model, here is a test case that exercises `hash-object` _without_ any options. Just as before, we use the `big` file from the previous test case if it exists to save on setup time, otherwise generate it. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
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>
To verify that the `clean` side of the `clean`/`smudge` filter code is correct with regards to LLP64 (read: to ensure that `size_t` is used instead of `unsigned long`), here is a test case using a trivial filter, specifically _not_ writing anything to the object store to limit the scope of the test case. As in previous commits, the `big` file from previous test cases is reused if available, to save setup time, otherwise re-generated. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In the case of Git for Windows (say, in a Git Bash window) running in a Windows Subsystem for Linux (WSL) directory, the GetNamedSecurityInfoW() call in is_path_owned_By_current_side() returns an error code other than ERROR_SUCCESS. This is consistent behavior across this boundary. In these cases, the owner would always be different because the WSL owner is a different entity than the Windows user. The change here is to suppress the error message that looks like this: error: failed to get owner for '//wsl.localhost/...' (1) Before this change, this warning happens for every Git command, regardless of whether the directory is marked with safe.directory. Signed-off-by: Derrick Stolee <derrickstolee@github.com>
For Windows builds >= 15063 set $env:TERM to "xterm-256color" instead of "cygwin" because they have a more capable console system that supports this. Also set $env:COLORTERM="truecolor" if unset. $env:TERM is initialized so that ANSI colors in color.c work, see 29a3963 (Win32: patch Windows environment on startup, 2012-01-15). See git-for-windows#3629 regarding problems caused by always setting $env:TERM="cygwin". This is the same heuristic used by the Cygwin runtime. Signed-off-by: Rafael Kitover <rkitover@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NtQueryObject under Wine can return a success but fill out no name. In those situations, Wine will set Buffer to NULL, and set result to the sizeof(OBJECT_NAME_INFORMATION). Running a command such as echo "$(git.exe --version 2>/dev/null)" will crash due to a NULL pointer dereference when the code attempts to null terminate the buffer, although, weirdly, removing the subshell or redirecting stdout to a file will not trigger the crash. Code has been added to also check Buffer and Length to ensure the check is as robust as possible due to the current behavior being fragile at best, and could potentially change in the future This code is based on the behavior of NtQueryObject under wine and reactos. Signed-off-by: Christopher Degawa <ccom@randomderp.com>
Atomic append on windows is only supported on local disk files, and it may cause errors in other situations, e.g. network file system. If that is the case, this config option should be used to turn atomic append off. Co-Authored-By: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: 孙卓识 <sunzhuoshi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
From the documentation of said setting: This boolean will enable fsync() when writing object files. This is a total waste of time and effort on a filesystem that orders data writes properly, but can be useful for filesystems that do not use journalling (traditional UNIX filesystems) or that only journal metadata and not file contents (OS X’s HFS+, or Linux ext3 with "data=writeback"). The most common file system on Windows (NTFS) does not guarantee that order, therefore a sudden loss of power (or any other event causing an unclean shutdown) would cause corrupt files (i.e. files filled with NULs). Therefore we need to change the default. Note that the documentation makes it sound as if this causes really bad performance. In reality, writing loose objects is something that is done only rarely, and only a handful of files at a time. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Whith Windows 2000, Microsoft introduced a flag to the PE header to mark executables as "terminal server aware". Windows terminal servers provide a redirected Windows directory and redirected registry hives when launching legacy applications without this flag set. Since we do not use any INI files in the Windows directory and don't write to the registry, we don't need this additional preparation. Telling the OS that we don't need this should provide slightly improved startup times in terminal server environments. When building for supported Windows Versions with MSVC the /TSAWARE linker flag is automatically set, but MinGW requires us to set the --tsaware flag manually. This partially addresses git-for-windows#3935. Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Add FileVersion, which is a required field As not all required fields were present, none were being included Fixes git-for-windows#4090 Signed-off-by: Kiel Hurley <kielhurley@gmail.com>
In f9b7573 (repository: free fields before overwriting them, 2017-09-05), Git was taught to release memory before overwriting it, but 357a03e (repository.c: move env-related setup code back to environment.c, 2018-03-03) changed the code so that it would not _always_ be overwritten. As a consequence, the `commondir` attribute would point to already-free()d memory. This seems not to cause problems in core Git, but there are add-on patches in Git for Windows where the `commondir` attribute is subsequently used and causing invalid memory accesses e.g. in setups containing old-style submodules (i.e. the ones with a `.git` directory within theirs worktrees) that have `commondir` configured. This fixes git-for-windows#4083. Signed-off-by: Andrey Zabavnikov <zabavnikov@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is merely a historical wart that, say, `git-commit` exists in the `libexec/git-core/` directory, a tribute to the original idea to let Git be essentially a bunch of Unix shell scripts revolving around very few "plumbing" (AKA low-level) commands. Git has evolved a lot from there. These days, most of Git's functionality is contained within the `git` executable, in the form of "built-in" commands. To accommodate for scripts that use the "dashed" form of Git commands, even today, Git provides hard-links that make the `git` executable available as, say, `git-commit`, just in case that an old script has not been updated to invoke `git commit`. Those hard-links do not come cheap: they take about half a minute for every build of Git on Windows, they are mistaken for taking up huge amounts of space by some Windows Explorer versions that do not understand hard-links, and therefore many a "bug" report had to be addressed. The "dashed form" has been officially deprecated in Git version 1.5.4, which was released on February 2nd, 2008, i.e. a very long time ago. This deprecation was never finalized by skipping these hard-links, but we can start the process now, in Git for Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In 436a422 (max_tree_depth: lower it for clangarm64 on Windows, 2025-04-23), I provided a work-around for a nasty issue with clangarm builds, where the stack is exhausted before the maximal tree depth is reached, and the resulting error cannot easily be handled by Git (because it would require Windows-specific handling). Turns out that this is not at all limited to ARM64. In my tests with CLANG64 in MSYS2 on the GitHub Actions runners, the test t6700.4 failed in the exact same way. What's worse: The limit needs to be quite a bit lower for x86_64 than for aarch64. In aforementioned tests, the breaking point was 1232: With 1231 it still worked as expected, with 1232 it would fail with the `STATUS_STACK_OVERFLOW` incorrectly mapped to exit code 127. For comparison, in my tests on GitHub Actions' Windows/ARM64 runners, the breaking point was 1439 instead. Therefore the condition needs to be adapted once more, to accommodate (with some safety margin) both aarch64 and x86_64 in clang-based builds on Windows, to let that test pass. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ctory Internally, Git expects the environment variable `HOME` to be set, and to point to the current user's home directory. This environment variable is not set by default on Windows, and therefore Git tries its best to construct one if it finds `HOME` unset. There are actually two different approaches Git tries: first, it looks at `HOMEDRIVE`/`HOMEPATH` because this is widely used in corporate environments with roaming profiles, and a user generally wants their global Git settings to be in a roaming profile. Only when `HOMEDRIVE`/`HOMEPATH` is either unset or does not point to a valid location, Git will fall back to using `USERPROFILE` instead. However, starting with Windows Vista, for secondary logons and services, the environment variables `HOMEDRIVE`/`HOMEPATH` point to Windows' system directory (usually `C:\Windows\system32`). That is undesirable, and that location is usually write-protected anyway. So let's verify that the `HOMEDRIVE`/`HOMEPATH` combo does not point to Windows' system directory before using it, falling back to `USERPROFILE` if it does. This fixes git-for-windows#2709 Initial-Path-by: Ivan Pozdeev <vano@mail.mipt.ru> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
headless-git is a git executable without opening a console window. It is useful when other GUI executables want to call git. We should install it together with git on Windows. Signed-off-by: Yuyi Wang <Strawberry_Str@hotmail.com>
winuser.h contains the definition of RT_MANIFEST that our LLVM based toolchain needs to understand that we want to embed compat/win32/git.manifest as an application manifest. It currently just embeds it as additional data that Windows doesn't understand. This also helps our GCC based toolchain understand that we only want one copy embedded. It currently embeds one working assembly manifest and one nearly identical, but useless copy as additional data. This also teaches our Visual Studio based buildsystems to pick up the manifest file from git.rc. This means we don't have to explicitly specify it in contrib/buildsystems/Generators/Vcxproj.pm anymore. Slightly counter-intuitively this also means we have to explicitly tell Cmake not to embed a default manifest. This fixes git-for-windows#4707 Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Start work on a new 'git survey' command to scan the repository for monorepo performance and scaling problems. The goal is to measure the various known "dimensions of scale" and serve as a foundation for adding additional measurements as we learn more about Git monorepo scaling problems. The initial goal is to complement the scanning and analysis performed by the GO-based 'git-sizer' (https://github.com/github/git-sizer) tool. It is hoped that by creating a builtin command, we may be able to take advantage of internal Git data structures and code that is not accessible from GO to gain further insight into potential scaling problems. Co-authored-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
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 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
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>
Add a README.md for GitHub goodness. 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: next
From: 1c5155f6aa (Drop mimalloc (git-for-windows#6231), 2026-05-26) (a316811f49..1c5155f6aa)
Resolved: 8655a1f (object-file.c: use size_t for header lengths, 2021-11-12)
Resolved by keeping upstream's non-static
write_object_file_prepareand removal ofodb_source_loose_write_object, while applying the patch'sunsigned long→size_tandint *hdrlen→size_t *hdrlentype changes to the remaining function signatures and declarations.Range-diff
1: 8655a1f ! 1: c237e0f object-file.c: use size_t for header lengths
@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> ## object-file.c ## -@@ object-file.c: int odb_source_loose_read_object_info(struct odb_source *source, +@@ object-file.c: int parse_loose_header(const char *hdr, struct object_info *oi) static void hash_object_body(const struct git_hash_algo *algo, struct git_hash_ctx *c, const void *buf, unsigned long len, struct object_id *oid, @@ object-file.c: int odb_source_loose_read_object_info(struct odb_source *source, @@ object-file.c: static void hash_object_body(const struct git_hash_algo *algo, struct git_hash_c } - static void write_object_file_prepare(const struct git_hash_algo *algo, -- const void *buf, unsigned long len, -+ const void *buf, size_t len, - enum object_type type, struct object_id *oid, -- char *hdr, int *hdrlen) -+ char *hdr, size_t *hdrlen) + void write_object_file_prepare(const struct git_hash_algo *algo, +- const void *buf, unsigned long len, ++ const void *buf, size_t len, + enum object_type type, struct object_id *oid, +- char *hdr, int *hdrlen) ++ char *hdr, size_t *hdrlen) { struct git_hash_ctx c; @@ object-file.c: int finalize_object_file_flags(struct repository *repo, write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen); } -@@ object-file.c: int odb_source_loose_write_stream(struct odb_source *source, - } - - int odb_source_loose_write_object(struct odb_source *source, -- const void *buf, unsigned long len, -+ const void *buf, size_t len, - enum object_type type, struct object_id *oid, - struct object_id *compat_oid_in, - enum odb_write_object_flags flags) -@@ object-file.c: int odb_source_loose_write_object(struct odb_source *source, - const struct git_hash_algo *compat = source->odb->repo->compat_hash_algo; - struct object_id compat_oid; - char hdr[MAX_HEADER_LEN]; -- int hdrlen = sizeof(hdr); -+ size_t hdrlen = sizeof(hdr); - - /* Generate compat_oid */ - if (compat) { ## object-file.h ## -@@ object-file.h: int odb_source_loose_freshen_object(struct odb_source *source, - const struct object_id *oid); - - int odb_source_loose_write_object(struct odb_source *source, -- const void *buf, unsigned long len, -+ const void *buf, size_t len, - enum object_type type, struct object_id *oid, - struct object_id *compat_oid_in, - enum odb_write_object_flags flags); @@ object-file.h: int finalize_object_file_flags(struct repository *repo, enum finalize_object_file_flags flags); @@ object-file.h: int finalize_object_file_flags(struct repository *repo, - unsigned long len, enum object_type type, + size_t len, enum object_type type, struct object_id *oid); - - /* Helper to check and "touch" a file */ + void write_object_file_prepare(const struct git_hash_algo *algo, +- const void *buf, unsigned long len, ++ const void *buf, size_t len, + enum object_type type, struct object_id *oid, +- char *hdr, int *hdrlen); ++ char *hdr, size_t *hdrlen); + int write_loose_object(struct odb_source_loose *loose, + const struct object_id *oid, char *hdr, + int hdrlen, const void *buf, unsigned long len,Resolved: 0d1ea66 (AGENTS.md: document
amend!, fixup-only PRs, and direct GfW PRs (git-for-windows#6232), 2026-05-26)Resolved merge commit by taking HEAD's versions of all non-AGENTS.md files (which only changed due to base branch evolution) and applying the PR's two AGENTS.md additions (amend! commits documentation and Contributing to Git for Windows section) on top of HEAD's AGENTS.md.
Range-diff
1: 0d1ea66 ! 1: 1f1fbbc 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 ea11aefe95..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. -+ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac06605458 (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. -+ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac06605458 (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 e9887f926d..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 +-<<<<<<< ac06605458 (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 79b16dc26c..30d13d676f 100644 + --- Makefile + +++ Makefile +@@ Makefile: BUILTIN_OBJS += builtin/write-tree.o + THIRD_PARTY_SOURCES += compat/inet_ntop.c + THIRD_PARTY_SOURCES += compat/inet_pton.c + THIRD_PARTY_SOURCES += compat/mimalloc/% +-<<<<<<< ac06605458 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) +-======= +-THIRD_PARTY_SOURCES += compat/nedmalloc/% +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + THIRD_PARTY_SOURCES += compat/obstack.% + THIRD_PARTY_SOURCES += compat/poll/% + THIRD_PARTY_SOURCES += compat/regex/% +@@ 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 +-<<<<<<< ac06605458 (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: endif + endif + + +-ifdef USE_MIMALLOC +- MIMALLOC_OBJS = \ +- compat/mimalloc/alloc-aligned.o \ +- compat/mimalloc/alloc.o \ +- compat/mimalloc/arena.o \ +- compat/mimalloc/bitmap.o \ +- compat/mimalloc/heap.o \ +- compat/mimalloc/init.o \ +- compat/mimalloc/libc.o \ +- compat/mimalloc/options.o \ +- compat/mimalloc/os.o \ +- compat/mimalloc/page.o \ +- compat/mimalloc/random.o \ +- compat/mimalloc/prim/prim.o \ +- compat/mimalloc/segment.o \ +- compat/mimalloc/segment-map.o \ +- compat/mimalloc/stats.o +- +- COMPAT_CFLAGS += -Icompat/mimalloc -DMI_DEBUG=0 -DUSE_MIMALLOC --std=gnu11 +- COMPAT_OBJS += $(MIMALLOC_OBJS) +- +-$(MIMALLOC_OBJS): COMPAT_CFLAGS += -DBANNED_H +- +-$(MIMALLOC_OBJS): COMPAT_CFLAGS += \ +- -DMI_WIN_USE_FLS \ +- -Wno-attributes \ +- -Wno-unknown-pragmas \ +- -Wno-unused-function \ +- -Wno-array-bounds +- +-ifdef DEVELOPER +-$(MIMALLOC_OBJS): COMPAT_CFLAGS += \ +- -Wno-pedantic \ +- -Wno-declaration-after-statement \ +- -Wno-old-style-definition \ +- -Wno-missing-prototypes \ +- -Wno-implicit-function-declaration +-endif +-endif +- + 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 4a60275e4b..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) +-<<<<<<< ac06605458 (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 714b6eb8a4..9906065b15 100644 + --- config.mak.dev + +++ config.mak.dev +@@ config.mak.dev: endif + endif + + ifneq ($(uname_S),FreeBSD) +-<<<<<<< ac06605458 (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 05c2a05628..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 +-<<<<<<< ac06605458 (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 +-<<<<<<< ac06605458 (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) + + ## object-file.c ## + remerge CONFLICT (content): Merge conflict in object-file.c + index f4fa9ac43c..d5ad88df20 100644 + --- object-file.c + +++ object-file.c +@@ object-file.c: static void hash_object_body(const struct git_hash_algo *algo, struct git_hash_c + git_hash_final_oid(oid, c); + } + +-<<<<<<< ac06605458 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + void write_object_file_prepare(const struct git_hash_algo *algo, + const void *buf, size_t len, + enum object_type type, struct object_id *oid, + char *hdr, size_t *hdrlen) +-======= +-static void write_object_file_prepare(const struct git_hash_algo *algo, +- const void *buf, size_t len, +- enum object_type type, struct object_id *oid, +- char *hdr, size_t *hdrlen) +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + { + struct git_hash_ctx c; + +@@ object-file.c: int odb_source_loose_write_stream(struct odb_source_loose *loose, + return err; + } + +-<<<<<<< ac06605458 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) +-======= +-int odb_source_loose_write_object(struct odb_source *source, +- const void *buf, size_t len, +- enum object_type type, struct object_id *oid, +- struct object_id *compat_oid_in, +- enum odb_write_object_flags flags) +-{ +- const struct git_hash_algo *algo = source->odb->repo->hash_algo; +- const struct git_hash_algo *compat = source->odb->repo->compat_hash_algo; +- struct object_id compat_oid; +- char hdr[MAX_HEADER_LEN]; +- size_t hdrlen = sizeof(hdr); +- +- /* Generate compat_oid */ +- if (compat) { +- if (compat_oid_in) +- oidcpy(&compat_oid, compat_oid_in); +- else if (type == OBJ_BLOB) +- hash_object_file(compat, buf, len, type, &compat_oid); +- else { +- struct strbuf converted = STRBUF_INIT; +- convert_object_file(source->odb->repo, &converted, algo, compat, +- buf, len, type, 0); +- hash_object_file(compat, converted.buf, converted.len, +- type, &compat_oid); +- strbuf_release(&converted); +- } +- } +- +- /* Normally if we have it in the pack then we do not bother writing +- * it out into .git/objects/??/?{38} file. +- */ +- write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen); +- if (odb_freshen_object(source->odb, oid)) +- return 0; +- if (write_loose_object(source, oid, hdr, hdrlen, buf, len, 0, flags)) +- return -1; +- if (compat) +- return repo_add_loose_object_map(source, oid, &compat_oid); +- return 0; +-} +- +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + int force_object_loose(struct odb_source *source, + const struct object_id *oid, time_t mtime) + { + + ## object-file.h ## + remerge CONFLICT (content): Merge conflict in object-file.h + index ca3990bbda..4c87cd160b 100644 + --- object-file.h + +++ object-file.h +@@ object-file.h: struct odb_source; + * `force_object_loose()` generic and is thus postponed to a later point in + * time. + */ +-<<<<<<< ac06605458 (build: tolerate use of _Generic from glibc 2.43 with Clang (#6233)) + int odb_source_loose_write_stream(struct odb_source_loose *source, +-======= +-int odb_source_loose_has_object(struct odb_source *source, +- const struct object_id *oid); +- +-int odb_source_loose_freshen_object(struct odb_source *source, +- const struct object_id *oid); +- +-int odb_source_loose_write_object(struct odb_source *source, +- const void *buf, size_t len, +- enum object_type type, struct object_id *oid, +- struct object_id *compat_oid_in, +- enum odb_write_object_flags flags); +- +-int odb_source_loose_write_stream(struct odb_source *source, +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + struct odb_write_stream *stream, size_t len, + struct object_id *oid); + + + ## sideband.c ## + remerge CONFLICT (content): Merge conflict in sideband.c + index 3e8fa2a13d..1523a53e1d 100644 + --- sideband.c + +++ sideband.c +@@ sideband.c: static struct keyword_entry keywords[] = { + }; + + static enum { +-<<<<<<< ac06605458 (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; + +-<<<<<<< ac06605458 (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); + } + +-<<<<<<< ac06605458 (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 +-<<<<<<< ac06605458 (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; + +-<<<<<<< ac06605458 (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--) { +-<<<<<<< ac06605458 (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, '^'); +-<<<<<<< ac06605458 (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 6d95f20359..890788154f 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', +-<<<<<<< ac06605458 (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 87944d82ec..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 +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac06605458 (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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac06605458 (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 231940a91a..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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac06605458 (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 f94b01a5b4..e2a86d7a90 100755 + --- t/t9200-git-cvsexportcommit.sh + +++ t/t9200-git-cvsexportcommit.sh +@@ t/t9200-git-cvsexportcommit.sh: case "$PWD" in + ;; + esac + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac06605458 (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 abcc5245af..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/ . + +-<<<<<<< ac06605458 (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: 70cd629378 (Drop mimalloc (git-for-windows#6231), 2026-05-26) (ea85ec817e..70cd629378)
Statistics
Range-diff (click to expand)
1: 13a6614 = 1: d42fe55 ci(dockerized): reduce the PID limit for private repositories
2: 5bc6955 = 2: 2e94f59 mingw: skip symlink type auto-detection for network share targets
3: f529bff = 3: ce20d1e Merge branch 'fix-ci'
4: 98681d8 = 4: 19f9b64 unix-socket: avoid leak when initialization fails
5: ffb4e6e = 5: 29040b1 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: 4e42574 = 6: ee9c2dc grep: prevent
^$false match at end of file7: fac1ed5 = 7: 7387fcd Merge branch 'v2.53.0.windows.3'
8: 20b3d21 = 8: 7206e30 Merge branch 'fixes-from-the-git-mailing-list'
9: 49e2dcb = 9: df60b3b vcpkg_install: detect lack of Git
11: 01c5d68 = 10: 56d01c9 vcpkg_install: add comment regarding slow network connections
10: b6000a7 = 11: b2d760a mingw: include the Python parts in the build
13: 05ca320 = 12: 3946474 vcbuild: install ARM64 dependencies when building ARM64 binaries
12: 626dd59 = 13: 1cebc04 win32/pthread: avoid name clashes with winpthread
15: cc37b05 = 14: cce3cc7 vcbuild: add an option to install individual 'features'
14: 4dde242 = 15: 7d2120d git-compat-util: avoid redeclaring _DEFAULT_SOURCE
17: b895ca0 = 16: 46df05a cmake: allow building for Windows/ARM64
16: 6b58c91 = 17: 7b42b99 Import the source code of mimalloc v2.2.7
18: 1c8facb = 18: dab0131 t9350: point out that refs are not updated correctly
20: c5b304a = 19: 85774a7 ci(vs-build) also build Windows/ARM64 artifacts
19: a6d7524 = 20: 2897c02 mimalloc: adjust for building inside Git
21: 0636054 = 21: 19fa20a transport-helper: add trailing --
22: 876f937 = 22: 8e50b68 mingw: demonstrate a
git addissue with NTFS junctions25: 53fe038 = 23: 1ed7116 Add schannel to curl installation
23: c3fd7a3 = 24: 2c897c5 mimalloc: offer a build-time option to enable it
24: 566f754 = 25: aec91bd t5505/t5516: allow running without
.git/branches/in the templates26: 4f21b18 = 26: cf823c9 remote-helper: check helper status after import/export
27: 1690d3f = 27: 611dc3d clean: do not traverse mount points
28: 13648e0 = 28: c2bb3d8 strbuf_realpath(): use platform-dependent API if available
29: 900aa44 = 29: 0347f81 http: use new "best effort" strategy for Secure Channel revoke checking
76: 7acb4c3 = 30: 9d5d87d subtree: update
contrib/subtreetesttarget32: d8a6696 = 31: c3267a0 cmake(): allow setting HOST_CPU for cross-compilation
30: 058c57f = 32: adb552a mingw: use mimalloc
31: 0c13e9d = 33: 1ab72d5 t5505/t5516: fix white-space around redirectors
33: 2d20868 = 34: 20b14ed Always auto-gc after calling a fast-import transport
34: a95c2da = 35: bc36821 mingw: prevent regressions with "drive-less" absolute paths
35: 646307e = 36: f773b90 clean: remove mount points when possible
36: ac2925d = 37: 377c1e7 transport: optionally disable side-band-64k
37: 1fb1ccf = 38: bd349d6 mingw: fix fatal error working on mapped network drives on Windows
38: 5ce528a = 39: 2e8f3bc clink.pl: fix MSVC compile script to handle libcurl-d.lib
39: f7c3c36 = 40: 329ba92 mingw: implement a platform-specific
strbuf_realpath()40: 0691118 = 41: 50a601e t3701: verify that we can add lots of files interactively
41: c3ad14d = 42: f92b89a commit: accept "scissors" with CR/LF line endings
42: 41de18f = 43: 075b48f t0014: fix indentation
43: 5f0c383 = 44: c663ffe git-gui: accommodate for intent-to-add files
44: 0243b72 = 45: 62f4bac mingw: allow for longer paths in
parse_interpreter()45: 443bcf5 = 46: 0ed3f6c compat/vcbuild: document preferred way to build in Visual Studio
46: 96244fe = 47: 6dcfedd http: optionally send SSL client certificate
83: 2643eb4 = 48: 54c82b6 ci: run
contrib/subtreetests in CI builds68: 7b15aa2 = 49: 0ca1f54 CMake: default Visual Studio generator has changed
72: 918c437 = 50: bec6e78 .gitignore: add Visual Studio CMakeSetting.json file
77: 948b0ea = 51: dff5b02 CMakeLists: add default "x64-windows" arch for Visual Studio
63: f6928a0 = 52: 3429678 hash-object: demonstrate a >4GB/LLP64 problem
84: 462f77a = 53: b1b261e CMake: show Win32 and Generator_platform build-option values
47: 76b0146 = 54: f455d86 windows: skip linking
git-<command>for built-ins48: d88b94a = 55: 3fae56f mingw: stop hard-coding
CC = gcc49: 73b49cf = 56: abf1404 mingw: drop the -D_USE_32BIT_TIME_T option
50: 7ac499d = 57: a661c50 mingw: only use -Wl,--large-address-aware for 32-bit builds
51: ae31da3 = 58: c0d6fac mingw: avoid over-specifying
--pic-executable52: b59adb9 = 59: 24e08c0 mingw: set the prefix and HOST_CPU as per MSYS2's settings
53: bc70456 = 60: ab6d07d mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
54: b91590c = 61: eecab31 mingw: rely on MSYS2's metadata instead of hard-coding it
55: 5ec393b = 62: 23accaa mingw: always define
ETC_*for MSYS2 environments56: a867012 = 63: b3e3605 max_tree_depth: lower it for clang builds in general on Windows
57: f47743f = 64: 7d9cb00 mingw: ensure valid CTYPE
58: 6c720ed = 65: 0ae0f83 mingw: allow
git.exeto be used instead of the "Git wrapper"59: 0b1b4f0 = 66: 13f3751 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
60: 90c9f55 = 67: 7cf97cb Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
61: fea0df7 = 68: 3926cb0 clink.pl: fix libexpatd.lib link error when using MSVC
62: 702744f = 69: 3d447dc Makefile: clean up .ilk files when MSVC=1
64: cba8818 = 70: 8e78811 vcbuild: add support for compiling Windows resource files
65: 8655a1f < -: ---------- object-file.c: use size_t for header lengths
-: ---------- > 71: c237e0f object-file.c: use size_t for header lengths
66: 71cee35 = 72: 0e040bc config.mak.uname: add git.rc to MSVC builds
69: 21b28ef ! 73: f4d2d09 hash algorithms: use size_t for section lengths
@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> ## object-file.c ## -@@ object-file.c: int odb_source_loose_read_object_info(struct odb_source *source, +@@ object-file.c: int parse_loose_header(const char *hdr, struct object_info *oi) } static void hash_object_body(const struct git_hash_algo *algo, struct git_hash_ctx *c, @@ object-file.c: int odb_source_loose_read_object_info(struct odb_source *source, struct object_id *oid, char *hdr, size_t *hdrlen) { -@@ object-file.c: static void write_object_file_prepare(const struct git_hash_algo *algo, +@@ object-file.c: void write_object_file_prepare(const struct git_hash_algo *algo, /* Generate the header */ *hdrlen = format_object_header(hdr, *hdrlen, type, len);70: 9469919 = 74: eb105b2 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
73: d3acda3 = 75: 3db87f1 hash-object --stdin: verify that it works with >4GB/LLP64
74: 1bac0ae = 76: fae5bf6 clink.pl: move default linker options for MSVC=1 builds
78: 40b739b = 77: 3bb0cce hash-object: add another >4GB/LLP64 test case
79: 93c4b7d = 78: e9687c6 setup: properly use "%(prefix)/" when in WSL
80: af1c6aa = 79: 247639d Add config option
windows.appendAtomically81: dd54492 = 80: cbf8484 cmake: install headless-git.
67: 46487d0 = 81: 3ab4883 MinGW: link as terminal server aware
85: 7c798eb = 82: ee0265c hash-object: add a >4GB/LLP64 test case using filtered input
86: 972ca33 = 83: 2030455 compat/mingw.c: do not warn when failing to get owner
87: f08ceb8 = 84: d849b1d mingw: $env:TERM="xterm-256color" for newer OSes
88: 601a311 = 85: 8e20ab6 winansi: check result and Buffer before using Name
89: 0526097 = 86: 753f53f mingw: change core.fsyncObjectFiles = 1 by default
90: b7daf79 = 87: a3aa1d6 Fix Windows version resources
91: cd2e5d6 = 88: 3042eaf status: fix for old-style submodules with commondir
92: 06ae98b = 89: f3ad7b1 git.rc: include winuser.h
102: 32c9e9f = 90: 422b706 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
104: af2923a = 91: 34dbd27 revision: create mark_trees_uninteresting_dense()
106: 9b38b51 = 92: c1bd0d8 survey: stub in new experimental 'git-survey' command
108: cb0e7a3 = 93: 485a570 survey: add command line opts to select references
110: b7e2a03 = 94: b6ab3f6 survey: start pretty printing data in table form
112: 16780e2 = 95: e8941d8 survey: add object count summary
114: 5e18074 = 96: 2327796 survey: summarize total sizes by object type
103: aa3ab7a = 97: 84eb1e8 Merge 'remote-hg-prerequisites' into HEAD
116: 6b49e5c = 98: 53ee494 survey: show progress during object walk
117: 14d00e7 = 99: 9d9dae8 mingw: make sure
errnois set correctly when socket operations fail118: f32df1a = 100: 7e84416 t5563: verify that NTLM authentication works
105: 056cc82 = 101: c45e7b2 Merge branch 'drive-prefix'
71: 42c2896 = 102: 5c8d76a http: optionally load libcurl lazily
120: 552a744 = 103: ad4aac6 survey: add ability to track prioritized lists
121: 3113a92 = 104: cb90420 compat/mingw: handle WSA errors in strerror
122: 7095c6f = 105: ab56913 http: disallow NTLM authentication by default
107: 7d8b048 = 106: 83a1dd7 Merge branch 'dont-clean-junctions'
75: f6bc729 = 107: 98cf075 http: support lazy-loading libcurl also on Windows
124: c5be3cd = 108: 15b1118 survey: add report of "largest" paths
125: 2f8ccf7 = 109: a9d7bb3 compat/mingw: drop outdated comment
126: f7226e2 = 110: 098d62e http: warn if might have failed because of NTLM
109: ad86bc0 = 111: 2de94da Merge branch 'msys2-python'
82: 537627a = 112: 0c815d6 http: when loading libcurl lazily, allow for multiple SSL backends
128: 06b1082 = 113: d1f6f4b survey: add --top= option and config
129: 5b4f77e = 114: 779db29 t0301: actually test credential-cache on Windows
130: 554ca41 = 115: 10989c9 credential: advertise NTLM suppression and allow helpers to re-enable
111: ceb6f26 = 116: 264f019 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
93: e6897a9 = 117: da0fa28 mingw: do load libcurl dynamically by default
94: ac553fa = 118: ae9d7b0 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
95: fa6b5af = 119: 253aa85 mingw: suggest
windows.appendAtomicallyin more cases96: f21e633 = 120: 863891c win32: use native ANSI sequence processing, if possible
97: 6e5d903 = 121: 9409e3a common-main.c: fflush stdout buffer upon exit
98: 570a975 = 122: 38a7534 t5601/t7406(mingw): do run tests with symlink support
99: d13ae95 = 123: 54605db win32: ensure that
localtime_r()is declared even in i686 builds100: 0013476 = 124: 1fb4aea Fallback to AppData if XDG_CONFIG_HOME is unset
101: 69cf35a = 125: 7a46437 run-command: be helpful with Git LFS fails on Windows 7
132: d2873f5 = 126: 5009687 survey: clearly note the experimental nature in the output
133: e85b92d = 127: 66dc646 credential-cache: handle ECONNREFUSED gracefully
134: f901fe1 = 128: 366750b reftable: do make sure to use custom allocators
135: 9b9a9d2 = 129: ba62cac check-whitespace: avoid alerts about upstream commits
136: bd26e4b = 130: b364fd4 t/t5571-prep-push-hook.sh: Add test with writing to stderr
137: 2e5f9e3 = 131: fb83a56 dir: do not traverse mount points
138: 4cc90c1 = 132: 261d2a8 win32: thread-utils: handle multi-socket systems
139: c4064a4 = 133: 3d4f442 t5563: add tests for http.emptyAuth with Negotiate
113: e81cb81 = 134: 4c5f135 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
115: 52724c0 = 135: de36047 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
119: f057f92 = 136: 5ffa692 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
123: 81b1cf0 = 137: cb79ae4 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction127: 4a9f034 = 138: 3b57e57 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
131: de15dce = 139: 045e95a Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
140: c842b78 = 140: fb5a45d Merge 'add-p-many-files'
141: 2e5a474 = 141: 8414001 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
142: 5a69cb6 = 142: 03d0143 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
143: 2db94f5 = 143: 1ab8504 Merge 'git-gui/js/intent-to-add'
144: 0235156 = 144: 724bf8c Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
145: ca862a9 = 145: 2aa500a Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
146: 3c3518f = 146: def1daa Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
147: ab2db95 = 147: c28d1f2 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path148: c8cf813 = 148: d06d1d0 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
149: 317e270 = 149: 60f9eda Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
150: 09a22a9 = 150: ea91262 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests151: 8190323 = 151: 938ea00 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
152: f182a90 = 152: 403e4d2 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t153: 434da43 = 153: 08fcdc9 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory154: d9d30a6 = 154: 86f0fbb Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
155: a17cfd6 = 155: 11fe02d Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
156: 9205bbb = 156: 3c5e030 Merge branch 'optionally-dont-append-atomically-on-windows'
157: 43925a6 = 157: e07bd36 Merge branch 'fsync-object-files-always'
158: c20f16e = 158: 71808c2 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
159: aacbc9a = 159: eba15d8 Fix Windows version resources (Fix Windows version resources git#4092)
160: f7dc760 = 160: 656fb8e Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
161: 3fc01da = 161: 811c4ad Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)162: f57e904 = 162: fac5b8d Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)163: 29015d5 = 163: f31850a Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283164: 949bc6b = 164: 70b477b Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
165: 1a11ef7 = 165: 37d93ba ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
166: 2e3c3f1 = 166: bab3c9e 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: 11e4ef8 = 167: 97aa17b Merge branch 'nano-server'
168: 2eb103d = 168: 515e363 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
169: 83e2d4b = 169: 2d720d7 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
170: 38207de = 170: 8d948b5 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
171: 8d3d707 = 171: b9b1718 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
172: b72196c = 172: 7f6c58d Merge branch 'Fix-i686-build-with-GCC-v14'
173: c3cac69 = 173: 52ab8db Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
174: 0b3f452 = 174: 86e2f31 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
175: 19ed3d8 = 175: 69966e8 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
176: 9141d8b = 176: e00b652 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: fbcb231 = 177: b87806d Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
178: 3b77902 = 178: e598823 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
179: 503f381 = 179: d21ac60 Merge branch 'reftable-vs-custom-allocators'
180: b5bbc08 = 180: 32f635d Merge branch 'check-whitespace-only-downstream'
181: 9fde6fa = 181: 98f0459 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: 7f0c73c = 182: 92f98f8 Merge branch 'disallow-ntlm-auth-by-default'
183: 377fdea = 183: 3f9d790 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)184: 3662e4f = 184: f69c3f4 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
185: 8bddff4 = 185: 87bf265 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
186: 5909f3b = 186: f910541 Merge branch 'ready-for-upstream'
187: b1b6dd8 = 187: 3d1a347 ci(macos): skip the
git p4tests188: 62bb152 = 188: ef1bf38 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)189: 8ac7015 = 189: eefbf36 Win32: make FILETIME conversion functions public
190: 3e768e8 = 190: 7eb8bcc Win32: dirent.c: Move opendir down
191: 7090072 = 191: d526e51 mingw: make the dirent implementation pluggable
192: 9b9c79e = 192: 8e71223 Win32: make the lstat implementation pluggable
194: 606dd69 = 193: 26d488f mingw: add infrastructure for read-only file system level caches
196: c6fb9ae = 194: 316a599 mingw: add a cache below mingw's lstat and dirent implementations
198: c1bde35 = 195: a7024bd fscache: load directories only once
199: cdb8adc = 196: 8ee31d2 fscache: add key for GIT_TRACE_FSCACHE
200: 1ae458d = 197: bf25acc fscache: remember not-found directories
193: f69ad5e = 198: 74197ea git-gui--askyesno: fix funny text wrapping
201: c720440 = 199: 6896a95 fscache: add a test for the dir-not-found optimization
195: 1296b97 = 200: fc47f1b git-gui--askyesno (mingw): use Git for Windows' icon, if available
202: 4f3ccc1 = 201: 749bdd7 add: use preload-index and fscache for performance
197: 227ab57 = 202: 3d50d74 Merge branch 'git-gui-askyesno'
203: 6e3ec6b = 203: f7507ab dir.c: make add_excludes aware of fscache during status
204: 99bc859 = 204: 9f53120 fscache: make fscache_enabled() public
205: 30d9d4e = 205: e644aaf dir.c: regression fix for add_excludes with fscache
206: e38119d = 206: 100ee7f fetch-pack.c: enable fscache for stats under .git/objects
207: 7889571 = 207: 45ab672 checkout.c: enable fscache for checkout again
208: 4654956 = 208: d425767 Enable the filesystem cache (fscache) in refresh_index().
209: 3d0a4ad = 209: 647f12e fscache: use FindFirstFileExW to avoid retrieving the short name
210: 52c46a3 = 210: ca15dc3 fscache: add GIT_TEST_FSCACHE support
211: 836899e = 211: 501eca7 fscache: add fscache hit statistics
212: 843de1b = 212: 98e1a98 unpack-trees: enable fscache for sparse-checkout
213: c207ff9 = 213: ebcd7d2 status: disable and free fscache at the end of the status command
214: 9dec2ec = 214: 0926a1a mem_pool: add GIT_TRACE_MEMPOOL support
215: bdec55b = 215: 5bfc901 fscache: fscache takes an initial size
216: dbbebd0 = 216: 0053e35 fscache: update fscache to be thread specific instead of global
217: 11cc312 = 217: 962598d fscache: teach fscache to use mempool
218: 221e64b = 218: 78786e6 fscache: make fscache_enable() thread safe
219: 6f8b8e3 = 219: ed9c2df fscache: teach fscache to use NtQueryDirectoryFile
220: 25856a1 = 220: 6d2fc30 fscache: remember the reparse tag for each entry
221: 0d1f28a = 221: a5b4e6d Merge branch 'fscache'
222: 3191c96 = 222: ee20e7c fscache: implement an FSCache-aware is_mount_point()
223: 735965c = 223: fbe8620 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: d2e6b2a = 224: 315da94 clean: make use of FSCache
225: 11b2179 = 225: 0f0cff2 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
226: a11311f = 226: c5bf00d Merge branch 'dont-clean-junctions-fscache'
227: f9335be = 227: a509a8e pack-objects (mingw): demonstrate a segmentation fault with large deltas
228: 6cb5ea5 = 228: 3393d1a mingw: support long paths
229: 453aa7e = 229: c7687fb win32(long path support): leave drive-less absolute paths intact
230: a2fb347 = 230: a0cac36 compat/fsmonitor/fsm-*-win32: support long paths
231: a5e71a2 = 231: 3a6eddc clean: suggest using
core.longPathsif paths are too long to remove232: 58949c5 = 232: 8cfa321 mingw: Support
git_terminal_promptwith more terminals233: fa62ac1 = 233: 341f16d compat/terminal.c: only use the Windows console if bash 'read -r' fails
234: bf279fc = 234: 4ce8089 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
235: cd0e576 = 235: f479201 Win32: symlink: move phantom symlink creation to a separate function
236: 5a233dd = 236: f82a01b Introduce helper to create symlinks that knows about index_state
237: ca8b447 = 237: 2d7f22c mingw: allow to specify the symlink type in .gitattributes
238: ea1c856 = 238: 68c7d8f Win32: symlink: add test for
symlinkattribute239: 0c48a53 = 239: a6766bd mingw: explicitly specify with which cmd to prefix the cmdline
240: 4d60f69 = 240: 2175a41 mingw: when path_lookup() failed, try BusyBox
241: 32781f1 = 241: e4401b3 test-tool: learn to act as a drop-in replacement for
iconv243: 12332df = 242: 1f0e5cf tests(mingw): if
iconvis unavailable, usetest-helper --iconv245: 96a3de7 = 243: 18a22fb gitattributes: mark .png files as binary
247: 540abfe = 244: 52e6672 tests: move test PNGs into t/lib-diff/
249: 7989ab2 = 245: 9c33432 tests: only override sort & find if there are usable ones in /usr/bin/
242: d983b9c = 246: 3d74002 mingw: introduce code to detect whether we're inside a Windows container
251: 776fba5 = 247: cf8ae05 tests: use the correct path separator with BusyBox
244: 250d3fc = 248: e365da6 mingw: when running in a Windows container, try to rename() harder
252: b1681e5 = 249: 5ca5b91 mingw: only use Bash-ism
builtin pwd -Wwhen available246: ea62efc = 250: 783484b mingw: move the file_attr_to_st_mode() function definition
253: 53a40e2 = 251: 4b5ce2e tests (mingw): remove Bash-specific pwd option
248: f683bda = 252: 8f6b687 mingw: Windows Docker volumes are not symbolic links
254: 8e7e061 = 253: dccd016 test-lib: add BUSYBOX prerequisite
250: c9da7b8 = 254: c7d105e mingw: work around rename() failing on a read-only file
255: 06f7c90 = 255: 4ded51e Merge branch 'gitk-and-git-gui-patches'
256: 98ae948 = 256: 55a37b6 t5003: use binary file from t/lib-diff/
257: 71fd30c = 257: a530450 Merge branch 'long-paths'
259: ce2245f = 258: 8e1ac76 t5532: workaround for BusyBox on Windows
260: 122aeef = 259: 397a3a0 Merge branch 'msys2'
262: 1878d43 = 260: a64ec59 t5605: special-case hardlink test for BusyBox-w32
263: 891ab76 = 261: 95405c5 Merge 'docker-volumes-are-no-symlinks'
265: 65d5485 = 262: e870fda t5813: allow for $PWD to be a Windows path
266: e0bdc75 = 263: 142ea64 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
268: f429ea9 = 264: dbd1261 t9200: skip tests when $PWD contains a colon
269: 787b584 = 265: b0f4cbd Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
258: 90bba60 = 266: 7f9d0dc Describe Git for Windows' architecture
271: d64a51f = 267: 927a63c mingw: kill child processes in a gentler way
272: 46e3d15 = 268: 9548dbb mingw: optionally enable wsl compability file mode bits
273: b7aa3fb = 269: fed8cc6 Merge branch 'busybox-w32'
261: aa66672 = 270: d45ef1e Modify the Code of Conduct for Git for Windows
276: 2e434a0 = 271: af73201 mingw: really handle SIGINT
277: 2e8a60e = 272: 1ba5b18 Merge branch 'wsl-file-mode-bits'
264: b1b3102 = 273: 910e348 CONTRIBUTING.md: add guide for first-time contributors
278: 400d5c9 = 274: 242198d Partially un-revert "editor: save and reset terminal after calling EDITOR"
283: 4f367fc = 275: a0b8615 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
267: 113cdaa = 276: 7c314e1 README.md: Add a Windows-specific preamble
279: 4d91b36 = 277: a72e0e8 reset: reinstate support for the deprecated --stdin option
284: 82022bf = 278: f8a9b79 Merge branch 'un-revert-editor-save-and-reset'
270: a40d9a9 = 279: 11d510b Add an issue template
274: 71d4722 = 280: c319317 Add a GitHub workflow to monitor component updates
280: bbe1c1d = 281: c0efc28 fsmonitor: reintroduce core.useBuiltinFSMonitor
285: 55d2c43 = 282: 1fafd3b Merge branch 'phase-out-reset-stdin'
275: ab09e72 = 283: 1b728d0 Modify the GitHub Pull Request template (to reflect Git for Windows)
281: 906dcf9 = 284: 2e5682b dependabot: help keeping GitHub Actions versions up to date
286: c4d0961 = 285: 965ee5f Merge branch 'deprecate-core.useBuiltinFSMonitor'
282: d88dd16 = 286: 80b2d3e SECURITY.md: document Git for Windows' policies
287: 2b59049 = 287: fec41ad Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
288: e10df81 = 288: 001656e Merge 'readme' into HEAD
289: 8f8b80a = 289: 3e95b63 Add an AGENTS.md file to help with AI-assisted debugging/development
290: 17a0cf5 = 290: 098aef9 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
291: be7b7e0 = 291: 766b0aa fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
292: 7e75bff = 292: af46eb8 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
293: 70e53b9 = 293: 4e8e855 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
294: d87523f = 294: 6922eb8 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
295: 6917167 = 295: 7be7495 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: 64b0131 = 296: 030112b fixup! ci: work around a problem with HTTP/2 vs libcurl v8.10.0
297: e65898d = 297: 81c0fe7 fixup! revision: create mark_trees_uninteresting_dense()
298: 3f9a57a = 298: bd9398a Drop obsolete downstream patches (Drop obsolete downstream patches git#6208)
299: bdff1c5 = 299: 97f6ceb Merge branch 'pr-2097'
300: 816d4db = 300: 1aac438 fixup! Add a GitHub workflow to verify that Git/Scalar work in Nano Server
301: 5261214 = 301: 128b308 Update GitHub Actions versions used in the GitHub workflows (Update GitHub Actions versions used in the GitHub workflows git#6220)
302: c3d7d54 = 302: 278d61d build: tolerate use of _Generic from glibc 2.43 with Clang
303: 17f62cb = 303: ac06605 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: 0d1ea66 = 304: 1f1fbbc AGENTS.md: document
amend!, fixup-only PRs, and direct GfW PRs (AGENTS.md: documentamend!, fixup-only PRs, and direct GfW PRs git#6232)305: 2f538e7 = 305: a1cce71 amend! mingw: use mimalloc
306: 28ba979 = 306: eeda81c fixup! mimalloc: offer a build-time option to enable it
307: f78c1d4 = 307: 1af7546 fixup! mimalloc: adjust for building inside Git
308: e46c702 = 308: c0af565 fixup! Import the source code of mimalloc v2.2.7
309: bfcfd45 = 309: 7f8186c fixup! git-compat-util: avoid redeclaring _DEFAULT_SOURCE
310: 2039495 = 310: 58ac442 fixup! win32/pthread: avoid name clashes with winpthread
311: 1c5155f = 311: 70cd629 Drop mimalloc (Drop mimalloc git#6231)