Rebase shears/seen: 3 conflict(s) (0 skipped, 3 resolved) (#27180520177)#221
Open
gitforwindowshelper[bot] wants to merge 294 commits into
Open
Rebase shears/seen: 3 conflict(s) (0 skipped, 3 resolved) (#27180520177)#221gitforwindowshelper[bot] wants to merge 294 commits into
gitforwindowshelper[bot] wants to merge 294 commits into
Conversation
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Git's regular Makefile mentions that HOST_CPU should be defined when cross-compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L438-L439 This is then used to set the GIT_HOST_CPU variable when compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L1337-L1341 Then, when the user runs `git version --build-options`, it returns that value: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/help.c#L658 This commit adds the same functionality to the CMake configuration. Users can now set -DHOST_CPU= to set the target architecture. Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
As reported in newren/git-filter-repo#225, it looks like 99 bytes is not really sufficient to represent e.g. the full path to Python when installed via Windows Store (and this path is used in the hasb bang line when installing scripts via `pip`). Let's increase it to what is probably the maximum sensible path size: MAX_PATH. This makes `parse_interpreter()` in line with what `lookup_prog()` handles. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Vilius Šumskas <vilius@sumskas.eu>
We used to have that `make vcxproj` hack, but a hack it is. In the meantime, we have a much cleaner solution: using CMake, either explicitly, or even more conveniently via Visual Studio's built-in CMake support (simply open Git's top-level directory via File>Open>Folder...). Let's let the `README` reflect this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This adds support for a new http.sslAutoClientCert config value. In cURL 7.77 or later the schannel backend does not automatically send client certificates from the Windows Certificate Store anymore. This config value is only used if http.sslBackend is set to "schannel", and can be used to opt in to the old behavior and force cURL to send client certificates. This fixes git-for-windows#3292 Signed-off-by: Pascal Muller <pascalmuller@gmail.com>
Because `git subtree` (unlike most other `contrib` modules) is included as part of the standard release of Git for Windows, its stability should be verified as consistently as it is for the rest of git. By including the `git subtree` tests in the CI workflow, these tests are as much of a gate to merging and indicator of stability as the standard test suite. Signed-off-by: Victoria Dye <vdye@github.com>
Ensure key CMake option values are part of the CMake output to facilitate user support when tool updates impact the wider CMake actions, particularly ongoing 'improvements' in Visual Studio. These CMake displays perform the same function as the build-options.txt provided in the main Git for Windows. CMake is already chatty. The setting of CMAKE_EXPORT_COMPILE_COMMANDS is also reported. Include the environment's CMAKE_EXPORT_COMPILE_COMMANDS value which may have been propogated to CMake's internal value. Testing the CMAKE_EXPORT_COMPILE_COMMANDS processing can be difficult in the Visual Studio environment, as it may be cached in many places. The 'environment' may include the OS, the user shell, CMake's own environment, along with the Visual Studio presets and caches. See previous commit for arefacts that need removing for a clean test. Signed-off-by: Philip Oakley <philipoakley@iee.email>
These fixes have been sent to the Git mailing list but have not been picked up by the Git project yet. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is no longer true in general, not with supporting Clang out of the box. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib` rather than `libexpat.lib`. It appears that the `vcpkg` package for "libexpat" has changed and now creates `libexpatd.lib` for debug mode builds. Previously, both debug and release builds created a ".lib" with the same basename. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
On LLP64 systems, such as Windows, the size of `long`, `int`, etc. is only 32 bits (for backward compatibility). Git's use of `unsigned long` for file memory sizes in many places, rather than size_t, limits the handling of large files on LLP64 systems (commonly given as `>4GB`). Provide a minimum test for handling a >4GB file. The `hash-object` command, with the `--literally` and without `-w` option avoids writing the object, either loose or packed. This avoids the code paths hitting the `bigFileThreshold` config test code, the zlib code, and the pack code. Subsequent patches will walk the test's call chain, converting types to `size_t` (which is larger in LLP64 data models) where appropriate. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In bf2d5d8 (Don't let ld strip relocations, 2016-01-16) (picked from git-for-windows@6a237925bf10), Git for Windows introduced the `-Wl,-pic-executable` flag, specifying the exact entry point via `-e`. This required discerning between i686 and x86_64 code because the former required the symbol to be prefixed with an underscore, the latter did not. As per https://sourceware.org/bugzilla/show_bug.cgi?id=10865, the specified symbols are already the default, though. So let's drop the overly-specific definition. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Continue walking the code path for the >4GB `hash-object --literally` test. The `hash_object_file_literally()` function internally uses both `hash_object_file()` and `write_object_file_prepare()`. Both function signatures use `unsigned long` rather than `size_t` for the mem buffer sizes. Use `size_t` instead, for LLP64 compatibility. While at it, convert those function's object's header buffer length to `size_t` for consistency. The value is already upcast to `uintmax_t` for print format compatibility. Note: The hash-object test still does not pass. A subsequent commit continues to walk the call tree's lower level hash functions to identify further fixes. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 already defines a couple of helpful environment variables, and we can use those to infer the installation location as well as the CPU. No need for hard-coding ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Create a wrapper for the Windows Resource Compiler (RC.EXE) for use by the MSVC=1 builds. This is similar to the CL.EXE and LIB.EXE wrappers used for the MSVC=1 builds. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Continue walking the code path for the >4GB `hash-object --literally`
test to the hash algorithm step for LLP64 systems.
This patch lets the SHA1DC code use `size_t`, making it compatible with
LLP64 data models (as used e.g. by Windows).
The interested reader of this patch will note that we adjust the
signature of the `git_SHA1DCUpdate()` function without updating _any_
call site. This certainly puzzled at least one reviewer already, so here
is an explanation:
This function is never called directly, but always via the macro
`platform_SHA1_Update`, which is usually called via the macro
`git_SHA1_Update`. However, we never call `git_SHA1_Update()` directly
in `struct git_hash_algo`. Instead, we call `git_hash_sha1_update()`,
which is defined thusly:
static void git_hash_sha1_update(git_hash_ctx *ctx,
const void *data, size_t len)
{
git_SHA1_Update(&ctx->sha1, data, len);
}
i.e. it contains an implicit downcast from `size_t` to `unsigned long`
(before this here patch). With this patch, there is no downcast anymore.
With this patch, finally, the t1007-hash-object.sh "files over 4GB hash
literally" test case is fixed.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The tell-tale is the presence of the `MSYSTEM` value while compiling, of course. In that case, we want to ensure that `MSYSTEM` is set when running `git.exe`, and also enable the magic MSYS2 tty detection. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Teach MSVC=1 builds to depend on the `git.rc` file so that the resulting executables have Windows-style resources and version number information within them. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This compile-time option allows to ask Git to load libcurl dynamically at runtime. Together with a follow-up patch that optionally overrides the file name depending on the `http.sslBackend` setting, this kicks open the door for installing multiple libcurl flavors side by side, and load the one corresponding to the (runtime-)configured SSL/TLS backend. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Just like the `hash-object --literally` code path, the `--stdin` code path also needs to use `size_t` instead of `unsigned long` to represent memory sizes, otherwise it would cause problems on platforms using the LLP64 data model (such as Windows). To limit the scope of the test case, the object is explicitly not written to the object store, nor are any filters applied. The `big` file from the previous test case is reused to save setup time; To avoid relying on that side effect, it is generated if it does not exist (e.g. when running via `sh t1007-*.sh --long --run=1,41`). Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 defines some helpful environment variables, e.g. `MSYSTEM`. There is code in Git for Windows to ensure that that `MSYSTEM` variable is set, hard-coding a default. However, the existing solution jumps through hoops to reconstruct the proper default, and is even incomplete doing so, as we found out when we extended it to support CLANGARM64. This is absolutely unnecessary because there is already a perfectly valid `MSYSTEM` value we can use at build time. This is even true when building the MINGW32 variant on a MINGW64 system because `makepkg-mingw` will override the `MSYSTEM` value as per the `MINGW_ARCH` array. The same is equally true for the `/mingw64`, `/mingw32` and `/clangarm64` prefix: those values are already available via the `MINGW_PREFIX` environment variable, and we just need to pass that setting through. Only when `MINGW_PREFIX` is not set (as is the case in Git for Windows' minimal SDK, where only `MSYSTEM` is guaranteed to be set correctly), we use as fall-back the top-level directory whose name is the down-cased value of the `MSYSTEM` variable. Incidentally, this also broadens the support to all the configurations supported by the MSYS2 project, i.e. clang64 & ucrt64, too. Note: This keeps the same, hard-coded MSYSTEM platform support for CMake as before, but drops it for Meson (because it is unclear how Meson could do this in a more flexible manner). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A change between versions 2.4.1 and 2.6.0 of the MSYS2 runtime modified how Cygwin's runtime (and hence Git for Windows' MSYS2 runtime derivative) handles locales: d16a56306d (Consolidate wctomb/mbtowc calls for POSIX-1.2008, 2016-07-20). An unintended side-effect is that "cold-calling" into the POSIX emulation will start with a locale based on the current code page, something that Git for Windows is very ill-prepared for, as it expects to be able to pass a command-line containing non-ASCII characters to the shell without having those characters munged. One symptom of this behavior: when `git clone` or `git fetch` shell out to call `git-upload-pack` with a path that contains non-ASCII characters, the shell tried to interpret the entire command-line (including command-line parameters) as executable path, which obviously must fail. This fixes git-for-windows#1036 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Ignore the `-fno-stack-protector` compiler argument when building with MSVC. This will be used in a later commit that needs to build a Win32 GUI app. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This implements the Windows-specific support code, because everything is slightly different on Windows, even loading shared libraries. Note: I specifically do _not_ use the code from `compat/win32/lazyload.h` here because that code is optimized for loading individual functions from various system DLLs, while we specifically want to load _many_ functions from _one_ DLL here, and distinctly not a system DLL (we expect libcurl to be located outside `C:\Windows\system32`, something `INIT_PROC_ADDR` refuses to work with). Also, the `curl_easy_getinfo()`/`curl_easy_setopt()` functions are declared as vararg functions, which `lazyload.h` cannot handle. Finally, we are about to optionally override the exact file name that is to be loaded, which is a goal contrary to `lazyload.h`'s design. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
To complement the `--stdin` and `--literally` test cases that verify that we can hash files larger than 4GB on 64-bit platforms using the LLP64 data model, here is a test case that exercises `hash-object` _without_ any options. Just as before, we use the `big` file from the previous test case if it exists to save on setup time, otherwise generate it. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Specify symlink type in .gitattributes
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and Philip Oakley. Helped-by: Clive Chan <cc@clive.io> Helped-by: Adric Norris <landstander668@gmail.com> Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com> Helped-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Brendan Forster <brendan@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…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>
This patch introduces support to set special NTFS attributes that are interpreted by the Windows Subsystem for Linux as file mode bits, UID and GID. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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 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.
…ws#6216) This is a companion of microsoft#899. Trace2 + GIT_TRACE_FSCACHE evidence on Windows ARM64 (Snapdragon X Elite, ReFS Dev Drive) shows that the heaviest lstat-bound work in git add happens inside repo_read_index_preload(), which currently runs before enable_fscache() is called. Moving the enable up so the preload phase is wrapped lets the existing batched NtQueryDirectoryFile cache cover the bulk of the lstat traffic. This patch gave me a ~30% performance improvement on a large git repo with a batched add. Also at the end of cmd_add(): the cleanup site called enable_fscache(0) again instead of disable_fscache(), leaking the refcount.
…t-for-windows#6250) ## Problem `git checkout <tree> -- <pathspec>` with `checkout.workers > 1` and `core.fscache=true` fails when restoring files into directories that do not yet exist on disk. Two failure modes: 1. `fatal: cannot create directory at '...': Directory not empty` (exit 128) 2. `error: unable to stat just-written file '...'` (exit 255) 100% reproducible when two or more files share a not-yet-created parent directory. ## Root Cause The Windows fscache caches directory listings that become stale when `create_directories()` creates new parent directories via `mkdir()` or when `write_pc_item()` writes new files. With `workers=1`, `write_entry()` calls `flush_fscache()` after each file, keeping the cache in sync. With `workers>1`, `enqueue_checkout()` defers the write (and the flush), leaving the cache stale for subsequent entries. ## Fix Add `flush_fscache()` calls: - In `create_directories()` after each successful `mkdir()`, so `has_dirs_only_path()` sees the new directory - In `write_pc_item()` before `lstat()` of the just-written file On non-Windows platforms `flush_fscache()` is a no-op. ## Test Adds a regression test to `t2080-parallel-checkout-basics.sh` (`MINGW` prereq) that deterministically reproduces the bug: two files sharing a nested parent directory, deleted in a second commit, then restored via `git checkout <tree> -- <pathspec>` with `workers=2`.
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: 8984fda86b (entry: flush fscache after creating directories and writing files (git-for-windows#6250), 2026-06-08) (e4229f2678..8984fda86b)
Resolved: 9ebface (fscache: make fscache_enable() thread safe, 2018-11-16)
kept both includes: win32/exit-process.h (from HEAD) and win32/fscache.h (from patch)
Range-diff
1: 9ebface ! 1: 0f557bb fscache: make fscache_enable() thread safe
Resolved: 358788f (AGENTS.md: document
amend!, fixup-only PRs, and direct GfW PRs (git-for-windows#6232), 2026-05-26)Resolved by taking HEAD for all files except AGENTS.md (merge didn't modify them), and for AGENTS.md kept the incoming additions documenting amend! commits, fixup-only PRs, and contributing to Git for Windows.
Range-diff
1: 358788f ! 1: 187c68b AGENTS.md: document
amend!, fixup-only PRs, and direct GfW PRs (AGENTS.md: documentamend!, fixup-only PRs, and direct GfW PRs git#6232)@@ Commit message changes. ## AGENTS.md ## + remerge CONFLICT (add/add): Merge conflict in AGENTS.md + index 909773c8e0..c60945448f 100644 + --- AGENTS.md + +++ AGENTS.md @@ AGENTS.md: gets squashed into. Run affected tests before finalizing. -+### `amend!` Commits -+ -+A `fixup!` commit keeps the target's commit message and merely combines -+its diff into the target. An `amend!` commit additionally **replaces** -+the target's commit message with its own body. Use `amend!` when the -+fix changes the meaning of the target sufficiently that the original -+subject or body is no longer accurate, or when the goal is to align a -+downstream commit with a specific upstream replacement. -+ -+The format is rigid: the first line of an `amend!` commit must be -+exactly `amend! <subject of target>`, followed by a blank line and then -+the **new** commit message that should replace the target's, starting -+with the new subject line: -+ -+``` -+amend! mingw: use mimalloc -+ -+mingw: stop using nedmalloc -+ -+The vendored nedmalloc allocator under compat/nedmalloc/ has been -+unmaintained upstream... -+``` -+ -+After autosquash, the resulting commit has the new subject (`mingw: -+stop using nedmalloc`), the new body, and a diff that is the -+composition of the target's diff and the `amend!`'s diff. Crafting the -+`amend!` diff so that the composition equals a known upstream commit's -+diff is the canonical way to align a downstream branch-thicket commit -+with an in-flight upstream replacement: when the next merging-rebase -+picks up the upstream commit, the byte-identical downstream commit -+collapses into it cleanly. -+ -+### PRs Composed Entirely of `fixup!` and `amend!` Commits -+ -+Adjusting or removing a feature that lives in the branch thicket is -+often best expressed as a PR that consists *only* of `fixup!` and -+`amend!` commits targeting the existing thicket commits. Each pair -+autosquashes during the next merging-rebase. Pairs whose diffs cancel -+exactly produce empty commits, which the rebase drops with -+`--empty=drop`. The end state is *as if the original commits had been -+edited or removed in place*, while preserving review-friendly atomic -+patches in the PR. -+ -+This is the preferred pattern for reverting a multi-commit downstream -+feature. Order the fixups in **reverse** of the originals so each -+revert applies cleanly to the worktree as you build the series. -+ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< e9274054fd (??? t5563: add tests for http.emptyAuth with Negotiate) +-================================ + ### `amend!` Commits + + A `fixup!` commit keeps the target's commit message and merely combines +@@ AGENTS.md: This is the preferred pattern for reverting a multi-commit downstream + feature. Order the fixups in **reverse** of the originals so each + revert applies cleanly to the worktree as you build the series. + +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) ### Common Adaptation Patterns **Struct field moves**: When upstream moves fields between structs, update @@ AGENTS.md: On Windows, `unsigned long` is 32 bits even on 64-bit systems. Use `s for sizes that may exceed 4GB. Be careful with format strings: use `PRIuMAX` with a cast for `size_t` values. -+## Contributing to Git for Windows -+ -+The primary contribution path for this fork is a PR against -+`git-for-windows/git`'s `main` branch. The repository is laid out as a -+branch thicket on top of an upstream Git base; see -+[Merging-Rebases](#merging-rebases) and -+[Analyzing Branch Thickets](#analyzing-branch-thickets) for the -+mechanics. -+ -+### Opening a PR -+ -+Push the topic branch to a personal fork on GitHub, then: -+ -+```bash -+gh pr create \ -+ --repo git-for-windows/git \ -+ --base main \ -+ --head <you>:<branch> \ -+ --title "<subject>" \ -+ --body-file <path/to/body.md> -+``` -+ -+Unlike upstream contributions, the PR body is rendered as Markdown on -+GitHub, not sent as email. Use the formatting that aids review: -+fenced code blocks, tables, links to workflow runs. -+ -+### When the PR Adjusts the Thicket Itself -+ -+If the PR's purpose is to edit, remove, or replace existing -+branch-thicket commits, the natural form is a series of `fixup!` or -+`amend!` commits targeting the affected originals. See -+[Fixup Commits](#fixup-commits), -+[`amend!` Commits](#amend-commits), and -+[PRs Composed Entirely of `fixup!` and `amend!` Commits](#prs-composed-entirely-of-fixup-and-amend-commits). -+The merging-rebase that produces the next `main` autosquashes these -+into the thicket; the PR exists for review of the individual -+adjustments. -+ -+### When an Upstream Patch Will Replace a Thicket Commit -+ -+If an upstream patch is in flight (for instance, on `gitgitgadget/git` -+in `seen` or `next`) that replaces a downstream thicket commit, an -+`amend!` commit whose body is a verbatim copy of the upstream commit -+message and whose diff aligns the autosquashed target with the -+upstream commit's diff is the canonical pattern. The next -+merging-rebase that picks up the upstream commit will recognize the -+two as byte-identical and collapse them. -+ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< e9274054fd (??? t5563: add tests for http.emptyAuth with Negotiate) +-================================ + ## Contributing to Git for Windows + + The primary contribution path for this fork is a PR against +@@ AGENTS.md: upstream commit's diff is the canonical pattern. The next + merging-rebase that picks up the upstream commit will recognize the + two as byte-identical and collapse them. + +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 35e8b3a205 (AGENTS.md: document `amend!`, fixup-only PRs, and direct GfW PRs) ## Contributing to Upstream Git via GitGitGadget ### Overview + + ## Documentation/config/sideband.adoc ## + remerge CONFLICT (add/add): Merge conflict in Documentation/config/sideband.adoc + index ea5da136bb..f6a253a21e 100644 + --- Documentation/config/sideband.adoc + +++ Documentation/config/sideband.adoc +@@ + sideband.allowControlCharacters:: +-<<<<<<< e9274054fd (??? 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 069906cd4f..dc8de210e2 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 +-<<<<<<< e9274054fd (??? 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 + +-<<<<<<< e9274054fd (??? 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 13978de5ad..09f7592fd1 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) +-<<<<<<< e9274054fd (??? 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 f2bf84d191..f63449d912 100644 + --- config.mak.dev + +++ config.mak.dev +@@ config.mak.dev: ifndef USE_MIMALLOC + DEVELOPER_CFLAGS += -std=gnu99 + endif + endif +-<<<<<<< e9274054fd (??? 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 4a69b9d764..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 +-<<<<<<< e9274054fd (??? 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 +-<<<<<<< e9274054fd (??? 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 62924e89b6..928bde2ec6 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); + } + +-<<<<<<< e9274054fd (??? 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; + } + +-<<<<<<< e9274054fd (??? 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 6467eb9ef7..4c87cd160b 100644 + --- object-file.h + +++ object-file.h +@@ object-file.h: struct odb_source; + * `force_object_loose()` generic and is thus postponed to a later point in + * time. + */ +-<<<<<<< e9274054fd (??? 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 dd84261a0c..58a9378937 100644 + --- sideband.c + +++ sideband.c +@@ sideband.c: static struct keyword_entry keywords[] = { + }; + + static enum { +-<<<<<<< e9274054fd (??? 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; + +-<<<<<<< e9274054fd (??? 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); + } + +-<<<<<<< e9274054fd (??? 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 +-<<<<<<< e9274054fd (??? 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; + +-<<<<<<< e9274054fd (??? 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--) { +-<<<<<<< e9274054fd (??? 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, '^'); +-<<<<<<< e9274054fd (??? 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 1ff0101596..f53c449a84 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', +-<<<<<<< e9274054fd (??? 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 4bba2b26e8..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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< e9274054fd (??? 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 +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< e9274054fd (??? 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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< e9274054fd (??? 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 4b6492865b..41f5b6efb6 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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< e9274054fd (??? 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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< e9274054fd (??? 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 2462926a3e..e2a86d7a90 100755 + --- t/t9200-git-cvsexportcommit.sh + +++ t/t9200-git-cvsexportcommit.sh +@@ t/t9200-git-cvsexportcommit.sh: case "$PWD" in + ;; + esac + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< e9274054fd (??? 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 1ce3057079..e26ab5312a 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/ . + +-<<<<<<< e9274054fd (??? 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 assumeResolved: 8984fda86b (entry: flush fscache after creating directories and writing files (git-for-windows#6250), 2026-06-08)
Resolved conflict by taking upstream's version which already includes both the clang7 addition and the USE_MIMALLOC guard removal
Range-diff
1: 8984fda86b ! 1: a3bc6db entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
@@ Commit message prereq) that deterministically reproduces the bug: two files sharing a nested parent directory, deleted in a second commit, then restored via `git checkout <tree> -- <pathspec>` with `workers=2`. + + ## config.mak.dev ## + remerge CONFLICT (content): Merge conflict in config.mak.dev + index 47b07f99e5..1bd12fa708 100644 + --- config.mak.dev + +++ config.mak.dev +@@ config.mak.dev: endif + endif + + ifneq ($(uname_S),FreeBSD) +-<<<<<<< 509a691144 (add: enable FSCache around `repo_read_index_preload()` (#6216)) + ifneq ($(or $(filter gcc6,$(COMPILER_FEATURES)),$(filter clang7,$(COMPILER_FEATURES))),) +-======= +-ifneq ($(filter gcc6,$(COMPILER_FEATURES)),) +-ifndef USE_MIMALLOC +->>>>>>> b0d72f56ff (entry: flush fscache after creating directories and writing files) + DEVELOPER_CFLAGS += -std=gnu99 + endif + endifTo: a3bc6db699 (entry: flush fscache after creating directories and writing files (git-for-windows#6250), 2026-06-08) (a551ce532c..a3bc6db699)
Statistics
Range-diff (click to expand)
1: e1bc903 = 1: 4c60686 ci(dockerized): reduce the PID limit for private repositories
2: d0f8fad = 2: de51b78 mingw: skip symlink type auto-detection for network share targets
3: 3a5e890 = 3: 607d5f6 Merge branch 'fix-ci'
4: 9779b2c = 4: 57b8330 unix-socket: avoid leak when initialization fails
5: 09efae6 = 5: 3210c9b Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: 5c7df16 = 6: 012ec9b grep: prevent
^$false match at end of file7: 9a13b5c = 7: 92f29e2 Merge branch 'v2.53.0.windows.3'
8: a8757a8 = 8: 65ce4e1 Merge branch 'fixes-from-the-git-mailing-list'
9: b49f2e1 = 9: ecfde10 vcpkg_install: detect lack of Git
10: e7397ed = 10: c248710 vcpkg_install: add comment regarding slow network connections
11: 6cf853f = 11: cd6c32a vcbuild: install ARM64 dependencies when building ARM64 binaries
12: 6f8fe56 = 12: 44c37b2 vcbuild: add an option to install individual 'features'
13: 070d3c4 = 13: 490ac6e cmake: allow building for Windows/ARM64
14: 4f99acb = 14: 0c39eea mingw: include the Python parts in the build
15: 69ae713 = 15: 1326808 ci(vs-build) also build Windows/ARM64 artifacts
16: ef93cca = 16: 34dc50b win32/pthread: avoid name clashes with winpthread
17: 5314fd7 = 17: c08ab88 Add schannel to curl installation
18: e616cf1 = 18: 7399bea git-compat-util: avoid redeclaring _DEFAULT_SOURCE
19: 1536a6e = 19: 4816e6b cmake(): allow setting HOST_CPU for cross-compilation
20: 801c364 = 20: 802e422 Import the source code of mimalloc v2.2.7
21: 5c59765 = 21: 86262cd t9350: point out that refs are not updated correctly
22: bfe8784 = 22: 5b67437 CMake: default Visual Studio generator has changed
23: 807db26 = 23: a2f0efa mimalloc: adjust for building inside Git
24: 97f9238 = 24: 74a46b2 transport-helper: add trailing --
25: 1fc55a6 = 25: 61efa28 mingw: demonstrate a
git addissue with NTFS junctions26: 9bcdf1d = 26: 125bd73 .gitignore: add Visual Studio CMakeSetting.json file
27: 52eabd8 = 27: c2a0e70 mimalloc: offer a build-time option to enable it
28: e30600f = 28: fcf4c93 t5505/t5516: allow running without
.git/branches/in the templates29: be021c8 = 29: 48dde26 remote-helper: check helper status after import/export
30: e54d3ee = 30: bba4600 clean: do not traverse mount points
31: 78df6d1 = 31: 08de003 strbuf_realpath(): use platform-dependent API if available
32: 647df65 = 32: 5220683 http: use new "best effort" strategy for Secure Channel revoke checking
33: dfb6319 = 33: 9774feb subtree: update
contrib/subtreetesttarget34: 82b7e56 = 34: 5f65f18 CMakeLists: add default "x64-windows" arch for Visual Studio
35: f6d93be = 35: ee4e65f mingw: use mimalloc
36: d7f4bf7 = 36: f08ebe8 t5505/t5516: fix white-space around redirectors
37: daf3058 = 37: 9579d12 Always auto-gc after calling a fast-import transport
38: ae5f516 = 38: aa4b0d8 mingw: prevent regressions with "drive-less" absolute paths
39: 029e500 = 39: 2b0e246 clean: remove mount points when possible
40: 1362c9a = 40: d3b0385 transport: optionally disable side-band-64k
41: 416f8e9 = 41: 9bfdcbd mingw: fix fatal error working on mapped network drives on Windows
42: 8d1a052 = 42: 478b0d8 clink.pl: fix MSVC compile script to handle libcurl-d.lib
43: 3938dcd = 43: aed724c mingw: implement a platform-specific
strbuf_realpath()44: 00e5613 = 44: a68d460 t3701: verify that we can add lots of files interactively
45: 83fef18 = 45: b390d42 commit: accept "scissors" with CR/LF line endings
46: 8857dca = 46: d37b5a8 t0014: fix indentation
47: 01b94b4 = 47: e630592 git-gui: accommodate for intent-to-add files
48: f159d60 = 48: 3527c20 mingw: allow for longer paths in
parse_interpreter()49: a4c5710 = 49: 555ea67 compat/vcbuild: document preferred way to build in Visual Studio
50: 7de8832 = 50: 3a08c0a http: optionally send SSL client certificate
51: 6652451 = 51: d252e11 ci: run
contrib/subtreetests in CI builds52: 5072a39 = 52: b0e1165 CMake: show Win32 and Generator_platform build-option values
53: ef585b2 = 53: 3d27489 windows: skip linking
git-<command>for built-ins54: 2773a87 = 54: 97ffe65 mingw: stop hard-coding
CC = gcc55: 80a4a4d = 55: 3e0491b mingw: drop the -D_USE_32BIT_TIME_T option
56: 4886f35 = 56: 2eadb4f mingw: only use -Wl,--large-address-aware for 32-bit builds
57: cf7d2ca = 57: 7393dfb mingw: avoid over-specifying
--pic-executable58: 2f3bb8a = 58: e828e02 mingw: set the prefix and HOST_CPU as per MSYS2's settings
59: a88247e = 59: 3a273e7 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
60: 5571fff = 60: b591452 mingw: rely on MSYS2's metadata instead of hard-coding it
61: cef80a6 = 61: 4b36fcb mingw: always define
ETC_*for MSYS2 environments62: 992cbf5 = 62: d569f24 max_tree_depth: lower it for clang builds in general on Windows
63: 3643056 = 63: 9218ab6 mingw: ensure valid CTYPE
64: c18d0dc = 64: d56ac9c mingw: allow
git.exeto be used instead of the "Git wrapper"65: dc8659a = 65: 3a0e703 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
66: a1402d0 = 66: 9aeeb8f Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
67: 23710ec = 67: f743e07 clink.pl: fix libexpatd.lib link error when using MSVC
68: 9a2877e = 68: 8d3242f Makefile: clean up .ilk files when MSVC=1
69: 558712d = 69: 2dd3507 hash-object: demonstrate a >4GB/LLP64 problem
70: b09efe9 = 70: 9e6b32b vcbuild: add support for compiling Windows resource files
71: 206cd82 = 71: d296ecb object-file.c: use size_t for header lengths
72: 84ff974 = 72: 6c51861 config.mak.uname: add git.rc to MSVC builds
73: efcd983 = 73: a9dac9c MinGW: link as terminal server aware
75: bd083fb = 74: 9b1340f hash algorithms: use size_t for section lengths
76: a8e1fd4 = 75: 64df309 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
77: 65edd58 = 76: 82431c6 http: optionally load libcurl lazily
79: d046b34 = 77: 6d1b8db hash-object --stdin: verify that it works with >4GB/LLP64
80: 0e4b875 = 78: b15718a clink.pl: move default linker options for MSVC=1 builds
81: ed949b0 = 79: eb93126 http: support lazy-loading libcurl also on Windows
83: 7f5891b = 80: 9c2a383 hash-object: add another >4GB/LLP64 test case
84: 00f8998 = 81: 67e1ac7 setup: properly use "%(prefix)/" when in WSL
85: 119ec47 = 82: 7a2c1f9 Add config option
windows.appendAtomically86: 812469a = 83: 7ed5908 cmake: install headless-git.
87: 21ce84f = 84: b84869f http: when loading libcurl lazily, allow for multiple SSL backends
74: fc73420 = 85: 5d58740 survey: stub in new experimental 'git-survey' command
89: 317725a = 86: 1bc8d15 hash-object: add a >4GB/LLP64 test case using filtered input
90: 7146e93 = 87: 86b9944 compat/mingw.c: do not warn when failing to get owner
91: 3ad179f = 88: 12260fa mingw: $env:TERM="xterm-256color" for newer OSes
92: eff8945 = 89: 3c98938 winansi: check result and Buffer before using Name
93: 6037c54 ! 90: a4545e7 mingw: change core.fsyncObjectFiles = 1 by default
94: ef19d7f = 91: a77a22d Fix Windows version resources
95: f947de7 = 92: cc8a726 status: fix for old-style submodules with commondir
96: 353e5fd = 93: 523d08b git.rc: include winuser.h
97: 4acad31 = 94: a960279 mingw: do load libcurl dynamically by default
98: 4811342 = 95: 8699710 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
99: 6fac936 = 96: 96ed091 mingw: suggest
windows.appendAtomicallyin more cases100: 298ccda = 97: 83ec6fb win32: use native ANSI sequence processing, if possible
101: 22f6185 = 98: 4237b83 common-main.c: fflush stdout buffer upon exit
102: 91ed1e2 = 99: 2abf5b0 t5601/t7406(mingw): do run tests with symlink support
103: bb01dac = 100: a276076 win32: ensure that
localtime_r()is declared even in i686 builds104: 32f217f = 101: 4b7eeb4 Fallback to AppData if XDG_CONFIG_HOME is unset
105: 5893628 = 102: e4c83c8 run-command: be helpful with Git LFS fails on Windows 7
78: 2d00347 = 103: f2957a0 survey: add command line opts to select references
82: b637430 = 104: 68d7e40 survey: start pretty printing data in table form
88: 7a8d77c = 105: 55f5870 survey: add object count summary
106: 6e310a3 = 106: 38ab0ec Merge 'remote-hg-prerequisites' into HEAD
118: 99c9fde = 107: 7edf5b7 survey: summarize total sizes by object type
107: 30902a1 = 108: 255a8be Merge branch 'drive-prefix'
120: a689ab9 = 109: e03b261 survey: show progress during object walk
121: 1d24afa = 110: e2e3d71 mingw: make sure
errnois set correctly when socket operations fail122: 763b1f0 = 111: 2421386 t5563: verify that NTLM authentication works
108: 8afa258 = 112: b7c0c8a Merge branch 'dont-clean-junctions'
124: 9c1697e = 113: f29578f survey: add ability to track prioritized lists
125: a18b707 = 114: 6ec37fd compat/mingw: handle WSA errors in strerror
126: c52955e = 115: 5d3cede http: disallow NTLM authentication by default
109: ccfffc6 = 116: 2840d3d Merge branch 'msys2-python'
128: de967b8 = 117: 57218ac survey: add report of "largest" paths
129: 2de17a7 = 118: 14cbf0a compat/mingw: drop outdated comment
130: 39c284e = 119: b7e7716 http: warn if might have failed because of NTLM
110: 83217c3 = 120: d5a19ee Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
132: 11c8345 = 121: 4a219ac survey: add --top= option and config
133: 64bfb1c = 122: 282c8c3 t0301: actually test credential-cache on Windows
134: 2210444 = 123: 1770584 credential: advertise NTLM suppression and allow helpers to re-enable
111: 9431b50 = 124: 62a7b35 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
136: f5f5b03 = 125: 82cb068 survey: clearly note the experimental nature in the output
137: 7ef433a = 126: 0fa4db5 credential-cache: handle ECONNREFUSED gracefully
138: 3fd9265 = 127: 946cf74 reftable: do make sure to use custom allocators
139: f407aba = 128: f0a20b0 check-whitespace: avoid alerts about upstream commits
140: fc9c7fb = 129: 2fc6b9d t/t5571-prep-push-hook.sh: Add test with writing to stderr
141: a3a9e93 = 130: 6476d86 dir: do not traverse mount points
142: a405149 = 131: 2b275b8 win32: thread-utils: handle multi-socket systems
143: b90906f = 132: 5375564 t5563: add tests for http.emptyAuth with Negotiate
112: 9724324 = 133: 3834e90 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
113: 413ed3b = 134: 54b05bb Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
114: 36c749f = 135: f3fc12c Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction115: 3d9559a = 136: 499f405 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
116: 0be5205 = 137: a4a1140 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
117: 69ef7be = 138: 3479428 Merge 'add-p-many-files'
119: 195f961 = 139: f7fa7c3 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
123: 5a997c7 = 140: 98a764b Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
127: 82640a6 = 141: 17da047 Merge 'git-gui/js/intent-to-add'
131: bab9e97 = 142: 153fb6a Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
135: cfe30d6 = 143: f4a1dfb Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
144: 8bdd856 = 144: 2611339 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
145: 580e6f2 = 145: e44c40b Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path146: 5814711 = 146: 106d858 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: a915f77 = 147: c91ea23 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: 1868712 = 148: 290a87c Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests149: b702140 = 149: adb8193 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
150: bfc7627 = 150: 4bb5ea9 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t151: 97806b0 = 151: 65c7afe Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory152: 44010d1 = 152: 3a9aa64 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
153: 2fc40a5 = 153: 2fc570c Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
154: 1348771 = 154: 3694409 Merge branch 'optionally-dont-append-atomically-on-windows'
155: a3499ea = 155: 7ec9209 Merge branch 'fsync-object-files-always'
156: 86672c5 = 156: 5c08032 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
157: 5a63d9f = 157: 28496dc Fix Windows version resources (Fix Windows version resources git#4092)
158: 7a567f9 = 158: d59aa50 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
159: 1474bca = 159: 61aa8af Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)160: f97fd42 = 160: 95e399e Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)161: fbcbb71 = 161: 6d21ffd Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283162: 06460c7 = 162: 4bf6ea9 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
163: 08a788e = 163: 5587f0c ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
164: c94568d = 164: 2f06152 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: 4c2ccb0 = 165: d2be3b8 Merge branch 'nano-server'
166: 11e44a0 = 166: c33001e Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
167: 65841c0 = 167: a581ca9 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
168: e86172c = 168: 61b5a5b common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
169: 82f98d4 = 169: 61591cb Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
170: 8f2daa5 = 170: 1860101 Merge branch 'Fix-i686-build-with-GCC-v14'
171: 006ab25 = 171: e3fa57b Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
172: d09536b = 172: 8591e2f Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
173: 8b73a9f = 173: 566885b Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
174: 9478218 = 174: 0454a62 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
175: 1cd460d = 175: 624722f Merge branch 'reftable-vs-custom-allocators'
176: 4b5cd6d = 176: 93fb67d Merge branch 'check-whitespace-only-downstream'
177: 8c23b4c = 177: ac9f4dd 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: a7a6665 = 178: 825e8ef Merge branch 'disallow-ntlm-auth-by-default'
179: e1a8149 = 179: 20c6b70 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)180: ab1e5b1 = 180: d124215 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
181: 1ebfdab = 181: f405994 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
182: 8fbfa94 = 182: bb76bf3 Merge branch 'ready-for-upstream'
183: bcbac37 = 183: d13eeb8 ci(macos): skip the
git p4tests184: 01fdb3c = 184: 6a03776 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)185: 149fc72 = 185: bd6e942 Win32: make FILETIME conversion functions public
186: 1831106 = 186: c58633c Win32: dirent.c: Move opendir down
187: 3782cfd = 187: a232572 mingw: make the dirent implementation pluggable
188: 1516746 = 188: 45fbcb4 Win32: make the lstat implementation pluggable
189: e11a7dc = 189: f610c23 mingw: add infrastructure for read-only file system level caches
190: c7eb788 = 190: d56aabc mingw: add a cache below mingw's lstat and dirent implementations
191: ad4d512 = 191: e68dd70 fscache: load directories only once
192: d7052ab = 192: de68403 fscache: add key for GIT_TRACE_FSCACHE
193: e3e7f71 = 193: edb5c31 fscache: remember not-found directories
194: 321fa05 = 194: 65c3585 fscache: add a test for the dir-not-found optimization
195: 5ddf085 = 195: 18fcca0 add: use preload-index and fscache for performance
196: 0202e37 = 196: 87197cb dir.c: make add_excludes aware of fscache during status
197: 6fd201e = 197: 8161bf7 fscache: make fscache_enabled() public
198: d6abd47 = 198: 7f26db7 dir.c: regression fix for add_excludes with fscache
202: 6f20bff = 199: aa2cd94 git-gui--askyesno: fix funny text wrapping
199: f93b3d3 = 200: 1fcab84 fetch-pack.c: enable fscache for stats under .git/objects
204: a4f9021 = 201: f7103e0 git-gui--askyesno (mingw): use Git for Windows' icon, if available
200: 9d9a620 = 202: 89ad270 checkout.c: enable fscache for checkout again
206: 7068d6f = 203: 7a8e5ee Merge branch 'git-gui-askyesno'
201: b97a5de = 204: a3fe74b Enable the filesystem cache (fscache) in refresh_index().
203: 8a62511 = 205: 20883fb fscache: use FindFirstFileExW to avoid retrieving the short name
205: 1e3bf0d = 206: 426498c fscache: add GIT_TEST_FSCACHE support
207: e9bc130 = 207: 05bb5d7 fscache: add fscache hit statistics
208: d226281 = 208: 5da1e0e unpack-trees: enable fscache for sparse-checkout
209: 628b109 = 209: eedb987 status: disable and free fscache at the end of the status command
210: 77e9ab5 = 210: fe92381 mem_pool: add GIT_TRACE_MEMPOOL support
211: 7740f65 = 211: f0163c1 fscache: fscache takes an initial size
212: cfae220 = 212: 36e1b64 fscache: update fscache to be thread specific instead of global
213: c2769eb = 213: cf7a644 fscache: teach fscache to use mempool
214: 9ebface ! 214: 0f557bb fscache: make fscache_enable() thread safe
215: 4d7a510 = 215: 1fd864b fscache: teach fscache to use NtQueryDirectoryFile
216: 3c28a02 = 216: 7e46dd4 fscache: remember the reparse tag for each entry
217: 3c10b97 = 217: 2aad78f Merge branch 'fscache'
218: 90d1c48 = 218: b1b6dec fscache: implement an FSCache-aware is_mount_point()
219: 2988dc4 = 219: efaa961 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: 912c8d2 = 220: 5687cf1 clean: make use of FSCache
221: f46f61e = 221: efda991 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
222: ed524d5 = 222: ab38142 Merge branch 'dont-clean-junctions-fscache'
223: 32d946a = 223: 8eab880 pack-objects (mingw): demonstrate a segmentation fault with large deltas
224: db75826 = 224: 6ec16d1 mingw: support long paths
225: c586b84 = 225: 9a8165a win32(long path support): leave drive-less absolute paths intact
226: 34887e9 = 226: 3cb431d compat/fsmonitor/fsm-*-win32: support long paths
227: 9123984 = 227: ce5a94a clean: suggest using
core.longPathsif paths are too long to remove228: 106341a = 228: ce1b71f mingw: Support
git_terminal_promptwith more terminals229: 4f31e4b = 229: d3caf37 compat/terminal.c: only use the Windows console if bash 'read -r' fails
230: ef0c31e = 230: fbf85ca mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
231: bc12f5f = 231: 0eb53a3 Win32: symlink: move phantom symlink creation to a separate function
232: 1ec27ff = 232: aab95c2 Introduce helper to create symlinks that knows about index_state
233: 0245df3 = 233: 5c5342b mingw: allow to specify the symlink type in .gitattributes
234: 9e87e0b = 234: b2dd79c Win32: symlink: add test for
symlinkattribute235: 2f8d272 = 235: bd0457b mingw: explicitly specify with which cmd to prefix the cmdline
236: 1294325 = 236: 8c216b5 mingw: when path_lookup() failed, try BusyBox
237: afa39f1 = 237: 5041bcb test-tool: learn to act as a drop-in replacement for
iconv238: db8d4fe = 238: 188cfdb tests(mingw): if
iconvis unavailable, usetest-helper --iconv239: 771f1a0 = 239: 0f3d9ce gitattributes: mark .png files as binary
240: 790cdbb = 240: b0f67fe tests: move test PNGs into t/lib-diff/
241: b018879 = 241: b4da2de tests: only override sort & find if there are usable ones in /usr/bin/
242: 3704d17 = 242: fa700b7 tests: use the correct path separator with BusyBox
243: 94e5a28 = 243: 9dd6951 mingw: only use Bash-ism
builtin pwd -Wwhen available245: 75469c0 = 244: 064a4a8 tests (mingw): remove Bash-specific pwd option
247: 9a7e15d = 245: 466d0a8 test-lib: add BUSYBOX prerequisite
249: ab06aa5 = 246: ff7596f t5003: use binary file from t/lib-diff/
244: 2ac723a = 247: ea45764 mingw: introduce code to detect whether we're inside a Windows container
251: 8d3df20 = 248: 557d833 t5532: workaround for BusyBox on Windows
246: 3c2f7fe = 249: f84b0b3 mingw: when running in a Windows container, try to rename() harder
256: 314bdf4 = 250: c153623 t5605: special-case hardlink test for BusyBox-w32
248: 532d776 = 251: afabc51 mingw: move the file_attr_to_st_mode() function definition
258: c61ff12 = 252: ca2b457 t5813: allow for $PWD to be a Windows path
250: 4afbf17 = 253: b4f2d94 mingw: Windows Docker volumes are not symbolic links
260: 09418a0 = 254: 0319e78 t9200: skip tests when $PWD contains a colon
252: 2c83eb3 = 255: ea12e07 mingw: work around rename() failing on a read-only file
264: a5dd6e2 ! 256: 4a2aef3 mingw: optionally enable wsl compability file mode bits
253: daad7bc = 257: 6af9842 Merge branch 'gitk-and-git-gui-patches'
254: 1c3e92e = 258: bde38e1 Merge branch 'long-paths'
255: 4fa8451 = 259: 621601f Merge branch 'msys2'
262: 5a1ec9c = 260: 3c59c08 Describe Git for Windows' architecture
257: e08e66b = 261: ea0917b Merge 'docker-volumes-are-no-symlinks'
266: 7c4cbce = 262: 444a993 Modify the Code of Conduct for Git for Windows
259: d92f821 = 263: 165f765 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
269: 93ba277 = 264: 944a6cf CONTRIBUTING.md: add guide for first-time contributors
261: 68e387d = 265: ef9e54a Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
263: d5b3dee < -: ---------- mingw: kill child processes in a gentler way
272: f25109b = 266: 7884303 README.md: Add a Windows-specific preamble
265: 5c59212 = 267: 3ca8fef Merge branch 'busybox-w32'
267: c6386dd < -: ---------- mingw: really handle SIGINT
275: 16fda9e = 268: e3888f8 Add an issue template
270: f0d1f34 = 269: 6b0b599 Partially un-revert "editor: save and reset terminal after calling EDITOR"
268: 4aca5fb = 270: 4875366 Merge branch 'wsl-file-mode-bits'
271: 33bb708 < -: ---------- Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
276: 574fba0 = 271: af6ce96 Add a GitHub workflow to monitor component updates
279: 33ed3f5 = 272: 7b4adc9 Modify the GitHub Pull Request template (to reflect Git for Windows)
273: 62cf836 = 273: 5200a2f reset: reinstate support for the deprecated --stdin option
274: acded44 = 274: f2613c6 Merge branch 'un-revert-editor-save-and-reset'
277: 72d8da2 = 275: 1a9a00a fsmonitor: reintroduce core.useBuiltinFSMonitor
280: a8e18cb = 276: f06b6b4 dependabot: help keeping GitHub Actions versions up to date
282: b2a3553 = 277: 2b00461 SECURITY.md: document Git for Windows' policies
278: a6133ed = 278: 44ba82e Merge branch 'phase-out-reset-stdin'
281: 7ac6a40 = 279: e3e4f8f Merge branch 'deprecate-core.useBuiltinFSMonitor'
283: 3462022 = 280: 9a02bbf Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
284: d4bae5b = 281: 7e05206 Merge 'readme' into HEAD
285: 96bfb0b = 282: 7e69272 Add an AGENTS.md file to help with AI-assisted debugging/development
286: e2d7d8c = 283: 518984b 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: e1f900c = 284: e927405 ??? t5563: add tests for http.emptyAuth with Negotiate
288: 358788f = 285: 187c68b AGENTS.md: document
amend!, fixup-only PRs, and direct GfW PRs (AGENTS.md: documentamend!, fixup-only PRs, and direct GfW PRs git#6232)289: 9d6fbad = 286: 8346b46 amend! mingw: use mimalloc
290: 50fec40 = 287: 6c95bfd fixup! mimalloc: offer a build-time option to enable it
291: 92ba4df = 288: 0a7d915 fixup! mimalloc: adjust for building inside Git
292: 7f14b07 = 289: 9b5d261 fixup! Import the source code of mimalloc v2.2.7
293: 13a9853 = 290: 1449fe5 fixup! git-compat-util: avoid redeclaring _DEFAULT_SOURCE
294: c065c63 = 291: cfc088c fixup! win32/pthread: avoid name clashes with winpthread
295: cb4c538 = 292: 62ba118 Drop mimalloc (Drop mimalloc git#6231)
-: ---------- > 293: 509a691 add: enable FSCache around
repo_read_index_preload()(add: enable FSCache aroundrepo_read_index_preload()git#6216)-: ---------- > 294: a3bc6db entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)