Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#26713905065)#210
Open
gitforwindowshelper[bot] wants to merge 295 commits into
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#26713905065)#210gitforwindowshelper[bot] wants to merge 295 commits into
gitforwindowshelper[bot] wants to merge 295 commits into
Conversation
The vcpkg downloads may not succeed. Warn careful readers of the time out. A simple retry will usually resolve the issue. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Git's regular Makefile mentions that HOST_CPU should be defined when cross-compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L438-L439 This is then used to set the GIT_HOST_CPU variable when compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L1337-L1341 Then, when the user runs `git version --build-options`, it returns that value: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/help.c#L658 This commit adds the same functionality to the CMake configuration. Users can now set -DHOST_CPU= to set the target architecture. Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
As reported in newren/git-filter-repo#225, it looks like 99 bytes is not really sufficient to represent e.g. the full path to Python when installed via Windows Store (and this path is used in the hasb bang line when installing scripts via `pip`). Let's increase it to what is probably the maximum sensible path size: MAX_PATH. This makes `parse_interpreter()` in line with what `lookup_prog()` handles. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Vilius Šumskas <vilius@sumskas.eu>
We used to have that `make vcxproj` hack, but a hack it is. In the meantime, we have a much cleaner solution: using CMake, either explicitly, or even more conveniently via Visual Studio's built-in CMake support (simply open Git's top-level directory via File>Open>Folder...). Let's let the `README` reflect this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This adds support for a new http.sslAutoClientCert config value. In cURL 7.77 or later the schannel backend does not automatically send client certificates from the Windows Certificate Store anymore. This config value is only used if http.sslBackend is set to "schannel", and can be used to opt in to the old behavior and force cURL to send client certificates. This fixes git-for-windows#3292 Signed-off-by: Pascal Muller <pascalmuller@gmail.com>
Because `git subtree` (unlike most other `contrib` modules) is included as part of the standard release of Git for Windows, its stability should be verified as consistently as it is for the rest of git. By including the `git subtree` tests in the CI workflow, these tests are as much of a gate to merging and indicator of stability as the standard test suite. Signed-off-by: Victoria Dye <vdye@github.com>
Ensure key CMake option values are part of the CMake output to facilitate user support when tool updates impact the wider CMake actions, particularly ongoing 'improvements' in Visual Studio. These CMake displays perform the same function as the build-options.txt provided in the main Git for Windows. CMake is already chatty. The setting of CMAKE_EXPORT_COMPILE_COMMANDS is also reported. Include the environment's CMAKE_EXPORT_COMPILE_COMMANDS value which may have been propogated to CMake's internal value. Testing the CMAKE_EXPORT_COMPILE_COMMANDS processing can be difficult in the Visual Studio environment, as it may be cached in many places. The 'environment' may include the OS, the user shell, CMake's own environment, along with the Visual Studio presets and caches. See previous commit for arefacts that need removing for a clean test. Signed-off-by: Philip Oakley <philipoakley@iee.email>
These fixes have been sent to the Git mailing list but have not been picked up by the Git project yet. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is no longer true in general, not with supporting Clang out of the box. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib` rather than `libexpat.lib`. It appears that the `vcpkg` package for "libexpat" has changed and now creates `libexpatd.lib` for debug mode builds. Previously, both debug and release builds created a ".lib" with the same basename. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
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>
In bf2d5d8 (Don't let ld strip relocations, 2016-01-16) (picked from git-for-windows@6a237925bf10), Git for Windows introduced the `-Wl,-pic-executable` flag, specifying the exact entry point via `-e`. This required discerning between i686 and x86_64 code because the former required the symbol to be prefixed with an underscore, the latter did not. As per https://sourceware.org/bugzilla/show_bug.cgi?id=10865, the specified symbols are already the default, though. So let's drop the overly-specific definition. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
When 'git survey' provides information to the user, this will be presented in one of two formats: plaintext and JSON. The JSON implementation will be delayed until the functionality is complete for the plaintext format. The most important parts of the plaintext format are headers specifying the different sections of the report and tables providing concreted data. Create a custom table data structure that allows specifying a list of strings for the row values. When printing the table, check each column for the maximum width so we can create a table of the correct size from the start. The table structure is designed to be flexible to the different kinds of output that will be implemented in future changes. Signed-off-by: Derrick Stolee <stolee@gmail.com>
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>
At the moment, nothing is obvious about the reason for the use of the
path-walk API, but this will become more prevelant in future iterations. For
now, use the path-walk API to sum up the counts of each kind of object.
For example, this is the reachable object summary output for my local repo:
REACHABLE OBJECT SUMMARY
========================
Object Type | Count
------------+-------
Tags | 1343
Commits | 179344
Trees | 314350
Blobs | 184030
Signed-off-by: Derrick Stolee <stolee@gmail.com>
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>
This compile-time option allows to ask Git to load libcurl dynamically at runtime. Together with a follow-up patch that optionally overrides the file name depending on the `http.sslBackend` setting, this kicks open the door for installing multiple libcurl flavors side by side, and load the one corresponding to the (runtime-)configured SSL/TLS backend. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Now that we have explored objects by count, we can expand that a bit more to summarize the data for the on-disk and inflated size of those objects. This information is helpful for diagnosing both why disk space (and perhaps clone or fetch times) is growing but also why certain operations are slow because the inflated size of the abstract objects that must be processed is so large. Note: zlib-ng is slightly more efficient even at those small sizes. Even between zlib versions, there are slight differences in compression. To accommodate for that in the tests, not the exact numbers but some rough approximations are validated (the test should validate `git survey`, after all, not zlib). Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
Getting started contributing to Git can be difficult on a Windows machine. CONTRIBUTING.md contains a guide to getting started, including detailed steps for setting up build tools, running tests, and submitting patches to upstream. [includes an example by Pratik Karki how to submit v2, v3, v4, etc.] Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Specify symlink type in .gitattributes
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and Philip Oakley. Helped-by: Clive Chan <cc@clive.io> Helped-by: Adric Norris <landstander668@gmail.com> Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com> Helped-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Brendan Forster <brendan@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This patch introduces support to set special NTFS attributes that are interpreted by the Windows Subsystem for Linux as file mode bits, UID and GID. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Handle Ctrl+C in Git Bash nicely Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
…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>
Add a README.md for GitHub goodness. 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).
The downstream NTLM topic (883674c, "t5563: verify that NTLM authentication works") and upstream commit 7e98eb8 ("t5563: add tests for http.emptyAuth with Negotiate") both added SPNEGO tests to the end of t5563. When both topics landed in shears/seen, the SPNEGO tests were duplicated: the first set appears before the NTLM tests (from upstream), the second set after (from the downstream topic). Since GIT_TRACE_CURL appends to the trace file rather than overwriting it, the second set of tests sees the 401 responses from both runs. Test 21 (auto mode) expects 3 lines in trace-auto but finds 6 (3 + 3), and test 22 (false mode) expects 1 but finds 2 (1 + 1), causing all four macOS CI jobs to fail. Remove the duplicate second set; the first (upstream) copy is sufficient. Assisted-by: Claude Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…-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: seen
From: 944bc50c94 (Drop mimalloc (git-for-windows#6231), 2026-05-26) (9cf9483590..944bc50c94)
Resolved: 74344d9 (AGENTS.md: document
amend!, fixup-only PRs, and direct GfW PRs (git-for-windows#6232), 2026-05-26)Resolved merge commit by taking HEAD for all non-AGENTS.md files (merge didn't modify them) and accepting the new
amend!commits and Contributing to Git for Windows sections in AGENTS.mdRange-diff
1: 74344d9 ! 1: 449c0d8 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 c383ac53e6..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. +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) +-================================ + ### `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. +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) +-================================ + ## 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 bd0c80b9ad..ddba93393c 100644 + --- Documentation/config/sideband.adoc + +++ Documentation/config/sideband.adoc +@@ + sideband.allowControlCharacters:: +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + ifdef::with-breaking-changes[] + By default, control characters that are delivered via the sideband + are masked, except ANSI color sequences. This prevents potentially +@@ Documentation/config/sideband.adoc: endif::with-breaking-changes[] + sideband.<url>.*:: + Apply the `sideband.*` option selectively to specific URLs. The + same URL matching logic applies as for `http.<url>.*` settings. +-======= +- 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 +- 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 452606015d..d761eff7f3 100644 + --- Makefile + +++ Makefile +@@ Makefile: CLAR_TEST_SUITES += u-hashmap + CLAR_TEST_SUITES += u-list-objects-filter-options + CLAR_TEST_SUITES += u-mem-pool + CLAR_TEST_SUITES += u-mingw +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + CLAR_TEST_SUITES += u-odb-inmemory +-======= +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + CLAR_TEST_SUITES += u-oid-array + CLAR_TEST_SUITES += u-oidmap + CLAR_TEST_SUITES += u-oidtree +@@ Makefile: $(MIMALLOC_OBJS): COMPAT_CFLAGS += \ + endif + endif + +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + +-======= +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + ifdef OVERRIDE_STRDUP + COMPAT_CFLAGS += -DOVERRIDE_STRDUP + COMPAT_OBJS += compat/strdup.o + + ## compat/mingw.c ## + remerge CONFLICT (content): Merge conflict in compat/mingw.c + index 90109ab93c..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) +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + 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 03bd329a13..f63449d912 100644 + --- config.mak.dev + +++ config.mak.dev +@@ config.mak.dev: ifndef USE_MIMALLOC + DEVELOPER_CFLAGS += -std=gnu99 + endif + endif +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + endif +-======= +->>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + else + # FreeBSD cannot limit to C99 because its system headers unconditionally + # rely on C11 features. + + ## contrib/buildsystems/CMakeLists.txt ## + remerge CONFLICT (content): Merge conflict in contrib/buildsystems/CMakeLists.txt + index 2241962389..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 +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + 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 +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) +-======= +- 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 644116fcaa..0056c369ce 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); + } + +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + 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; + } + +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) +-======= +-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 8062781ff3..2b361a2fe1 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. + */ +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + 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 a106fbf92d..58a9378937 100644 + --- sideband.c + +++ sideband.c +@@ sideband.c: static struct keyword_entry keywords[] = { + }; + + static enum { +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + 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; + +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + 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); + } + +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + 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 +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + * + * 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; + +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + 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--) { +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + 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, '^'); +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + 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 66e565df65..85666e3638 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', +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + '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 5ef4026054..07cbc62736 100755 + --- t/t5409-colorize-remote-messages.sh + +++ t/t5409-colorize-remote-messages.sh +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'fallback to color.ui' ' + grep "<BOLD;RED>error<RESET>: error" decoded + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + if test_have_prereq WITH_BREAKING_CHANGES + then + TURN_ON_SANITIZING=already.turned=on +@@ t/t5409-colorize-remote-messages.sh: else + TURN_ON_SANITIZING=sideband.allowControlCharacters=color + fi + +-================================ +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + test_expect_success 'disallow (color) control sequences in sideband' ' + write_script .git/color-me-surprised <<-\EOF && + printf "error: Have you \\033[31mread\\033[m this?\\a\\n" >&2 + exec "$@" + EOF +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + test_config_global uploadPack.packObjectsHook ./color-me-surprised && + test_commit need-at-least-one-commit && + + git -c $TURN_ON_SANITIZING clone --no-local . throw-away 2>stderr && +-================================ +- test_config_global uploadPack.packObjectshook ./color-me-surprised && +- test_commit need-at-least-one-commit && +- +- git clone --no-local . throw-away 2>stderr && +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + test_decode_color <stderr >decoded && + test_grep RED decoded && + test_grep "\\^G" stderr && +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'disallow (color) control sequences in sideband' ' + test_file_not_empty actual + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + 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 146e034b11..5ef770c4fc 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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) +-================================ +-test_lazy_prereq NTLM 'curl --version | grep -q NTLM' +- +-test_expect_success NTLM 'access using NTLM auth' ' +- test_when_finished "per_test_cleanup" && +- +- set_credential_reply get <<-EOF && +- username=user +- password=pwd +- EOF +- +- test_config_global credential.helper test-helper && +- test_must_fail env GIT_TRACE_CURL=1 git \ +- ls-remote "$HTTPD_URL/ntlm_auth/repo.git" 2>err && +- test_grep "allowNTLMAuth" err && +- +- # Can be enabled via config +- GIT_TRACE_CURL=1 git -c http.$HTTPD_URL.allowNTLMAuth=true \ +- ls-remote "$HTTPD_URL/ntlm_auth/repo.git" && +- +- # Or via credential helper responding with ntlm=allow +- set_credential_reply get <<-EOF && +- username=user +- password=pwd +- ntlm=allow +- EOF +- +- git ls-remote "$HTTPD_URL/ntlm_auth/repo.git" +-' +- +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + 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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + test_lazy_prereq NTLM 'curl --version | grep -q NTLM' + + test_expect_success NTLM 'access using NTLM auth' ' +@@ t/t5563-simple-http-auth.sh: test_expect_success NTLM 'access using NTLM auth' ' + git ls-remote "$HTTPD_URL/ntlm_auth/repo.git" + ' + +-================================ +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) + test_done + + ## t/t9200-git-cvsexportcommit.sh ## + remerge CONFLICT (content): Merge conflict in t/t9200-git-cvsexportcommit.sh + index 76772824c6..e2a86d7a90 100755 + --- t/t9200-git-cvsexportcommit.sh + +++ t/t9200-git-cvsexportcommit.sh +@@ t/t9200-git-cvsexportcommit.sh: case "$PWD" in + ;; + esac + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + 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 b5eacb7baa..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/ . + +-<<<<<<< 4f04aa5e4b (??? t5563: add tests for http.emptyAuth with Negotiate) + # 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: bbed6b75b2 (Drop mimalloc (git-for-windows#6231), 2026-05-26) (7f76d4c858..bbed6b75b2)
Statistics
Range-diff (click to expand)
1: ede5ed4 = 1: 983e977 ci(dockerized): reduce the PID limit for private repositories
2: a9c1310 = 2: bf5deba mingw: skip symlink type auto-detection for network share targets
3: 73a50e8 = 3: 4775101 Merge branch 'fix-ci'
4: 288c3ff = 4: a00166d unix-socket: avoid leak when initialization fails
5: a34aa31 = 5: 3ef098e Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: bbc4fd1 = 6: e4bfa3b grep: prevent
^$false match at end of file7: db644ad = 7: 8a3d5f6 Merge branch 'v2.53.0.windows.3'
8: a8b32e7 = 8: 6548506 Merge branch 'fixes-from-the-git-mailing-list'
9: e20f266 = 9: c9e83da vcpkg_install: detect lack of Git
11: 8ffcfe7 = 10: 4003814 vcpkg_install: add comment regarding slow network connections
13: 8a043f0 = 11: 04c4e91 vcbuild: install ARM64 dependencies when building ARM64 binaries
15: 8f02d1c = 12: d2b39e0 vcbuild: add an option to install individual 'features'
17: 8ad78da = 13: 376958c cmake: allow building for Windows/ARM64
10: b5e0b85 = 14: 46a3d89 mingw: include the Python parts in the build
20: 4caf69e = 15: 28d49d9 ci(vs-build) also build Windows/ARM64 artifacts
12: 60a6024 = 16: eef231a win32/pthread: avoid name clashes with winpthread
25: 93e168e = 17: c274b32 Add schannel to curl installation
14: c64cb7f = 18: c066952 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
33: 78ef5ca = 19: d2701fd cmake(): allow setting HOST_CPU for cross-compilation
16: 2c5e003 = 20: 3b2706e Import the source code of mimalloc v2.2.7
18: b37554b = 21: 8e58fc4 t9350: point out that refs are not updated correctly
70: 09f7fb2 = 22: 5a06de2 CMake: default Visual Studio generator has changed
19: 7a9b3c2 = 23: a875951 mimalloc: adjust for building inside Git
21: ed9b5c6 = 24: 54ce341 transport-helper: add trailing --
22: b6960b6 = 25: 39e1da1 mingw: demonstrate a
git addissue with NTFS junctions74: 885e215 = 26: fb09d52 .gitignore: add Visual Studio CMakeSetting.json file
23: e46893b = 27: 50a43fa mimalloc: offer a build-time option to enable it
24: 0ee2890 = 28: 363dfe0 t5505/t5516: allow running without
.git/branches/in the templates65: 2af12ef = 29: d509636 hash-object: demonstrate a >4GB/LLP64 problem
26: 9af6cc3 = 30: d344f8a remote-helper: check helper status after import/export
27: 999f316 = 31: 2f7a968 clean: do not traverse mount points
28: 0b6695e = 32: d8855e7 strbuf_realpath(): use platform-dependent API if available
29: 1551ec1 = 33: 6178f97 http: use new "best effort" strategy for Secure Channel revoke checking
30: 353e7ee = 34: 4e8a48e subtree: update
contrib/subtreetesttarget78: 0ed423b = 35: 3986809 CMakeLists: add default "x64-windows" arch for Visual Studio
31: af282cd = 36: 4780a85 mingw: use mimalloc
32: 71700cc = 37: c8612aa t5505/t5516: fix white-space around redirectors
67: 84adef9 = 38: 12ca81c object-file.c: use size_t for header lengths
34: e2d7f4f = 39: cd6280e Always auto-gc after calling a fast-import transport
35: c615034 = 40: a73a042 mingw: prevent regressions with "drive-less" absolute paths
36: 252806a = 41: 6a426f0 clean: remove mount points when possible
37: ac40cec = 42: 016b322 transport: optionally disable side-band-64k
38: c98c8fe = 43: 6d56b22 mingw: fix fatal error working on mapped network drives on Windows
39: 6aed40b = 44: db9cd02 clink.pl: fix MSVC compile script to handle libcurl-d.lib
40: 57f8429 = 45: 76d68b2 mingw: implement a platform-specific
strbuf_realpath()41: edafca4 = 46: c075a23 t3701: verify that we can add lots of files interactively
42: 44eac55 = 47: 41eebb2 commit: accept "scissors" with CR/LF line endings
43: a4f430a = 48: 4d671bb t0014: fix indentation
44: 66f83ee = 49: ffa91d6 git-gui: accommodate for intent-to-add files
45: 2f50e08 = 50: e94f9f6 mingw: allow for longer paths in
parse_interpreter()46: c86c9e8 = 51: 5fa85ac compat/vcbuild: document preferred way to build in Visual Studio
47: 3d3ecfe = 52: 1261b4d http: optionally send SSL client certificate
48: 46f0cce = 53: b8a2224 ci: run
contrib/subtreetests in CI builds84: e657efa = 54: f6050ff CMake: show Win32 and Generator_platform build-option values
49: 8190e17 = 55: b6b54cd windows: skip linking
git-<command>for built-ins50: 852ed71 = 56: af63b52 mingw: stop hard-coding
CC = gcc51: 4762cad = 57: 88c0be9 mingw: drop the -D_USE_32BIT_TIME_T option
52: b94ff02 = 58: 58bf66f mingw: only use -Wl,--large-address-aware for 32-bit builds
53: c6d2ae1 = 59: 6006c01 mingw: avoid over-specifying
--pic-executable54: f7e0ea5 = 60: 40a8d0a mingw: set the prefix and HOST_CPU as per MSYS2's settings
55: 1460cf9 = 61: 5bbe3a5 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
56: 65fb180 = 62: e777447 mingw: rely on MSYS2's metadata instead of hard-coding it
57: 74a48fb = 63: 1fe9b55 mingw: always define
ETC_*for MSYS2 environments58: 331e261 = 64: 84f41eb max_tree_depth: lower it for clang builds in general on Windows
59: 11e0507 = 65: 010439d mingw: ensure valid CTYPE
60: a7ff4a0 = 66: e82c009 mingw: allow
git.exeto be used instead of the "Git wrapper"61: 5d2f9d8 = 67: 69a2ace mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
62: fd69ecd = 68: b2e7b31 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
63: c70b34b = 69: 3b02c61 clink.pl: fix libexpatd.lib link error when using MSVC
107: 86d398a = 70: d9f61a0 survey: stub in new experimental 'git-survey' command
64: b669a89 = 71: cfec559 Makefile: clean up .ilk files when MSVC=1
109: 12f512d = 72: ed79f0f survey: add command line opts to select references
66: db8bf9e = 73: 511c953 vcbuild: add support for compiling Windows resource files
111: e402e15 = 74: ff96003 survey: start pretty printing data in table form
68: 7d05be1 = 75: ed80903 config.mak.uname: add git.rc to MSVC builds
69: f2f287e = 76: 086342e MinGW: link as terminal server aware
113: a3a7b6d = 77: d0373c2 survey: add object count summary
71: 736df69 = 78: 8f6805d hash algorithms: use size_t for section lengths
72: 50e6b4f = 79: 71a22e0 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
73: 808c438 = 80: f5dfc94 http: optionally load libcurl lazily
115: 661ba3c = 81: dd6b2ef survey: summarize total sizes by object type
75: 267f450 = 82: bf57571 hash-object --stdin: verify that it works with >4GB/LLP64
76: 71f54e7 = 83: 0da0e98 clink.pl: move default linker options for MSVC=1 builds
77: d67b3ed = 84: a152fa4 http: support lazy-loading libcurl also on Windows
117: d5405fe = 85: 7d3bfce survey: show progress during object walk
79: 93cd978 = 86: 9a4c825 hash-object: add another >4GB/LLP64 test case
80: 995beac = 87: 0556ea9 setup: properly use "%(prefix)/" when in WSL
81: 813155b = 88: 2100304 Add config option
windows.appendAtomically82: 351607e = 89: 995f41f cmake: install headless-git.
83: bdab229 = 90: 92c88f7 http: when loading libcurl lazily, allow for multiple SSL backends
121: 1612dff = 91: 248c960 survey: add ability to track prioritized lists
85: 21ad4ff = 92: 5411d30 hash-object: add a >4GB/LLP64 test case using filtered input
86: c148aad = 93: 85e8e77 compat/mingw.c: do not warn when failing to get owner
87: 0773a52 = 94: bbf1d8a mingw: $env:TERM="xterm-256color" for newer OSes
88: ac1b0fd = 95: e1e40dc winansi: check result and Buffer before using Name
89: 5d78754 = 96: f876129 mingw: change core.fsyncObjectFiles = 1 by default
90: a74f999 = 97: 7a38654 Fix Windows version resources
91: 091317d = 98: 7859c61 status: fix for old-style submodules with commondir
92: 51964cf = 99: 0947abf git.rc: include winuser.h
93: 528cc6e = 100: 503f6e0 mingw: do load libcurl dynamically by default
94: 0152f2a = 101: fedd950 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
95: ca373b4 = 102: c81841d mingw: suggest
windows.appendAtomicallyin more cases96: b71cde6 = 103: 59650e3 win32: use native ANSI sequence processing, if possible
97: 23184bd = 104: 5341cd9 common-main.c: fflush stdout buffer upon exit
98: e820d6d = 105: 5eccc18 t5601/t7406(mingw): do run tests with symlink support
99: ae684ec = 106: 16249bd win32: ensure that
localtime_r()is declared even in i686 builds100: 1df6a38 = 107: 3cec110 Fallback to AppData if XDG_CONFIG_HOME is unset
101: bc2abd4 = 108: c129f4e run-command: be helpful with Git LFS fails on Windows 7
102: 8d6098c = 109: 71fd8d1 Merge 'remote-hg-prerequisites' into HEAD
103: 4267bb1 = 110: 320b3df Merge branch 'drive-prefix'
104: 8c07127 = 111: d800f29 Merge branch 'dont-clean-junctions'
105: 47bebae = 112: fab9fd9 Merge branch 'msys2-python'
118: 3245989 = 113: 3c15d0e mingw: make sure
errnois set correctly when socket operations fail119: 5774d4f = 114: 3c6b11c t5563: verify that NTLM authentication works
106: 62a453d = 115: 31c2463 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
122: 02e8105 = 116: e92f103 compat/mingw: handle WSA errors in strerror
123: 7ce6fcc = 117: 3c5f95d http: disallow NTLM authentication by default
108: cd8bbf9 = 118: 761bd6f Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
125: 53692f5 = 119: 998bcf2 survey: add report of "largest" paths
126: 0d19d65 = 120: a47abde compat/mingw: drop outdated comment
127: dc32b3a = 121: b362c1f http: warn if might have failed because of NTLM
110: cf64895 = 122: 1031c68 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
129: c77abad = 123: ac6c4ae survey: add --top= option and config
130: 1ecbaa1 = 124: aca70dc t0301: actually test credential-cache on Windows
131: 5b42657 = 125: af450e2 credential: advertise NTLM suppression and allow helpers to re-enable
112: ec95143 = 126: d73f60d Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
133: 7a9fc2d = 127: abc1411 survey: clearly note the experimental nature in the output
134: 922054e = 128: 7f1d05b credential-cache: handle ECONNREFUSED gracefully
135: 7d9a6fb = 129: 5657227 reftable: do make sure to use custom allocators
136: c48d64f = 130: bc78ea3 check-whitespace: avoid alerts about upstream commits
137: 81942d1 = 131: 7a79ec0 t/t5571-prep-push-hook.sh: Add test with writing to stderr
138: 88d9f8b = 132: 5347ae0 dir: do not traverse mount points
139: 9fec098 = 133: d7ae8d5 win32: thread-utils: handle multi-socket systems
140: e673ac7 = 134: d391b13 t5563: add tests for http.emptyAuth with Negotiate
114: 4734ea5 = 135: 9a720b0 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction116: 41c3844 = 136: c69d6ce Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
120: 5fff31b = 137: 59c0e4b Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
124: 1312b45 = 138: 0c5bd2b Merge 'add-p-many-files'
128: 08b2fe0 = 139: e01a154 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
132: 4726a45 = 140: 7ba6df7 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
141: aa8732f = 141: ed0a827 Merge 'git-gui/js/intent-to-add'
142: 679efd4 = 142: 9c19e26 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
143: 2990403 = 143: d59c64d Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
144: d3aa0c9 = 144: 892de78 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
145: f8c26c5 = 145: e14b0ea Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path146: f0881ed = 146: fafdbac Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
147: 7d070bb = 147: a1ac078 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
148: 0312aa0 = 148: 436b89d Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests149: 87f6656 = 149: b725508 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
150: bf275c6 = 150: d5c03c0 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t151: 4568e2d = 151: 4488c00 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory152: 899f887 = 152: 6d6ccf4 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
153: 51b1c85 = 153: 1893d6f Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
154: 09ed29f = 154: d050cd3 Merge branch 'optionally-dont-append-atomically-on-windows'
155: 00f5d07 = 155: 1ebf424 Merge branch 'fsync-object-files-always'
156: 4b04745 = 156: b1fb8b7 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
157: 9606e8e = 157: 9cbc91a Fix Windows version resources (Fix Windows version resources git#4092)
158: 32067b5 = 158: 56a43ba Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
159: 5639d2c = 159: 8bffafa Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)160: 562ef4c = 160: 245d8e5 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)161: 5fc6fc4 = 161: 8978059 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283162: 8b21278 = 162: dacda04 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
163: cf2d12d = 163: 0abf8ed ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
164: 2ad5921 = 164: 4a9a748 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
165: f16a15b = 165: 165ad72 Merge branch 'nano-server'
166: bb8c6f7 = 166: ea866bc Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
167: 2dd4884 = 167: 1357424 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
168: 0d1dea0 = 168: 41a355e common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
169: 48f5d2a = 169: 19e13f3 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
170: b109ac9 = 170: c70ff42 Merge branch 'Fix-i686-build-with-GCC-v14'
171: ef1d9c7 = 171: 13140f6 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
172: d8c714b = 172: a3eb797 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
173: b7453eb = 173: 13fe293 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
174: f26fc3c = 174: bdd70f6 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
175: f166be8 = 175: 371938a Merge branch 'reftable-vs-custom-allocators'
176: 3d9da69 = 176: 86469b5 Merge branch 'check-whitespace-only-downstream'
177: 127506c = 177: e6e9fd4 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)
178: 8ce6d12 = 178: 397100b Merge branch 'disallow-ntlm-auth-by-default'
179: 377d219 = 179: 1fa63b5 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)180: 018fbd6 = 180: a381588 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
181: d064e67 = 181: 5207de0 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
182: f9f0aca = 182: 5beca64 Merge branch 'ready-for-upstream'
183: c3b3818 = 183: 7d81bc2 ci(macos): skip the
git p4tests184: 4f07baf = 184: 56dece6 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)185: 5b2ec30 = 185: cec7461 Win32: make FILETIME conversion functions public
186: 1c01804 = 186: e0c3ca0 Win32: dirent.c: Move opendir down
187: c87c8c7 = 187: efcbeaa mingw: make the dirent implementation pluggable
188: 8218eb8 = 188: 4927dc2 Win32: make the lstat implementation pluggable
189: a883364 = 189: 30c680b mingw: add infrastructure for read-only file system level caches
190: 7f3d785 = 190: 1a2ead0 mingw: add a cache below mingw's lstat and dirent implementations
195: fa8bf46 = 191: d469575 git-gui--askyesno: fix funny text wrapping
191: 8fa5b9b = 192: df894e7 fscache: load directories only once
197: 14acd1a = 193: 72be295 git-gui--askyesno (mingw): use Git for Windows' icon, if available
192: 6bf50d0 = 194: f985e3b fscache: add key for GIT_TRACE_FSCACHE
199: 89f69a5 = 195: 985000a Merge branch 'git-gui-askyesno'
193: c368c54 = 196: 05a9a6a fscache: remember not-found directories
194: 7d217ae = 197: 93e5af5 fscache: add a test for the dir-not-found optimization
196: 82c9bcd = 198: bd0ddad add: use preload-index and fscache for performance
198: 9469359 = 199: 591966b dir.c: make add_excludes aware of fscache during status
200: f23016c = 200: ae3e24f fscache: make fscache_enabled() public
201: f90882b = 201: 7652970 dir.c: regression fix for add_excludes with fscache
202: e355246 = 202: a47d5dd fetch-pack.c: enable fscache for stats under .git/objects
203: 24fcb4b = 203: f51231f checkout.c: enable fscache for checkout again
204: 6115ad6 = 204: 5a85f4d Enable the filesystem cache (fscache) in refresh_index().
205: 0d8dcf6 = 205: 080cf40 fscache: use FindFirstFileExW to avoid retrieving the short name
206: 48aaef6 = 206: 663ff87 fscache: add GIT_TEST_FSCACHE support
207: de341dd = 207: 82b331a fscache: add fscache hit statistics
208: 6f37fbb = 208: 9500951 unpack-trees: enable fscache for sparse-checkout
209: 82d5d75 = 209: 7423d98 status: disable and free fscache at the end of the status command
210: 8f35783 = 210: b81179e mem_pool: add GIT_TRACE_MEMPOOL support
211: 2645e08 = 211: 288f4aa fscache: fscache takes an initial size
212: c932bd9 = 212: 8cb8dbb fscache: update fscache to be thread specific instead of global
213: 21f5314 = 213: 705c664 fscache: teach fscache to use mempool
214: 62ed30a = 214: ff2d48b fscache: make fscache_enable() thread safe
215: d666a77 = 215: 401b798 fscache: teach fscache to use NtQueryDirectoryFile
216: f24c866 = 216: bdd4c6e fscache: remember the reparse tag for each entry
217: d014ec7 = 217: b0d0202 Merge branch 'fscache'
218: 5bd2765 = 218: f6d51f0 fscache: implement an FSCache-aware is_mount_point()
219: b23a69b = 219: bb2b103 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
220: e654079 = 220: 44d2ebf clean: make use of FSCache
221: 74e8095 = 221: 8a2aee4 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
222: 05fee32 = 222: dbab837 Merge branch 'dont-clean-junctions-fscache'
223: 40940a3 = 223: c4e469e pack-objects (mingw): demonstrate a segmentation fault with large deltas
224: d143ca4 = 224: df44305 mingw: support long paths
225: 2aa13f1 = 225: 033b112 win32(long path support): leave drive-less absolute paths intact
226: 3138524 = 226: 7bb18a5 compat/fsmonitor/fsm-*-win32: support long paths
227: 52d8a44 = 227: e82b4e5 clean: suggest using
core.longPathsif paths are too long to remove228: 90bb65a = 228: 17521db mingw: Support
git_terminal_promptwith more terminals229: 1def0da = 229: d03a4c6 compat/terminal.c: only use the Windows console if bash 'read -r' fails
230: dc8901f = 230: ce92e59 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
231: 29bffea = 231: 48d1325 Win32: symlink: move phantom symlink creation to a separate function
232: 17ad350 = 232: 4e35799 Introduce helper to create symlinks that knows about index_state
233: 60a138c = 233: 30e6025 mingw: allow to specify the symlink type in .gitattributes
234: 5acd0a1 = 234: 024bca8 Win32: symlink: add test for
symlinkattribute235: ee04045 = 235: 7ad4f23 mingw: explicitly specify with which cmd to prefix the cmdline
236: 69b7758 = 236: f3cf6f4 mingw: when path_lookup() failed, try BusyBox
237: a47dea6 = 237: 3b52a84 test-tool: learn to act as a drop-in replacement for
iconv239: 5f1b19c = 238: fb511c2 tests(mingw): if
iconvis unavailable, usetest-helper --iconv241: f72aea3 = 239: 87e1c86 gitattributes: mark .png files as binary
243: cf630c7 = 240: 1e11bb4 tests: move test PNGs into t/lib-diff/
245: 0ce84bb = 241: c942308 tests: only override sort & find if there are usable ones in /usr/bin/
247: 4023e6a = 242: 79d5d42 tests: use the correct path separator with BusyBox
248: a1888ef = 243: ab82e79 mingw: only use Bash-ism
builtin pwd -Wwhen available249: a7a31df = 244: 2a7a877 tests (mingw): remove Bash-specific pwd option
250: 4b7108b = 245: d5032a9 test-lib: add BUSYBOX prerequisite
253: 0f30595 = 246: e1ed7a0 t5003: use binary file from t/lib-diff/
238: a523548 = 247: e29e15d mingw: introduce code to detect whether we're inside a Windows container
256: 18d33c6 = 248: 7dee51a t5532: workaround for BusyBox on Windows
240: e0511e1 = 249: cbba2ce mingw: when running in a Windows container, try to rename() harder
259: 6542833 = 250: 326191b t5605: special-case hardlink test for BusyBox-w32
242: f71565b = 251: e5adfa5 mingw: move the file_attr_to_st_mode() function definition
262: ce2df5b = 252: 2b85390 t5813: allow for $PWD to be a Windows path
244: 8507d50 = 253: 01cc0be mingw: Windows Docker volumes are not symbolic links
265: a1a0854 = 254: a1d9f62 t9200: skip tests when $PWD contains a colon
266: 40a7c7f = 255: bf9fb06 mingw: kill child processes in a gentler way
246: 57cd988 = 256: 68d2d2f mingw: work around rename() failing on a read-only file
270: 6cb7f5d = 257: 61fda7b mingw: optionally enable wsl compability file mode bits
271: 4d7fa47 = 258: 8c2f9f2 mingw: really handle SIGINT
252: 97706e7 = 259: 855968e Merge branch 'gitk-and-git-gui-patches'
255: 6dee934 = 260: 686e709 Merge branch 'long-paths'
258: 7e22131 = 261: a8dc84f Merge branch 'msys2'
251: bcec3dd = 262: 25996cc Describe Git for Windows' architecture
261: fddb3a7 = 263: 2c7cf4c Merge 'docker-volumes-are-no-symlinks'
254: 5fabcfe = 264: e930c97 Modify the Code of Conduct for Git for Windows
264: 377bc2f = 265: 9ca2501 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
257: a2bc836 = 266: 33c6f3b CONTRIBUTING.md: add guide for first-time contributors
269: cf6c985 = 267: bfbc1d4 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
260: d389075 = 268: d7bb6d1 README.md: Add a Windows-specific preamble
277: acc7d8b = 269: e59d19b Merge branch 'busybox-w32'
263: 9d89baa = 270: 2d53299 Add an issue template
278: e2cce9e = 271: 11c2cd8 Merge branch 'wsl-file-mode-bits'
267: 620ac0c = 272: f9d78ee Add a GitHub workflow to monitor component updates
268: be88ef2 = 273: eb848f1 Modify the GitHub Pull Request template (to reflect Git for Windows)
272: 6243d98 = 274: 5100710 Partially un-revert "editor: save and reset terminal after calling EDITOR"
279: de16710 = 275: 64313af Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
273: d7803c8 = 276: 7a76ab1 reset: reinstate support for the deprecated --stdin option
274: dacc673 = 277: 3b8ba4e fsmonitor: reintroduce core.useBuiltinFSMonitor
275: 62b38f3 = 278: 8550b7f dependabot: help keeping GitHub Actions versions up to date
276: 09ff300 = 279: 7d42229 SECURITY.md: document Git for Windows' policies
280: 5dd9112 = 280: 70dfd6b Merge branch 'un-revert-editor-save-and-reset'
281: 4e9c5ab = 281: b9483e8 Merge branch 'phase-out-reset-stdin'
282: 8774e9c = 282: 0696f6e Merge branch 'deprecate-core.useBuiltinFSMonitor'
283: 32e188b = 283: 2618898 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
284: d3c2678 = 284: 5e9f315 Merge 'readme' into HEAD
285: bbad01e = 285: da5f06b Add an AGENTS.md file to help with AI-assisted debugging/development
286: 71707f6 = 286: c3357c7 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)
287: 77ddcd0 = 287: 4f04aa5 ??? t5563: add tests for http.emptyAuth with Negotiate
288: 74344d9 ! 288: 449c0d8 AGENTS.md: document
amend!, fixup-only PRs, and direct GfW PRs (AGENTS.md: documentamend!, fixup-only PRs, and direct GfW PRs git#6232)289: 166fa2f = 289: 6c1f246 amend! mingw: use mimalloc
290: 764bce0 = 290: fb84992 fixup! mimalloc: offer a build-time option to enable it
291: cd90b5d = 291: 98e931e fixup! mimalloc: adjust for building inside Git
292: a214b94 = 292: 983c0c5 fixup! Import the source code of mimalloc v2.2.7
293: c42a808 = 293: 0158cf0 fixup! git-compat-util: avoid redeclaring _DEFAULT_SOURCE
294: 6f8e0f9 = 294: 4f17ac5 fixup! win32/pthread: avoid name clashes with winpthread
295: 944bc50 = 295: bbed6b7 Drop mimalloc (Drop mimalloc git#6231)