Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#26813246728)#213
Open
gitforwindowshelper[bot] wants to merge 295 commits into
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#26813246728)#213gitforwindowshelper[bot] wants to merge 295 commits into
gitforwindowshelper[bot] wants to merge 295 commits into
Conversation
The convention in Git project's shell scripts is to have white-space _before_, but not _after_ the `>` (or `<`). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This change enhances `git commit --cleanup=scissors` by detecting scissors lines ending in either LF (UNIX-style) or CR/LF (DOS-style). Regression tests are included to specifically test for trailing comments after a CR/LF-terminated scissors line. Signed-off-by: Luke Bonanomi <lbonanomi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
For some reason, this test case was indented with 4 spaces instead of 1 horizontal tab. The other test cases in the same test script are fine. Signed-off-by: Jens Glathe <jens.glathe@oldschoolsolutions.biz> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
As of Git v2.28.0, the diff for files staged via `git add -N` marks them as new files. Git GUI was ill-prepared for that, and this patch teaches Git GUI about them. Please note that this will not even fix things with v2.28.0, as the `rp/apply-cached-with-i-t-a` patches are required on Git's side, too. This fixes git-for-windows#2779 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
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>
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>
Start work on a new 'git survey' command to scan the repository for monorepo performance and scaling problems. The goal is to measure the various known "dimensions of scale" and serve as a foundation for adding additional measurements as we learn more about Git monorepo scaling problems. The initial goal is to complement the scanning and analysis performed by the GO-based 'git-sizer' (https://github.com/github/git-sizer) tool. It is hoped that by creating a builtin command, we may be able to take advantage of internal Git data structures and code that is not accessible from GO to gain further insight into potential scaling problems. Co-authored-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
This is no longer true in general, not with supporting Clang out of the box. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
By default we will scan all references in "refs/heads/", "refs/tags/" and "refs/remotes/". Add command line opts let the use ask for all refs or a subset of them and to include a detached HEAD. Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When 'git survey' provides information to the user, this will be presented in one of two formats: plaintext and JSON. The JSON implementation will be delayed until the functionality is complete for the plaintext format. The most important parts of the plaintext format are headers specifying the different sections of the report and tables providing concreted data. Create a custom table data structure that allows specifying a list of strings for the row values. When printing the table, check each column for the maximum width so we can create a table of the correct size from the start. The table structure is designed to be flexible to the different kinds of output that will be implemented in future changes. Signed-off-by: Derrick Stolee <stolee@gmail.com>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib` rather than `libexpat.lib`. It appears that the `vcpkg` package for "libexpat" has changed and now creates `libexpatd.lib` for debug mode builds. Previously, both debug and release builds created a ".lib" with the same basename. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
At the moment, nothing is obvious about the reason for the use of the
path-walk API, but this will become more prevelant in future iterations. For
now, use the path-walk API to sum up the counts of each kind of object.
For example, this is the reachable object summary output for my local repo:
REACHABLE OBJECT SUMMARY
========================
Object Type | Count
------------+-------
Tags | 1343
Commits | 179344
Trees | 314350
Blobs | 184030
Signed-off-by: Derrick Stolee <stolee@gmail.com>
In bf2d5d8 (Don't let ld strip relocations, 2016-01-16) (picked from git-for-windows@6a237925bf10), Git for Windows introduced the `-Wl,-pic-executable` flag, specifying the exact entry point via `-e`. This required discerning between i686 and x86_64 code because the former required the symbol to be prefixed with an underscore, the latter did not. As per https://sourceware.org/bugzilla/show_bug.cgi?id=10865, the specified symbols are already the default, though. So let's drop the overly-specific definition. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Now that we have explored objects by count, we can expand that a bit more to summarize the data for the on-disk and inflated size of those objects. This information is helpful for diagnosing both why disk space (and perhaps clone or fetch times) is growing but also why certain operations are slow because the inflated size of the abstract objects that must be processed is so large. Note: zlib-ng is slightly more efficient even at those small sizes. Even between zlib versions, there are slight differences in compression. To accommodate for that in the tests, not the exact numbers but some rough approximations are validated (the test should validate `git survey`, after all, not zlib). Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 already defines a couple of helpful environment variables, and we can use those to infer the installation location as well as the CPU. No need for hard-coding ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Create a wrapper for the Windows Resource Compiler (RC.EXE) for use by the MSVC=1 builds. This is similar to the CL.EXE and LIB.EXE wrappers used for the MSVC=1 builds. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
The tell-tale is the presence of the `MSYSTEM` value while compiling, of course. In that case, we want to ensure that `MSYSTEM` is set when running `git.exe`, and also enable the magic MSYS2 tty detection. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The Git project followed Git for Windows' lead and added their Code of Conduct, based on the Contributor Covenant v1.4, later updated to v2.0. We adapt it slightly to Git for Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Previously, we did not install any handler for Ctrl+C, but now we really want to because the MSYS2 runtime learned the trick to call the ConsoleCtrlHandler when Ctrl+C was pressed. With this, hitting Ctrl+C while `git log` is running will only terminate the Git process, but not the pager. This finally matches the behavior on Linux and on macOS. 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>
Getting started contributing to Git can be difficult on a Windows machine. CONTRIBUTING.md contains a guide to getting started, including detailed steps for setting up build tools, running tests, and submitting patches to upstream. [includes an example by Pratik Karki how to submit v2, v3, v4, etc.] Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Handle Ctrl+C in Git Bash nicely Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and Philip Oakley. Helped-by: Clive Chan <cc@clive.io> Helped-by: Adric Norris <landstander668@gmail.com> Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com> Helped-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Brendan Forster <brendan@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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: bbed6b75b2 (Drop mimalloc (git-for-windows#6231), 2026-05-26) (7f76d4c858..bbed6b75b2)
Resolved: 449c0d8 (AGENTS.md: document
amend!, fixup-only PRs, and direct GfW PRs (git-for-windows#6232), 2026-05-26)resolved by taking HEAD for all files unchanged by the merge, and accepting the new AGENTS.md documentation sections from the second parent
Range-diff
1: 449c0d8 ! 1: ec9679d 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 ad5e0347cb..377e9e9372 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. -+ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac3fb35865 (??? t5563: add tests for http.emptyAuth with Negotiate) +-================================ + ### `amend!` Commits + + A `fixup!` commit keeps the target's commit message and merely combines +@@ AGENTS.md: 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. +- +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 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. -+ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac3fb35865 (??? 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: 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. +- +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 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 53f285d853..ddba93393c 100644 + --- Documentation/config/sideband.adoc + +++ Documentation/config/sideband.adoc +@@ + sideband.allowControlCharacters:: +-<<<<<<< ac3fb35865 (??? 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 03681a67bb..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 +-<<<<<<< ac3fb35865 (??? 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 + +-<<<<<<< ac3fb35865 (??? 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 b200ff2117..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) +-<<<<<<< ac3fb35865 (??? 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 f8eadb61a2..f63449d912 100644 + --- config.mak.dev + +++ config.mak.dev +@@ config.mak.dev: ifndef USE_MIMALLOC + DEVELOPER_CFLAGS += -std=gnu99 + endif + endif +-<<<<<<< ac3fb35865 (??? 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 d87af8c832..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 +-<<<<<<< ac3fb35865 (??? 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 +-<<<<<<< ac3fb35865 (??? 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 ba2d03d2bf..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); + } + +-<<<<<<< ac3fb35865 (??? 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; + } + +-<<<<<<< ac3fb35865 (??? 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 4a87a89d79..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. + */ +-<<<<<<< ac3fb35865 (??? 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 39f0e2e589..58a9378937 100644 + --- sideband.c + +++ sideband.c +@@ sideband.c: static struct keyword_entry keywords[] = { + }; + + static enum { +-<<<<<<< ac3fb35865 (??? 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; + +-<<<<<<< ac3fb35865 (??? 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); + } + +-<<<<<<< ac3fb35865 (??? 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 +-<<<<<<< ac3fb35865 (??? 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; + +-<<<<<<< ac3fb35865 (??? 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--) { +-<<<<<<< ac3fb35865 (??? 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, '^'); +-<<<<<<< ac3fb35865 (??? 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 27842670a1..b9f385187c 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', +-<<<<<<< ac3fb35865 (??? 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 a7c013b4ce..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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac3fb35865 (??? 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 +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac3fb35865 (??? 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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac3fb35865 (??? 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 43a5615a25..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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac3fb35865 (??? 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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac3fb35865 (??? 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 d2bc897706..e2a86d7a90 100755 + --- t/t9200-git-cvsexportcommit.sh + +++ t/t9200-git-cvsexportcommit.sh +@@ t/t9200-git-cvsexportcommit.sh: case "$PWD" in + ;; + esac + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ac3fb35865 (??? 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 7051e45c21..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/ . + +-<<<<<<< ac3fb35865 (??? 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: 89afe0b357 (Drop mimalloc (git-for-windows#6231), 2026-05-26) (edac706e94..89afe0b357)
Statistics
Range-diff (click to expand)
1: 983e977 = 1: 49c8c31 ci(dockerized): reduce the PID limit for private repositories
2: bf5deba = 2: 67be89b mingw: skip symlink type auto-detection for network share targets
3: 4775101 = 3: 7c003dd Merge branch 'fix-ci'
4: a00166d = 4: 9fea5de unix-socket: avoid leak when initialization fails
5: 3ef098e = 5: 6a9e520 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: e4bfa3b = 6: 0415d88 grep: prevent
^$false match at end of file7: 8a3d5f6 = 7: 4462f81 Merge branch 'v2.53.0.windows.3'
8: 6548506 = 8: d6f6df2 Merge branch 'fixes-from-the-git-mailing-list'
21: 8e58fc4 = 9: 1d1dd30 t9350: point out that refs are not updated correctly
24: 54ce341 = 10: 6a0467b transport-helper: add trailing --
30: d344f8a = 11: 499ab31 remote-helper: check helper status after import/export
9: c9e83da = 12: 1a11595 vcpkg_install: detect lack of Git
10: 4003814 = 13: 6e2b6e5 vcpkg_install: add comment regarding slow network connections
11: 04c4e91 = 14: 8637546 vcbuild: install ARM64 dependencies when building ARM64 binaries
12: d2b39e0 = 15: 676269f vcbuild: add an option to install individual 'features'
13: 376958c = 16: 1b05d94 cmake: allow building for Windows/ARM64
14: 46a3d89 = 17: 070021c mingw: include the Python parts in the build
15: 28d49d9 = 18: 0bc6ed6 ci(vs-build) also build Windows/ARM64 artifacts
16: eef231a = 19: 360955f win32/pthread: avoid name clashes with winpthread
17: c274b32 = 20: f381695 Add schannel to curl installation
29: d509636 = 21: d1b0f2a hash-object: demonstrate a >4GB/LLP64 problem
18: c066952 = 22: 5b29fb6 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
19: d2701fd = 23: a42e7bc cmake(): allow setting HOST_CPU for cross-compilation
38: 12ca81c = 24: 6287c85 object-file.c: use size_t for header lengths
20: 3b2706e = 25: 0b7d9e1 Import the source code of mimalloc v2.2.7
22: 5a06de2 = 26: c473675 CMake: default Visual Studio generator has changed
78: 8f6805d = 27: 8fd0b58 hash algorithms: use size_t for section lengths
23: a875951 = 28: 5293553 mimalloc: adjust for building inside Git
25: 39e1da1 = 29: 382c218 mingw: demonstrate a
git addissue with NTFS junctions26: fb09d52 = 30: a48f839 .gitignore: add Visual Studio CMakeSetting.json file
82: bf57571 = 31: aec4a82 hash-object --stdin: verify that it works with >4GB/LLP64
27: 50a43fa = 32: 2683927 mimalloc: offer a build-time option to enable it
28: 363dfe0 = 33: 5d305e7 t5505/t5516: allow running without
.git/branches/in the templates31: 2f7a968 = 34: 6385d07 clean: do not traverse mount points
32: d8855e7 = 35: e1fb20e strbuf_realpath(): use platform-dependent API if available
33: 6178f97 = 36: dfe3543 http: use new "best effort" strategy for Secure Channel revoke checking
34: 4e8a48e = 37: 1ffaab7 subtree: update
contrib/subtreetesttarget35: 3986809 = 38: f619c74 CMakeLists: add default "x64-windows" arch for Visual Studio
86: 9a4c825 = 39: c94b1dc hash-object: add another >4GB/LLP64 test case
36: 4780a85 = 40: 76b2655 mingw: use mimalloc
37: c8612aa = 41: 11bade8 t5505/t5516: fix white-space around redirectors
87: 0556ea9 = 42: 39acc1b setup: properly use "%(prefix)/" when in WSL
39: cd6280e = 43: 81d47dc Always auto-gc after calling a fast-import transport
40: a73a042 = 44: 0fd3022 mingw: prevent regressions with "drive-less" absolute paths
41: 6a426f0 = 45: 1924818 clean: remove mount points when possible
42: 016b322 = 46: e7aa930 transport: optionally disable side-band-64k
43: 6d56b22 = 47: 7e22182 mingw: fix fatal error working on mapped network drives on Windows
44: db9cd02 = 48: 78d2e16 clink.pl: fix MSVC compile script to handle libcurl-d.lib
45: 76d68b2 = 49: c22eb22 mingw: implement a platform-specific
strbuf_realpath()46: c075a23 = 50: 3be09af t3701: verify that we can add lots of files interactively
47: 41eebb2 = 51: 5e1ed62 commit: accept "scissors" with CR/LF line endings
48: 4d671bb = 52: fd389d3 t0014: fix indentation
49: ffa91d6 = 53: dc2407f git-gui: accommodate for intent-to-add files
50: e94f9f6 = 54: 5a26763 mingw: allow for longer paths in
parse_interpreter()51: 5fa85ac = 55: 9c0f7a2 compat/vcbuild: document preferred way to build in Visual Studio
52: 1261b4d = 56: 6b8615b http: optionally send SSL client certificate
53: b8a2224 = 57: c050ad4 ci: run
contrib/subtreetests in CI builds54: f6050ff = 58: 6073e17 CMake: show Win32 and Generator_platform build-option values
92: 5411d30 = 59: 5f8d0e6 hash-object: add a >4GB/LLP64 test case using filtered input
55: b6b54cd = 60: 13fbd7b windows: skip linking
git-<command>for built-ins56: af63b52 = 61: f5dc715 mingw: stop hard-coding
CC = gcc57: 88c0be9 = 62: 7fb9111 mingw: drop the -D_USE_32BIT_TIME_T option
58: 58bf66f = 63: a8bf322 mingw: only use -Wl,--large-address-aware for 32-bit builds
59: 6006c01 = 64: 53fa19e mingw: avoid over-specifying
--pic-executable60: 40a8d0a = 65: 47a4e4e mingw: set the prefix and HOST_CPU as per MSYS2's settings
61: 5bbe3a5 = 66: 8fcadff mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
62: e777447 = 67: 09a284f mingw: rely on MSYS2's metadata instead of hard-coding it
63: 1fe9b55 = 68: 6369491 mingw: always define
ETC_*for MSYS2 environments64: 84f41eb = 69: 5bbf1ed max_tree_depth: lower it for clang builds in general on Windows
65: 010439d = 70: a7a85fd mingw: ensure valid CTYPE
66: e82c009 = 71: 6f9acea mingw: allow
git.exeto be used instead of the "Git wrapper"67: 69a2ace = 72: a9c3833 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
70: d9f61a0 = 73: 11ce7c7 survey: stub in new experimental 'git-survey' command
68: b2e7b31 = 74: 1ac3f25 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
72: ed79f0f = 75: a5d9929 survey: add command line opts to select references
69: 3b02c61 = 76: d5b13e2 clink.pl: fix libexpatd.lib link error when using MSVC
74: ff96003 = 77: 782705e survey: start pretty printing data in table form
71: cfec559 = 78: 70bd736 Makefile: clean up .ilk files when MSVC=1
77: d0373c2 = 79: 71d085b survey: add object count summary
73: 511c953 = 80: 49a6bc1 vcbuild: add support for compiling Windows resource files
81: dd6b2ef = 81: 156c674 survey: summarize total sizes by object type
75: ed80903 = 82: 9541789 config.mak.uname: add git.rc to MSVC builds
76: 086342e = 83: 40a8d4f MinGW: link as terminal server aware
85: 7d3bfce = 84: 345f066 survey: show progress during object walk
79: 71a22e0 = 85: 222e6c1 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
80: f5dfc94 = 86: e9fde7e http: optionally load libcurl lazily
91: 248c960 = 87: 5a9d58c survey: add ability to track prioritized lists
83: 0da0e98 = 88: 83c15eb clink.pl: move default linker options for MSVC=1 builds
84: a152fa4 = 89: e992986 http: support lazy-loading libcurl also on Windows
119: 998bcf2 = 90: 6e15479 survey: add report of "largest" paths
88: 2100304 = 91: 49e22c6 Add config option
windows.appendAtomically89: 995f41f = 92: 4271826 cmake: install headless-git.
90: 92c88f7 = 93: b8c0c12 http: when loading libcurl lazily, allow for multiple SSL backends
123: ac6c4ae = 94: 1add327 survey: add --top= option and config
93: 85e8e77 = 95: 7f81445 compat/mingw.c: do not warn when failing to get owner
94: bbf1d8a = 96: 0538adc mingw: $env:TERM="xterm-256color" for newer OSes
95: e1e40dc = 97: 770ae2f winansi: check result and Buffer before using Name
96: f876129 = 98: 68bc1e1 mingw: change core.fsyncObjectFiles = 1 by default
97: 7a38654 = 99: 58940c3 Fix Windows version resources
98: 7859c61 = 100: 33deef3 status: fix for old-style submodules with commondir
99: 0947abf = 101: 78d63bb git.rc: include winuser.h
100: 503f6e0 = 102: 13873f5 mingw: do load libcurl dynamically by default
101: fedd950 = 103: d5fbaf4 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
102: c81841d = 104: 4fba99c mingw: suggest
windows.appendAtomicallyin more cases103: 59650e3 = 105: d3d32c7 win32: use native ANSI sequence processing, if possible
104: 5341cd9 = 106: adf9803 common-main.c: fflush stdout buffer upon exit
105: 5eccc18 = 107: a540f17 t5601/t7406(mingw): do run tests with symlink support
106: 16249bd = 108: d5a9b3e win32: ensure that
localtime_r()is declared even in i686 builds107: 3cec110 = 109: 7010b98 Fallback to AppData if XDG_CONFIG_HOME is unset
108: c129f4e = 110: c9b646b run-command: be helpful with Git LFS fails on Windows 7
127: abc1411 = 111: 1b90ee7 survey: clearly note the experimental nature in the output
109: 71fd8d1 = 112: 2099be7 Merge 'remote-hg-prerequisites' into HEAD
110: 320b3df = 113: a5ce59e Merge branch 'drive-prefix'
111: d800f29 = 114: 809479d Merge branch 'dont-clean-junctions'
112: fab9fd9 = 115: 5ef3f10 Merge branch 'msys2-python'
115: 31c2463 = 116: 67c2103 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
118: 761bd6f = 117: 767fa69 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
122: 1031c68 = 118: b0700c4 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
126: d73f60d = 119: 1a29b9f Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
135: 9a720b0 = 120: f1aa914 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction136: c69d6ce = 121: 6529561 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
137: 59c0e4b = 122: 4d3223c Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
138: 0c5bd2b = 123: ea8a6c6 Merge 'add-p-many-files'
139: e01a154 = 124: 9fed701 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
140: 7ba6df7 = 125: 38baed7 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
141: ed0a827 = 126: 4035d86 Merge 'git-gui/js/intent-to-add'
142: 9c19e26 = 127: 9d1e9a4 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
113: 3c15d0e = 128: c722ed9 mingw: make sure
errnois set correctly when socket operations fail114: 3c6b11c = 129: f69f9e1 t5563: verify that NTLM authentication works
143: d59c64d = 130: 253b88f Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
116: e92f103 = 131: 965a72e compat/mingw: handle WSA errors in strerror
117: 3c5f95d = 132: 0f26f28 http: disallow NTLM authentication by default
144: 892de78 = 133: a7dca44 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
120: a47abde = 134: 749b1f9 compat/mingw: drop outdated comment
121: b362c1f = 135: b8daa83 http: warn if might have failed because of NTLM
145: e14b0ea = 136: 9e980cc Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path124: aca70dc = 137: 87e9eb1 t0301: actually test credential-cache on Windows
125: af450e2 = 138: 4897967 credential: advertise NTLM suppression and allow helpers to re-enable
146: fafdbac = 139: a64c580 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
128: 7f1d05b = 140: 76ef3ae credential-cache: handle ECONNREFUSED gracefully
129: 5657227 = 141: a3d0902 reftable: do make sure to use custom allocators
130: bc78ea3 = 142: f2e7ad9 check-whitespace: avoid alerts about upstream commits
131: 7a79ec0 = 143: f71f3cf t/t5571-prep-push-hook.sh: Add test with writing to stderr
132: 5347ae0 = 144: 64dd0ec dir: do not traverse mount points
133: d7ae8d5 = 145: 06f69a3 win32: thread-utils: handle multi-socket systems
134: d391b13 = 146: b5fcdd1 t5563: add tests for http.emptyAuth with Negotiate
147: a1ac078 = 147: 55572ec 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: 436b89d = 148: d40e733 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests149: b725508 = 149: 7ca5924 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
150: d5c03c0 = 150: 1265b47 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t151: 4488c00 = 151: 47e0518 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory152: 6d6ccf4 = 152: e56f2de Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
153: 1893d6f = 153: 92f4d1b Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
154: d050cd3 = 154: 539e2ea Merge branch 'optionally-dont-append-atomically-on-windows'
155: 1ebf424 = 155: 2a26d42 Merge branch 'fsync-object-files-always'
156: b1fb8b7 = 156: dc7c668 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
157: 9cbc91a = 157: efcaa1e Fix Windows version resources (Fix Windows version resources git#4092)
158: 56a43ba = 158: 6c1850b Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
159: 8bffafa = 159: 457ca71 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)160: 245d8e5 = 160: 30cf477 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)161: 8978059 = 161: 14f7338 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283162: dacda04 = 162: 12fec7c Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
163: 0abf8ed = 163: b4ad811 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
164: 4a9a748 = 164: 0186b18 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: 165ad72 = 165: ff9e5fc Merge branch 'nano-server'
166: ea866bc = 166: 9d1ebf4 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
167: 1357424 = 167: 6385ceb win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
168: 41a355e = 168: feea10c common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
169: 19e13f3 = 169: 2b66339 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
170: c70ff42 = 170: 95be808 Merge branch 'Fix-i686-build-with-GCC-v14'
171: 13140f6 = 171: dc8e978 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
172: a3eb797 = 172: 872f1a8 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
173: 13fe293 = 173: 6f56c5f Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
174: bdd70f6 = 174: 1d4b605 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
175: 371938a = 175: 142d4fc Merge branch 'reftable-vs-custom-allocators'
176: 86469b5 = 176: 421cdb8 Merge branch 'check-whitespace-only-downstream'
177: e6e9fd4 = 177: 4410060 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: 397100b = 178: 375f98d Merge branch 'disallow-ntlm-auth-by-default'
179: 1fa63b5 = 179: a66176c Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)180: a381588 = 180: bb7a349 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
181: 5207de0 = 181: c6f86b1 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
182: 5beca64 = 182: 566efdf Merge branch 'ready-for-upstream'
183: 7d81bc2 = 183: a9fbccd ci(macos): skip the
git p4tests184: 56dece6 = 184: 42d12b9 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)185: cec7461 = 185: 2967f38 Win32: make FILETIME conversion functions public
186: e0c3ca0 = 186: 23bd41e Win32: dirent.c: Move opendir down
187: efcbeaa = 187: f163ef8 mingw: make the dirent implementation pluggable
188: 4927dc2 = 188: ddcf553 Win32: make the lstat implementation pluggable
189: 30c680b = 189: dd78c8b mingw: add infrastructure for read-only file system level caches
190: 1a2ead0 = 190: 7028d1f mingw: add a cache below mingw's lstat and dirent implementations
192: df894e7 = 191: 456a709 fscache: load directories only once
194: f985e3b = 192: d12e3dd fscache: add key for GIT_TRACE_FSCACHE
196: 05a9a6a = 193: 8ebe9f4 fscache: remember not-found directories
197: 93e5af5 = 194: fb01d90 fscache: add a test for the dir-not-found optimization
198: bd0ddad = 195: d2cc074 add: use preload-index and fscache for performance
199: 591966b = 196: 282ec7e dir.c: make add_excludes aware of fscache during status
200: ae3e24f = 197: dc0f4c9 fscache: make fscache_enabled() public
201: 7652970 = 198: 1e640891eb dir.c: regression fix for add_excludes with fscache
202: a47d5dd = 199: d124c6a fetch-pack.c: enable fscache for stats under .git/objects
203: f51231f = 200: aec0a65 checkout.c: enable fscache for checkout again
204: 5a85f4d = 201: 5228305 Enable the filesystem cache (fscache) in refresh_index().
191: d469575 = 202: 105b1a0 git-gui--askyesno: fix funny text wrapping
205: 080cf40 = 203: 40bdc88 fscache: use FindFirstFileExW to avoid retrieving the short name
193: 72be295 = 204: bd09e39 git-gui--askyesno (mingw): use Git for Windows' icon, if available
206: 663ff87 = 205: 6da35b8 fscache: add GIT_TEST_FSCACHE support
195: 985000a = 206: 0a88777 Merge branch 'git-gui-askyesno'
207: 82b331a = 207: 7ec76d9 fscache: add fscache hit statistics
208: 9500951 = 208: f181c3a unpack-trees: enable fscache for sparse-checkout
209: 7423d98 = 209: 636f2af status: disable and free fscache at the end of the status command
210: b81179e = 210: bccc921 mem_pool: add GIT_TRACE_MEMPOOL support
211: 288f4aa = 211: cfa5fc3 fscache: fscache takes an initial size
212: 8cb8dbb = 212: f177328 fscache: update fscache to be thread specific instead of global
213: 705c664 = 213: 0d69eb6 fscache: teach fscache to use mempool
214: ff2d48b = 214: 5248194 fscache: make fscache_enable() thread safe
215: 401b798 = 215: fcbec65 fscache: teach fscache to use NtQueryDirectoryFile
216: bdd4c6e = 216: 5741ce5 fscache: remember the reparse tag for each entry
217: b0d0202 = 217: 750a3ee Merge branch 'fscache'
218: f6d51f0 = 218: 0f20285 fscache: implement an FSCache-aware is_mount_point()
219: bb2b103 = 219: 1e3b780 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: 44d2ebf = 220: c5596e2 clean: make use of FSCache
221: 8a2aee4 = 221: d84904c Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
222: dbab837 = 222: 984ca0c Merge branch 'dont-clean-junctions-fscache'
223: c4e469e = 223: 0403b70 pack-objects (mingw): demonstrate a segmentation fault with large deltas
224: df44305 = 224: 3c02718 mingw: support long paths
225: 033b112 = 225: 932df64 win32(long path support): leave drive-less absolute paths intact
226: 7bb18a5 = 226: 3d92cb2 compat/fsmonitor/fsm-*-win32: support long paths
227: e82b4e5 = 227: 20b28ea clean: suggest using
core.longPathsif paths are too long to remove228: 17521db = 228: cbb8c52 mingw: Support
git_terminal_promptwith more terminals229: d03a4c6 = 229: a4e1517 compat/terminal.c: only use the Windows console if bash 'read -r' fails
230: ce92e59 = 230: 44c7530 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
231: 48d1325 = 231: 67508d2 Win32: symlink: move phantom symlink creation to a separate function
232: 4e35799 = 232: fce90cb Introduce helper to create symlinks that knows about index_state
233: 30e6025 = 233: 4da1420 mingw: allow to specify the symlink type in .gitattributes
234: 024bca8 = 234: 1c0601f Win32: symlink: add test for
symlinkattribute235: 7ad4f23 = 235: c8a96cc mingw: explicitly specify with which cmd to prefix the cmdline
236: f3cf6f4 = 236: 2b330ea mingw: when path_lookup() failed, try BusyBox
237: 3b52a84 = 237: 977af66 test-tool: learn to act as a drop-in replacement for
iconv238: fb511c2 = 238: 137a8de tests(mingw): if
iconvis unavailable, usetest-helper --iconv239: 87e1c86 = 239: 4e2e454 gitattributes: mark .png files as binary
240: 1e11bb4 = 240: a9c3c73 tests: move test PNGs into t/lib-diff/
241: c942308 = 241: 5a35ecd tests: only override sort & find if there are usable ones in /usr/bin/
242: 79d5d42 = 242: 72a516c tests: use the correct path separator with BusyBox
247: e29e15d = 243: bcdae78 mingw: introduce code to detect whether we're inside a Windows container
243: ab82e79 = 244: 0106fa8 mingw: only use Bash-ism
builtin pwd -Wwhen available249: cbba2ce = 245: 4507af6 mingw: when running in a Windows container, try to rename() harder
244: 2a7a877 = 246: ba821d9 tests (mingw): remove Bash-specific pwd option
251: e5adfa5 = 247: d794427 mingw: move the file_attr_to_st_mode() function definition
245: d5032a9 = 248: 8e1cff6 test-lib: add BUSYBOX prerequisite
253: 01cc0be = 249: 2e83197 mingw: Windows Docker volumes are not symbolic links
246: e1ed7a0 = 250: d9aff33 t5003: use binary file from t/lib-diff/
256: 68d2d2f = 251: b3c30de mingw: work around rename() failing on a read-only file
259: 855968e = 252: 1a7b9c6 Merge branch 'gitk-and-git-gui-patches'
260: 686e709 = 253: 7c630d0 Merge branch 'long-paths'
248: 7dee51a = 254: 2e064a6 t5532: workaround for BusyBox on Windows
261: a8dc84f = 255: 0a9db1f Merge branch 'msys2'
250: 326191b = 256: ae0c268 t5605: special-case hardlink test for BusyBox-w32
263: 2c7cf4c = 257: 5d99916 Merge 'docker-volumes-are-no-symlinks'
252: 2b85390 = 258: a33429c t5813: allow for $PWD to be a Windows path
265: 9ca2501 = 259: 08d2c4b mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
254: a1d9f62 = 260: 8d4fb22 t9200: skip tests when $PWD contains a colon
267: bfbc1d4 = 261: 5e59b58 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
262: 25996cc = 262: 07ead49 Describe Git for Windows' architecture
255: bf9fb06 = 263: 967d302 mingw: kill child processes in a gentler way
257: 61fda7b = 264: 8bd2adf mingw: optionally enable wsl compability file mode bits
269: e59d19b = 265: a9255a2 Merge branch 'busybox-w32'
264: e930c97 = 266: 5062d05 Modify the Code of Conduct for Git for Windows
258: 8c2f9f2 = 267: 3cc10e2 mingw: really handle SIGINT
271: 11c2cd8 = 268: c319e08 Merge branch 'wsl-file-mode-bits'
266: 33c6f3b = 269: cc22757 CONTRIBUTING.md: add guide for first-time contributors
274: 5100710 = 270: 4558338 Partially un-revert "editor: save and reset terminal after calling EDITOR"
275: 64313af = 271: 142c193 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
268: d7bb6d1 = 272: a8153df README.md: Add a Windows-specific preamble
276: 7a76ab1 = 273: 272e0fc reset: reinstate support for the deprecated --stdin option
280: 70dfd6b = 274: 84af8c4 Merge branch 'un-revert-editor-save-and-reset'
270: 2d53299 = 275: 9782ccf Add an issue template
272: f9d78ee = 276: 52f31bc Add a GitHub workflow to monitor component updates
277: 3b8ba4e = 277: 801e4cf fsmonitor: reintroduce core.useBuiltinFSMonitor
281: b9483e8 = 278: 98f7fe3 Merge branch 'phase-out-reset-stdin'
273: eb848f1 = 279: 90eb042 Modify the GitHub Pull Request template (to reflect Git for Windows)
278: 8550b7f = 280: 1f7d068 dependabot: help keeping GitHub Actions versions up to date
282: 0696f6e = 281: 95b98b3 Merge branch 'deprecate-core.useBuiltinFSMonitor'
279: 7d42229 = 282: 593dbcf SECURITY.md: document Git for Windows' policies
283: 2618898 = 283: ebeeff9 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
284: 5e9f315 = 284: 4cc7b02 Merge 'readme' into HEAD
285: da5f06b = 285: f5e177a Add an AGENTS.md file to help with AI-assisted debugging/development
286: c3357c7 = 286: ff24be9 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: 4f04aa5 = 287: ac3fb35 ??? t5563: add tests for http.emptyAuth with Negotiate
288: 449c0d8 ! 288: ec9679d AGENTS.md: document
amend!, fixup-only PRs, and direct GfW PRs (AGENTS.md: documentamend!, fixup-only PRs, and direct GfW PRs git#6232)289: 6c1f246 = 289: 01930ac amend! mingw: use mimalloc
290: fb84992 = 290: cf6a069 fixup! mimalloc: offer a build-time option to enable it
291: 98e931e = 291: e975c7a fixup! mimalloc: adjust for building inside Git
292: 983c0c5 = 292: 36a0d38 fixup! Import the source code of mimalloc v2.2.7
293: 0158cf0 = 293: d87965f fixup! git-compat-util: avoid redeclaring _DEFAULT_SOURCE
294: 4f17ac5 = 294: 755acef fixup! win32/pthread: avoid name clashes with winpthread
295: bbed6b7 = 295: 89afe0b Drop mimalloc (Drop mimalloc git#6231)