Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#26503349023)#205
Open
gitforwindowshelper[bot] wants to merge 295 commits into
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#26503349023)#205gitforwindowshelper[bot] wants to merge 295 commits into
gitforwindowshelper[bot] wants to merge 295 commits into
Conversation
In 1e64d18 (mingw: do resolve symlinks in `getcwd()`) a problem was introduced that causes git for Windows to stop working with certain mapped network drives (in particular, drives that are mapped to locations with long path names). Error message was "fatal: Unable to read current working directory: No such file or directory". Present change fixes this issue as discussed in git-for-windows#2480 Signed-off-by: Bjoern Mueller <bjoernm@gmx.de>
Update clink.pl to link with either libcurl.lib or libcurl-d.lib depending on whether DEBUG=1 is set. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
There is a Win32 API function to resolve symbolic links, and we can use that instead of resolving them manually. Even better, this function also resolves NTFS junction points (which are somewhat similar to bind mounts). This fixes git-for-windows#2481. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The native Windows HTTPS backend is based on Secure Channel which lets the caller decide how to handle revocation checking problems caused by missing information in the certificate or offline CRL distribution points. Unfortunately, cURL chose to handle these problems differently than OpenSSL by default: while OpenSSL happily ignores those problems (essentially saying "¯\_(ツ)_/¯"), the Secure Channel backend will error out instead. As a remedy, the "no revoke" mode was introduced, which turns off revocation checking altogether. This is a bit heavy-handed. We support this via the `http.schannelCheckRevoke` setting. In curl/curl#4981, we contributed an opt-in "best effort" strategy that emulates what OpenSSL seems to do. In Git for Windows, we actually want this to be the default. This patch makes it so, introducing it as a new value for the `http.schannelCheckRevoke" setting, which now becmes a tristate: it accepts the values "false", "true" or "best-effort" (defaulting to the last one). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
In the case of Git for Windows (say, in a Git Bash window) running in a Windows Subsystem for Linux (WSL) directory, the GetNamedSecurityInfoW() call in is_path_owned_By_current_side() returns an error code other than ERROR_SUCCESS. This is consistent behavior across this boundary. In these cases, the owner would always be different because the WSL owner is a different entity than the Windows user. The change here is to suppress the error message that looks like this: error: failed to get owner for '//wsl.localhost/...' (1) Before this change, this warning happens for every Git command, regardless of whether the directory is marked with safe.directory. Signed-off-by: Derrick Stolee <derrickstolee@github.com>
For Windows builds >= 15063 set $env:TERM to "xterm-256color" instead of "cygwin" because they have a more capable console system that supports this. Also set $env:COLORTERM="truecolor" if unset. $env:TERM is initialized so that ANSI colors in color.c work, see 29a3963 (Win32: patch Windows environment on startup, 2012-01-15). See git-for-windows#3629 regarding problems caused by always setting $env:TERM="cygwin". This is the same heuristic used by the Cygwin runtime. Signed-off-by: Rafael Kitover <rkitover@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NtQueryObject under Wine can return a success but fill out no name. In those situations, Wine will set Buffer to NULL, and set result to the sizeof(OBJECT_NAME_INFORMATION). Running a command such as echo "$(git.exe --version 2>/dev/null)" will crash due to a NULL pointer dereference when the code attempts to null terminate the buffer, although, weirdly, removing the subshell or redirecting stdout to a file will not trigger the crash. Code has been added to also check Buffer and Length to ensure the check is as robust as possible due to the current behavior being fragile at best, and could potentially change in the future This code is based on the behavior of NtQueryObject under wine and reactos. Signed-off-by: Christopher Degawa <ccom@randomderp.com>
Atomic append on windows is only supported on local disk files, and it may cause errors in other situations, e.g. network file system. If that is the case, this config option should be used to turn atomic append off. Co-Authored-By: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: 孙卓识 <sunzhuoshi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
From the documentation of said setting: This boolean will enable fsync() when writing object files. This is a total waste of time and effort on a filesystem that orders data writes properly, but can be useful for filesystems that do not use journalling (traditional UNIX filesystems) or that only journal metadata and not file contents (OS X’s HFS+, or Linux ext3 with "data=writeback"). The most common file system on Windows (NTFS) does not guarantee that order, therefore a sudden loss of power (or any other event causing an unclean shutdown) would cause corrupt files (i.e. files filled with NULs). Therefore we need to change the default. Note that the documentation makes it sound as if this causes really bad performance. In reality, writing loose objects is something that is done only rarely, and only a handful of files at a time. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Whith Windows 2000, Microsoft introduced a flag to the PE header to mark executables as "terminal server aware". Windows terminal servers provide a redirected Windows directory and redirected registry hives when launching legacy applications without this flag set. Since we do not use any INI files in the Windows directory and don't write to the registry, we don't need this additional preparation. Telling the OS that we don't need this should provide slightly improved startup times in terminal server environments. When building for supported Windows Versions with MSVC the /TSAWARE linker flag is automatically set, but MinGW requires us to set the --tsaware flag manually. This partially addresses git-for-windows#3935. Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Add FileVersion, which is a required field As not all required fields were present, none were being included Fixes git-for-windows#4090 Signed-off-by: Kiel Hurley <kielhurley@gmail.com>
In f9b7573 (repository: free fields before overwriting them, 2017-09-05), Git was taught to release memory before overwriting it, but 357a03e (repository.c: move env-related setup code back to environment.c, 2018-03-03) changed the code so that it would not _always_ be overwritten. As a consequence, the `commondir` attribute would point to already-free()d memory. This seems not to cause problems in core Git, but there are add-on patches in Git for Windows where the `commondir` attribute is subsequently used and causing invalid memory accesses e.g. in setups containing old-style submodules (i.e. the ones with a `.git` directory within theirs worktrees) that have `commondir` configured. This fixes git-for-windows#4083. Signed-off-by: Andrey Zabavnikov <zabavnikov@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is merely a historical wart that, say, `git-commit` exists in the `libexec/git-core/` directory, a tribute to the original idea to let Git be essentially a bunch of Unix shell scripts revolving around very few "plumbing" (AKA low-level) commands. Git has evolved a lot from there. These days, most of Git's functionality is contained within the `git` executable, in the form of "built-in" commands. To accommodate for scripts that use the "dashed" form of Git commands, even today, Git provides hard-links that make the `git` executable available as, say, `git-commit`, just in case that an old script has not been updated to invoke `git commit`. Those hard-links do not come cheap: they take about half a minute for every build of Git on Windows, they are mistaken for taking up huge amounts of space by some Windows Explorer versions that do not understand hard-links, and therefore many a "bug" report had to be addressed. The "dashed form" has been officially deprecated in Git version 1.5.4, which was released on February 2nd, 2008, i.e. a very long time ago. This deprecation was never finalized by skipping these hard-links, but we can start the process now, in Git for Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Start work on a new 'git survey' command to scan the repository for monorepo performance and scaling problems. The goal is to measure the various known "dimensions of scale" and serve as a foundation for adding additional measurements as we learn more about Git monorepo scaling problems. The initial goal is to complement the scanning and analysis performed by the GO-based 'git-sizer' (https://github.com/github/git-sizer) tool. It is hoped that by creating a builtin command, we may be able to take advantage of internal Git data structures and code that is not accessible from GO to gain further insight into potential scaling problems. Co-authored-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
By default we will scan all references in "refs/heads/", "refs/tags/" and "refs/remotes/". Add command line opts let the use ask for all refs or a subset of them and to include a detached HEAD. Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, the current working directory is pretty much guaranteed to contain a colon. If we feed that path to CVS, it mistakes it for a separator between host and port, though. This has not been a problem so far because Git for Windows uses MSYS2's Bash using a POSIX emulation layer that also pretends that the current directory is a Unix path (at least as long as we're in a shell script). However, that is rather limiting, as Git for Windows also explores other ports of other Unix shells. One of those is BusyBox-w32's ash, which is a native port (i.e. *not* using any POSIX emulation layer, and certainly not emulating Unix paths). So let's just detect if there is a colon in $PWD and punt in that case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The Windows Subsystem for Linux (WSL) version 2 allows to use `chmod` on NTFS volumes provided that they are mounted with metadata enabled (see https://devblogs.microsoft.com/commandline/chmod-chown-wsl-improvements/ for details), for example: $ chmod 0755 /mnt/d/test/a.sh In order to facilitate better collaboration between the Windows version of Git and the WSL version of Git, we can make the Windows version of Git also support reading and writing NTFS file modes in a manner compatible with WSL. Since this slightly slows down operations where lots of files are created (such as an initial checkout), this feature is only enabled when `core.WSLCompat` is set to true. Note that you also have to set `core.fileMode=true` in repositories that have been initialized without enabling WSL compatibility. There are several ways to enable metadata loading for NTFS volumes in WSL, one of which is to modify `/etc/wsl.conf` by adding: ``` [automount] enabled = true options = "metadata,umask=027,fmask=117" ``` And reboot WSL. It can also be enabled temporarily by this incantation: $ sudo umount /mnt/c && sudo mount -t drvfs C: /mnt/c -o metadata,uid=1000,gid=1000,umask=22,fmask=111 It's important to note that this modification is compatible with, but does not depend on WSL. The helper functions in this commit can operate independently and functions normally on devices where WSL is not installed or properly configured. Signed-off-by: xungeng li <xungeng@gmail.com> 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>
…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>
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>
This was pull request git-for-windows#1645 from ZCube/master Support windows container. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ws#4527) With this patch, Git for Windows works as intended on mounted APFS volumes (where renaming read-only files would fail). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Specify symlink type in .gitattributes
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>
Handle Ctrl+C in Git Bash nicely 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: 120663f0ec (Drop mimalloc (git-for-windows#6231), 2026-05-26) (6c60a2ebe0..120663f0ec)
Resolved: 88de53b (AGENTS.md: document
amend!, fixup-only PRs, and direct GfW PRs (git-for-windows#6232), 2026-05-26)resolved by taking HEAD for all non-AGENTS.md files; accepted PR's new amend!/fixup/contributing sections in AGENTS.md
Range-diff
1: 88de53b ! 1: 8bc4fcc 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 ## -@@ AGENTS.md: Make **only** the change the patch intended, but in the current location: - - Conflict markers make the file invalid code: - ``` --<<<<<<< HEAD --======= -->>>>>>> commit-hash - ``` - - **All three types of markers must be completely removed.** + remerge CONFLICT (add/add): Merge conflict in AGENTS.md + index 6d0a497d67..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. -+ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< d998e37914 (??? 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. -+ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< d998e37914 (??? 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 0407ecc5c0..ddba93393c 100644 + --- Documentation/config/sideband.adoc + +++ Documentation/config/sideband.adoc +@@ + sideband.allowControlCharacters:: +-<<<<<<< d998e37914 (??? 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 fe67d59f83..9c6f6cfac5 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 +-<<<<<<< d998e37914 (??? 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 + +-<<<<<<< d998e37914 (??? 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 8942ca66f1..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) +-<<<<<<< d998e37914 (??? 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 1e324ab665..f63449d912 100644 + --- config.mak.dev + +++ config.mak.dev +@@ config.mak.dev: ifndef USE_MIMALLOC + DEVELOPER_CFLAGS += -std=gnu99 + endif + endif +-<<<<<<< d998e37914 (??? 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 5cd083c6ef..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 +-<<<<<<< d998e37914 (??? 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 +-<<<<<<< d998e37914 (??? 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 eb0c572eff..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); + } + +-<<<<<<< d998e37914 (??? 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; + } + +-<<<<<<< d998e37914 (??? 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 76ab271564..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. + */ +-<<<<<<< d998e37914 (??? 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 189dddbf37..58a9378937 100644 + --- sideband.c + +++ sideband.c +@@ sideband.c: static struct keyword_entry keywords[] = { + }; + + static enum { +-<<<<<<< d998e37914 (??? 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; + +-<<<<<<< d998e37914 (??? 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); + } + +-<<<<<<< d998e37914 (??? 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 +-<<<<<<< d998e37914 (??? 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; + +-<<<<<<< d998e37914 (??? 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--) { +-<<<<<<< d998e37914 (??? 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, '^'); +-<<<<<<< d998e37914 (??? 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 1592d458d6..2bcdc945db 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', +-<<<<<<< d998e37914 (??? 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 a2f10ff471..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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< d998e37914 (??? 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 +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< d998e37914 (??? 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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< d998e37914 (??? 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 1754059bdb..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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< d998e37914 (??? 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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< d998e37914 (??? 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 b08ea76f45..e2a86d7a90 100755 + --- t/t9200-git-cvsexportcommit.sh + +++ t/t9200-git-cvsexportcommit.sh +@@ t/t9200-git-cvsexportcommit.sh: case "$PWD" in + ;; + esac + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< d998e37914 (??? 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 b978cbcd0d..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/ . + +-<<<<<<< d998e37914 (??? 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: c7ca15aa06 (Drop mimalloc (git-for-windows#6231), 2026-05-26) (1a920fdaa4..c7ca15aa06)
Statistics
Range-diff (click to expand)
1: de880a3 = 1: d0c7a96 ci(dockerized): reduce the PID limit for private repositories
2: 8263da7 = 2: 471b639 mingw: skip symlink type auto-detection for network share targets
3: c6a0e2a = 3: 65d404b Merge branch 'fix-ci'
4: 647688d = 4: f9125ae unix-socket: avoid leak when initialization fails
5: f485c51 = 5: a51487b Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: 2da25d3 = 6: d34d264 grep: prevent
^$false match at end of file7: 253ce60 = 7: 436080d Merge branch 'v2.53.0.windows.3'
8: 2c50f06 = 8: b6c0449 Merge branch 'fixes-from-the-git-mailing-list'
16: ccdd9dc = 9: b4f82c1 mingw: include the Python parts in the build
18: d6f25bc = 10: 4fae930 win32/pthread: avoid name clashes with winpthread
21: 12aadef = 11: 5c3997f git-compat-util: avoid redeclaring _DEFAULT_SOURCE
24: 07bc494 = 12: ebaa3d5 Import the source code of mimalloc v2.2.7
9: c6606bb = 13: cb61ea5 t9350: point out that refs are not updated correctly
27: 709c3cd = 14: d2b4acf mimalloc: adjust for building inside Git
10: 9725bdd = 15: 207a0b1 transport-helper: add trailing --
31: dc9aceb = 16: 2134952 mimalloc: offer a build-time option to enable it
33: b9d831a = 17: a923066 remote-helper: check helper status after import/export
34: bdd01ab = 18: 9fd4830 clean: do not traverse mount points
40: c30cbb5 = 19: 98683bc mingw: use mimalloc
43: 1280100 = 20: bc668dc Always auto-gc after calling a fast-import transport
44: c475479 = 21: 0fd3a59 mingw: prevent regressions with "drive-less" absolute paths
45: bebbd08 = 22: 8be33b8 clean: remove mount points when possible
11: 86f1782 = 23: 213e7bd vcpkg_install: detect lack of Git
12: 61f147c = 24: 1e92b64 vcpkg_install: add comment regarding slow network connections
13: 33699d6 = 25: e7218f6 vcbuild: install ARM64 dependencies when building ARM64 binaries
14: 31ac2b6 = 26: 5e92d28 vcbuild: add an option to install individual 'features'
15: ea9c276 = 27: 0c7448b cmake: allow building for Windows/ARM64
17: 3b9cfb9 = 28: 32695a4 ci(vs-build) also build Windows/ARM64 artifacts
19: db0c2c9 = 29: d62b405 Add schannel to curl installation
20: d334d77 = 30: 555a727 hash-object: demonstrate a >4GB/LLP64 problem
60: c4031ca = 31: 2cd1f78 windows: skip linking
git-<command>for built-ins22: a5eb974 = 32: 5d480b5 cmake(): allow setting HOST_CPU for cross-compilation
23: 48193a0 = 33: 9615ae0 object-file.c: use size_t for header lengths
61: d71f43b = 34: 9982678 mingw: stop hard-coding
CC = gcc25: 358b778 = 35: 2ba8989 CMake: default Visual Studio generator has changed
26: 723e818 = 36: 09f6ecd hash algorithms: use size_t for section lengths
62: bcd6c21 = 37: 4ee289f mingw: drop the -D_USE_32BIT_TIME_T option
28: c47060c = 38: ba701bf mingw: demonstrate a
git addissue with NTFS junctions29: e7c492f = 39: 0ab8875 .gitignore: add Visual Studio CMakeSetting.json file
30: ba9312e = 40: ef165b8 hash-object --stdin: verify that it works with >4GB/LLP64
63: 7a9dc04 = 41: cadf22d mingw: only use -Wl,--large-address-aware for 32-bit builds
32: 7bf2ddc = 42: f613eb4 t5505/t5516: allow running without
.git/branches/in the templates35: 476ea25 = 43: c9d06ac strbuf_realpath(): use platform-dependent API if available
36: b63e546 = 44: 3ef94ed http: use new "best effort" strategy for Secure Channel revoke checking
37: fdc2219 = 45: 2212b1f subtree: update
contrib/subtreetesttarget38: 7fdacd5 = 46: 7f5568a CMakeLists: add default "x64-windows" arch for Visual Studio
39: b15a453 = 47: e400181 hash-object: add another >4GB/LLP64 test case
42: cf17c55 = 48: 44275b9 setup: properly use "%(prefix)/" when in WSL
91: 09f804a = 49: 9c6cce7 Add config option
windows.appendAtomically64: 45727b4 = 50: 9d87012 mingw: avoid over-specifying
--pic-executable41: b1befac = 51: d2f4ca6 t5505/t5516: fix white-space around redirectors
83: c6bce31 = 52: 3c68abf MinGW: link as terminal server aware
46: a202536 = 53: 8748ed8 transport: optionally disable side-band-64k
47: 9d8bdee = 54: 0167c39 mingw: fix fatal error working on mapped network drives on Windows
48: 9cee7a0 = 55: bacb671 clink.pl: fix MSVC compile script to handle libcurl-d.lib
49: 0456792 = 56: 702ae2a mingw: implement a platform-specific
strbuf_realpath()50: d080572 = 57: 880befd t3701: verify that we can add lots of files interactively
51: 5ac6917 = 58: 9341e1b commit: accept "scissors" with CR/LF line endings
52: e5a848d = 59: 601cdaf t0014: fix indentation
53: e895237 = 60: 5a1457a git-gui: accommodate for intent-to-add files
54: ace8f34 = 61: 2bb50b6 mingw: allow for longer paths in
parse_interpreter()55: af2d779 = 62: 1542c9f compat/vcbuild: document preferred way to build in Visual Studio
56: d62628d = 63: c4e7f9c http: optionally send SSL client certificate
57: dc77cf9 = 64: e1a7257 ci: run
contrib/subtreetests in CI builds58: 383de12 = 65: e4506aa CMake: show Win32 and Generator_platform build-option values
59: d52a93d = 66: febf440 hash-object: add a >4GB/LLP64 test case using filtered input
95: 77efd5b = 67: 3720499 compat/mingw.c: do not warn when failing to get owner
96: 4378833 = 68: 00ad98f mingw: $env:TERM="xterm-256color" for newer OSes
97: f17410b = 69: 0537e53 winansi: check result and Buffer before using Name
98: 6178420 = 70: d36934d mingw: change core.fsyncObjectFiles = 1 by default
99: 89e9461 = 71: da06e26 Fix Windows version resources
100: 6120b01 = 72: 2d0999e status: fix for old-style submodules with commondir
65: 6f58d6e = 73: f14396b mingw: set the prefix and HOST_CPU as per MSYS2's settings
66: 6e318cb = 74: 309bb24 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
67: 2ba3e11 = 75: 7d83ed5 mingw: rely on MSYS2's metadata instead of hard-coding it
68: a6004e5 = 76: 14caf80 mingw: always define
ETC_*for MSYS2 environments69: 0590526 = 77: 139a96e max_tree_depth: lower it for clang builds in general on Windows
70: c2a3738 = 78: 5c2c143 mingw: ensure valid CTYPE
71: 4b753f9 = 79: c76a09a mingw: allow
git.exeto be used instead of the "Git wrapper"72: f8f521b = 80: 0f3fd07 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
73: 492f9cb = 81: 4809eb7 survey: stub in new experimental 'git-survey' command
74: 3676434 = 82: 054deeb Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
75: cc31e6b = 83: 2a4bf04 survey: add command line opts to select references
76: 9423bfd = 84: 2dba0f2 clink.pl: fix libexpatd.lib link error when using MSVC
77: 0d72d35 = 85: 8ceb8b1 survey: start pretty printing data in table form
78: 4a29af8 = 86: 45293fe Makefile: clean up .ilk files when MSVC=1
79: 6cc7ef2 = 87: 8f1d388 survey: add object count summary
80: 1be4261 = 88: 184d6d6 vcbuild: add support for compiling Windows resource files
81: 02dddd9 = 89: 8528319 survey: summarize total sizes by object type
82: 0f1e3aa = 90: 20c59a6 config.mak.uname: add git.rc to MSVC builds
84: e7f0d46 = 91: fe144ad survey: show progress during object walk
116: ac1630a = 92: 349332a mingw: make sure
errnois set correctly when socket operations fail117: 45f230c = 93: 37d3332 t5563: verify that NTLM authentication works
85: a44880a = 94: fd35184 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
86: ec47d43 = 95: 7950b3e http: optionally load libcurl lazily
87: c969727 = 96: da5653e survey: add ability to track prioritized lists
119: e7875f2 = 97: 45d1f0f compat/mingw: handle WSA errors in strerror
120: 170ff6a = 98: 9df4a74 http: disallow NTLM authentication by default
88: d1dd2e0 = 99: 601abb3 clink.pl: move default linker options for MSVC=1 builds
89: 12cb86b = 100: a25012c http: support lazy-loading libcurl also on Windows
90: 591e679 = 101: 5e5be13 survey: add report of "largest" paths
122: e1d616c = 102: 2d2fdba compat/mingw: drop outdated comment
123: 51fd767 = 103: 85797f9 http: warn if might have failed because of NTLM
92: 94c45d1 = 104: e1760cb cmake: install headless-git.
93: 11ce721 = 105: 7b5a235 http: when loading libcurl lazily, allow for multiple SSL backends
94: fa65480 = 106: 53c093a survey: add --top= option and config
125: 904ce5c = 107: 8d051f4 t0301: actually test credential-cache on Windows
126: 3d845aa = 108: a3f1fdc credential: advertise NTLM suppression and allow helpers to re-enable
101: b42d27f = 109: 47c788c git.rc: include winuser.h
102: 43f6e7a = 110: b9945e2 mingw: do load libcurl dynamically by default
103: e2d4e00 = 111: 7c812fe Add a GitHub workflow to verify that Git/Scalar work in Nano Server
104: cea85a5 = 112: 820baa5 mingw: suggest
windows.appendAtomicallyin more cases105: 6fde979 = 113: 695a382 win32: use native ANSI sequence processing, if possible
106: d404539 = 114: 6bb17d0 common-main.c: fflush stdout buffer upon exit
107: b24cde6 = 115: 1cb901f t5601/t7406(mingw): do run tests with symlink support
108: 16a4d3c = 116: 04ea480 win32: ensure that
localtime_r()is declared even in i686 builds109: 40907a1 = 117: 2d1a6e9 Fallback to AppData if XDG_CONFIG_HOME is unset
110: 790e6fc = 118: db3bc63 run-command: be helpful with Git LFS fails on Windows 7
111: 8022ba4 = 119: 57fbc5a survey: clearly note the experimental nature in the output
128: 95b98c5 = 120: 097925b credential-cache: handle ECONNREFUSED gracefully
129: f6b0706 = 121: 6e4dc30 reftable: do make sure to use custom allocators
130: 329e523 = 122: 488f2d1 check-whitespace: avoid alerts about upstream commits
131: c3ff6fa = 123: b560f4d t/t5571-prep-push-hook.sh: Add test with writing to stderr
132: 8cbb7b1 = 124: ddabfea dir: do not traverse mount points
133: a9d3327 = 125: a515109 win32: thread-utils: handle multi-socket systems
112: 74f855a = 126: e7a3226 Merge 'remote-hg-prerequisites' into HEAD
113: 135a8e3 = 127: d2f05a8 Merge branch 'drive-prefix'
114: ad6cea4 = 128: 62d8e9a Merge branch 'dont-clean-junctions'
115: 9173d93 = 129: 8b0b7ea Merge branch 'msys2-python'
118: 6c3fd6c = 130: be2ebaf Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
121: 957be9f = 131: a601038 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
124: db0a039 = 132: bb047e7 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
127: 4596978 = 133: b962176 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
135: de1c81c = 134: 4b48de1 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction136: eb06fa4 = 135: 7f653c8 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: 9f37f65 = 136: 1236e0d Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
138: b8a65be = 137: a0632d2 Merge 'add-p-many-files'
139: 55f42f0 = 138: a4a2765 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
140: e24e367 = 139: 8441aa2 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
141: 588b1d4 = 140: c6281e4 Merge 'git-gui/js/intent-to-add'
142: ea6089e = 141: 6f0194c Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
143: 136dc6e = 142: b9806f8 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
144: 4631ebd = 143: b872fc2 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
145: 4b2a1e9 = 144: 27330b9 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path146: e6c4d71 = 145: 3f1727c 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: ae7792a = 146: 50ee1f4 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: 1e7788e = 147: 40ed679 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests149: 9fd8034 = 148: 42f23bf Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
150: 359a346 = 149: 3624575 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t151: 66e912e = 150: 6ba83e5 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory152: 5a85204 = 151: 7065b5d Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
134: 59c3722 = 152: 71022f2 t5563: add tests for http.emptyAuth with Negotiate
153: 220354b = 153: a58c0cd Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
154: d0b6322 = 154: ba4abd7 Merge branch 'optionally-dont-append-atomically-on-windows'
155: 4852a7f = 155: 292b3a2 Merge branch 'fsync-object-files-always'
156: 6b03e9f = 156: 9507bc8 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
157: 56f6e57 = 157: 1185201 Fix Windows version resources (Fix Windows version resources git#4092)
158: b4b7673 = 158: 99aabfc Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
159: 57106a7 = 159: a8a4282 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)160: 7430e2e = 160: 1dd7954 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)161: d923b6e = 161: a9db82d Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283162: 8f9b9c7 = 162: 13bf4a5 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
163: 021aaa8 = 163: 3fc1d4e ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
164: c36e3bc = 164: 9a69925 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: 44c9bd4 = 165: 765188f Merge branch 'nano-server'
166: cd1c814 = 166: 4218763 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
167: 7dbc7f4 = 167: 8409b15 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
168: a82b5b6 = 168: 98c6318 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
169: 11afb7e = 169: 58fb3c8 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
170: 0ae3103 = 170: c605cdb Merge branch 'Fix-i686-build-with-GCC-v14'
171: c2d09ee = 171: 5363d7d Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
172: 39d8473 = 172: 7a0ea8b Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
173: 7a4864e = 173: 28aee4c Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
174: 1d27837 = 174: 8086caa credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
175: dd87a81 = 175: 8caa783 Merge branch 'reftable-vs-custom-allocators'
176: be5679a = 176: 0f47bbe Merge branch 'check-whitespace-only-downstream'
177: 7c94e34 = 177: 3744099 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: 13bd176 = 178: 8c91de2 Merge branch 'disallow-ntlm-auth-by-default'
179: ef685ae = 179: 3399ca3 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)180: b51f17d = 180: 16dce53 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
181: 12caea5 = 181: 6c16af0 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
182: d3eb808 = 182: 26fd23b Merge branch 'ready-for-upstream'
183: f5441fb = 183: c809335 ci(macos): skip the
git p4tests184: 4862d51 = 184: 99861b2 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)185: c6d6ad5 = 185: bef538e Win32: make FILETIME conversion functions public
186: faf3295 = 186: e71ca67 Win32: dirent.c: Move opendir down
187: 3ff04fb = 187: 613d75f mingw: make the dirent implementation pluggable
188: 70ba00e = 188: c45c0c6 Win32: make the lstat implementation pluggable
189: 42d6df9 = 189: a991123 mingw: add infrastructure for read-only file system level caches
190: 26acd25 = 190: 11127fd mingw: add a cache below mingw's lstat and dirent implementations
191: a955a72 = 191: 22569dc fscache: load directories only once
192: ed26ffc = 192: c3b6aa4 fscache: add key for GIT_TRACE_FSCACHE
193: f3cf342 = 193: 73993f8 fscache: remember not-found directories
194: 7572099 = 194: ac970ca fscache: add a test for the dir-not-found optimization
195: 66acfbc = 195: acbdaf2 add: use preload-index and fscache for performance
196: b8eac9f = 196: 5c4d2a7 dir.c: make add_excludes aware of fscache during status
197: 91078a4 = 197: 878e14d fscache: make fscache_enabled() public
198: 2ac0610 = 198: 57d1366 dir.c: regression fix for add_excludes with fscache
199: e27ccbe = 199: b6f9361 fetch-pack.c: enable fscache for stats under .git/objects
200: f12d58a = 200: 73960f5 checkout.c: enable fscache for checkout again
201: b795889 = 201: dea1383 Enable the filesystem cache (fscache) in refresh_index().
202: 85cd888 = 202: 56e7d34 fscache: use FindFirstFileExW to avoid retrieving the short name
203: 056c200 = 203: 56f7398 fscache: add GIT_TEST_FSCACHE support
204: b638093 = 204: a1c5874 fscache: add fscache hit statistics
206: ab126a6 = 205: 32950f3 git-gui--askyesno: fix funny text wrapping
205: 10a9b7f = 206: d539e92 unpack-trees: enable fscache for sparse-checkout
208: 520ff87 = 207: 77773d7 git-gui--askyesno (mingw): use Git for Windows' icon, if available
207: 736a907 = 208: 53731b8 status: disable and free fscache at the end of the status command
210: 0aa6518 = 209: 92e4018 Merge branch 'git-gui-askyesno'
209: bc8e299 = 210: a22cfc4 mem_pool: add GIT_TRACE_MEMPOOL support
211: 3a7d45c = 211: e717921 fscache: fscache takes an initial size
212: e3c9454 = 212: bbc8930 fscache: update fscache to be thread specific instead of global
213: c10d65e = 213: 859d294 fscache: teach fscache to use mempool
214: fc89516 = 214: a47ab6e fscache: make fscache_enable() thread safe
215: 58fc393 = 215: 273f034 fscache: teach fscache to use NtQueryDirectoryFile
216: ec8d150 = 216: f43a468 fscache: remember the reparse tag for each entry
217: 0ee5973 = 217: c41e7d2 Merge branch 'fscache'
218: 2b99392 = 218: 5a20f94 fscache: implement an FSCache-aware is_mount_point()
219: 822256e = 219: ce143db 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: 9a6c3df = 220: e598e05 clean: make use of FSCache
221: 1c0c040 = 221: 883ef5b Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
222: fd464a3 = 222: ad5f353 Merge branch 'dont-clean-junctions-fscache'
223: 3274e2b = 223: 4b25525 pack-objects (mingw): demonstrate a segmentation fault with large deltas
224: abd369f = 224: ad8e5fb mingw: support long paths
225: a4113f5 = 225: e90679c win32(long path support): leave drive-less absolute paths intact
226: 1960dbb = 226: a36c7a9 compat/fsmonitor/fsm-*-win32: support long paths
227: b591384 = 227: 1f9691f clean: suggest using
core.longPathsif paths are too long to remove228: 58ffecd = 228: a1b084b mingw: Support
git_terminal_promptwith more terminals229: 66d6247 = 229: 39edf03 compat/terminal.c: only use the Windows console if bash 'read -r' fails
230: 7bde55f = 230: a95a3ea mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
232: b8c0100 = 231: 93b393a mingw: introduce code to detect whether we're inside a Windows container
231: 9378667 = 232: 4c91f5c Win32: symlink: move phantom symlink creation to a separate function
234: 1b6309b = 233: 637d002 mingw: when running in a Windows container, try to rename() harder
233: 8fc5fe0 = 234: 5315641 Introduce helper to create symlinks that knows about index_state
236: 59ced81 = 235: 28a4020 mingw: move the file_attr_to_st_mode() function definition
235: 13de470 = 236: 4b4cb1f mingw: allow to specify the symlink type in .gitattributes
238: 2f6de58 = 237: 57c89d6 mingw: Windows Docker volumes are not symbolic links
237: 38f0bc6 = 238: 06a7a02 Win32: symlink: add test for
symlinkattribute240: d2965ee = 239: e258f5a mingw: work around rename() failing on a read-only file
239: 50ab7a7 = 240: 8b01847 mingw: explicitly specify with which cmd to prefix the cmdline
241: d62441b = 241: 036ef2e mingw: when path_lookup() failed, try BusyBox
242: 35ee1dc = 242: cb1a07d test-tool: learn to act as a drop-in replacement for
iconv243: 3029c3c = 243: e163915 tests(mingw): if
iconvis unavailable, usetest-helper --iconv244: 980917b = 244: 64f7c23 gitattributes: mark .png files as binary
245: ac2583f = 245: 87abc6e tests: move test PNGs into t/lib-diff/
246: e4d1bb4 = 246: 3877a48 tests: only override sort & find if there are usable ones in /usr/bin/
247: 247fa4b = 247: 83468a7 tests: use the correct path separator with BusyBox
248: 20968cf = 248: 2e87e1a mingw: only use Bash-ism
builtin pwd -Wwhen available249: 7610061 = 249: 8a44be2 tests (mingw): remove Bash-specific pwd option
250: 3b5a8cc = 250: 7e5a9ab test-lib: add BUSYBOX prerequisite
251: 6174c4e = 251: 264a63e Describe Git for Windows' architecture
252: 3e97888 = 252: 5c3e43e t5003: use binary file from t/lib-diff/
253: d021ba2 = 253: f27b139 Modify the Code of Conduct for Git for Windows
254: 8856e88 = 254: 9a9325b t5532: workaround for BusyBox on Windows
255: b22dade = 255: e84c292 CONTRIBUTING.md: add guide for first-time contributors
257: de8dc9f = 256: e72ae3b t5605: special-case hardlink test for BusyBox-w32
258: 4c126ed = 257: b7b6699 README.md: Add a Windows-specific preamble
256: a1f2c12 = 258: cf07a0a Merge branch 'gitk-and-git-gui-patches'
260: 2ef8bac = 259: f20d0c0 t5813: allow for $PWD to be a Windows path
261: 59bef2b = 260: a8e2928 Add an issue template
259: 2f04b36 = 261: 099e466 Merge branch 'long-paths'
263: 02ed783 = 262: a2a8265 t9200: skip tests when $PWD contains a colon
264: 13c658e = 263: 52afa8f mingw: kill child processes in a gentler way
265: 4b5a83d = 264: 740e079 Add a GitHub workflow to monitor component updates
266: 576c16f = 265: b8e6c91 Modify the GitHub Pull Request template (to reflect Git for Windows)
262: 2fea97a = 266: 382ed14 Merge branch 'msys2'
268: 1241279 = 267: 3d4692f mingw: optionally enable wsl compability file mode bits
269: 2f30b06 = 268: 1c99888 mingw: really handle SIGINT
270: 2bcf5ac = 269: e3d9f50 Partially un-revert "editor: save and reset terminal after calling EDITOR"
271: fe39157 = 270: 253ba8d reset: reinstate support for the deprecated --stdin option
272: 978e8c1 = 271: 79021a2 fsmonitor: reintroduce core.useBuiltinFSMonitor
273: 2bb9170 = 272: 0c4b3c9 dependabot: help keeping GitHub Actions versions up to date
274: bd11f7a = 273: a89b62f SECURITY.md: document Git for Windows' policies
267: 911e84a = 274: 19b7772 Merge 'docker-volumes-are-no-symlinks'
275: 2dfa6ac = 275: bf6d0c0 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
276: b60bb72 = 276: 757abde Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
277: badb138 = 277: 154b92a Merge branch 'busybox-w32'
278: 0fb35bd = 278: e30f53e Merge branch 'wsl-file-mode-bits'
279: 39c58b7 = 279: d454f5d Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
280: 3184f44 = 280: a24fe79 Merge branch 'un-revert-editor-save-and-reset'
281: 7a9b211 = 281: fdfc9a1 Merge branch 'phase-out-reset-stdin'
282: c50714c = 282: 9530389 Merge branch 'deprecate-core.useBuiltinFSMonitor'
283: 358f1cd = 283: e5770a4 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
284: dc30ecd = 284: 25b2c4f Merge 'readme' into HEAD
285: 12cd2e1 = 285: e92c607 Add an AGENTS.md file to help with AI-assisted debugging/development
286: e3a590a = 286: 93e4122 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: 33bae60 = 287: d998e37 ??? t5563: add tests for http.emptyAuth with Negotiate
288: 88de53b ! 288: 8bc4fcc 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 ## -@@ AGENTS.md: Make **only** the change the patch intended, but in the current location: - - Conflict markers make the file invalid code: - ``` --<<<<<<< HEAD --======= -->>>>>>> commit-hash - ``` - - **All three types of markers must be completely removed.** @@ AGENTS.md: gets squashed into. Run affected tests before finalizing. @@ AGENTS.md: gets squashed into. +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. -+ ### 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 +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. -+ ## Contributing to Upstream Git via GitGitGadget ### Overview-: ---------- > 289: 0677fe6 amend! mingw: use mimalloc
-: ---------- > 290: b5ee67f fixup! mimalloc: offer a build-time option to enable it
-: ---------- > 291: 7b34142 fixup! mimalloc: adjust for building inside Git
-: ---------- > 292: 56ac7df fixup! Import the source code of mimalloc v2.2.7
-: ---------- > 293: 84c0a80 fixup! git-compat-util: avoid redeclaring _DEFAULT_SOURCE
-: ---------- > 294: 4c2e23b fixup! win32/pthread: avoid name clashes with winpthread
-: ---------- > 295: c7ca15a Drop mimalloc (Drop mimalloc git#6231)