Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#25273655713)#147
Open
gitforwindowshelper[bot] wants to merge 302 commits intobase/shears/seen-25273655713from
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#25273655713)#147gitforwindowshelper[bot] wants to merge 302 commits intobase/shears/seen-25273655713from
gitforwindowshelper[bot] wants to merge 302 commits intobase/shears/seen-25273655713from
Conversation
As reported in newren/git-filter-repo#225, it looks like 99 bytes is not really sufficient to represent e.g. the full path to Python when installed via Windows Store (and this path is used in the hasb bang line when installing scripts via `pip`). Let's increase it to what is probably the maximum sensible path size: MAX_PATH. This makes `parse_interpreter()` in line with what `lookup_prog()` handles. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Vilius Šumskas <vilius@sumskas.eu>
We used to have that `make vcxproj` hack, but a hack it is. In the meantime, we have a much cleaner solution: using CMake, either explicitly, or even more conveniently via Visual Studio's built-in CMake support (simply open Git's top-level directory via File>Open>Folder...). Let's let the `README` reflect this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This adds support for a new http.sslAutoClientCert config value. In cURL 7.77 or later the schannel backend does not automatically send client certificates from the Windows Certificate Store anymore. This config value is only used if http.sslBackend is set to "schannel", and can be used to opt in to the old behavior and force cURL to send client certificates. This fixes git-for-windows#3292 Signed-off-by: Pascal Muller <pascalmuller@gmail.com>
Because `git subtree` (unlike most other `contrib` modules) is included as part of the standard release of Git for Windows, its stability should be verified as consistently as it is for the rest of git. By including the `git subtree` tests in the CI workflow, these tests are as much of a gate to merging and indicator of stability as the standard test suite. Signed-off-by: Victoria Dye <vdye@github.com>
Ensure key CMake option values are part of the CMake output to facilitate user support when tool updates impact the wider CMake actions, particularly ongoing 'improvements' in Visual Studio. These CMake displays perform the same function as the build-options.txt provided in the main Git for Windows. CMake is already chatty. The setting of CMAKE_EXPORT_COMPILE_COMMANDS is also reported. Include the environment's CMAKE_EXPORT_COMPILE_COMMANDS value which may have been propogated to CMake's internal value. Testing the CMAKE_EXPORT_COMPILE_COMMANDS processing can be difficult in the Visual Studio environment, as it may be cached in many places. The 'environment' may include the OS, the user shell, CMake's own environment, along with the Visual Studio presets and caches. See previous commit for arefacts that need removing for a clean test. Signed-off-by: Philip Oakley <philipoakley@iee.email>
To verify that the `clean` side of the `clean`/`smudge` filter code is correct with regards to LLP64 (read: to ensure that `size_t` is used instead of `unsigned long`), here is a test case using a trivial filter, specifically _not_ writing anything to the object store to limit the scope of the test case. As in previous commits, the `big` file from previous test cases is reused if available, to save setup time, otherwise re-generated. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is no longer true in general, not with supporting Clang out of the box. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Start work on a new 'git survey' command to scan the repository for monorepo performance and scaling problems. The goal is to measure the various known "dimensions of scale" and serve as a foundation for adding additional measurements as we learn more about Git monorepo scaling problems. The initial goal is to complement the scanning and analysis performed by the GO-based 'git-sizer' (https://github.com/github/git-sizer) tool. It is hoped that by creating a builtin command, we may be able to take advantage of internal Git data structures and code that is not accessible from GO to gain further insight into potential scaling problems. Co-authored-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib` rather than `libexpat.lib`. It appears that the `vcpkg` package for "libexpat" has changed and now creates `libexpatd.lib` for debug mode builds. Previously, both debug and release builds created a ".lib" with the same basename. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
By default we will scan all references in "refs/heads/", "refs/tags/" and "refs/remotes/". Add command line opts let the use ask for all refs or a subset of them and to include a detached HEAD. Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
In bf2d5d8 (Don't let ld strip relocations, 2016-01-16) (picked from git-for-windows@6a237925bf10), Git for Windows introduced the `-Wl,-pic-executable` flag, specifying the exact entry point via `-e`. This required discerning between i686 and x86_64 code because the former required the symbol to be prefixed with an underscore, the latter did not. As per https://sourceware.org/bugzilla/show_bug.cgi?id=10865, the specified symbols are already the default, though. So let's drop the overly-specific definition. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
When 'git survey' provides information to the user, this will be presented in one of two formats: plaintext and JSON. The JSON implementation will be delayed until the functionality is complete for the plaintext format. The most important parts of the plaintext format are headers specifying the different sections of the report and tables providing concreted data. Create a custom table data structure that allows specifying a list of strings for the row values. When printing the table, check each column for the maximum width so we can create a table of the correct size from the start. The table structure is designed to be flexible to the different kinds of output that will be implemented in future changes. Signed-off-by: Derrick Stolee <stolee@gmail.com>
MSYS2 already defines a couple of helpful environment variables, and we can use those to infer the installation location as well as the CPU. No need for hard-coding ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Create a wrapper for the Windows Resource Compiler (RC.EXE) for use by the MSVC=1 builds. This is similar to the CL.EXE and LIB.EXE wrappers used for the MSVC=1 builds. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
At the moment, nothing is obvious about the reason for the use of the
path-walk API, but this will become more prevelant in future iterations. For
now, use the path-walk API to sum up the counts of each kind of object.
For example, this is the reachable object summary output for my local repo:
REACHABLE OBJECT SUMMARY
========================
Object Type | Count
------------+-------
Tags | 1343
Commits | 179344
Trees | 314350
Blobs | 184030
Signed-off-by: Derrick Stolee <stolee@gmail.com>
The tell-tale is the presence of the `MSYSTEM` value while compiling, of course. In that case, we want to ensure that `MSYSTEM` is set when running `git.exe`, and also enable the magic MSYS2 tty detection. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Teach MSVC=1 builds to depend on the `git.rc` file so that the resulting executables have Windows-style resources and version number information within them. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This compile-time option allows to ask Git to load libcurl dynamically at runtime. Together with a follow-up patch that optionally overrides the file name depending on the `http.sslBackend` setting, this kicks open the door for installing multiple libcurl flavors side by side, and load the one corresponding to the (runtime-)configured SSL/TLS backend. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Now that we have explored objects by count, we can expand that a bit more to summarize the data for the on-disk and inflated size of those objects. This information is helpful for diagnosing both why disk space (and perhaps clone or fetch times) is growing but also why certain operations are slow because the inflated size of the abstract objects that must be processed is so large. Note: zlib-ng is slightly more efficient even at those small sizes. Even between zlib versions, there are slight differences in compression. To accommodate for that in the tests, not the exact numbers but some rough approximations are validated (the test should validate `git survey`, after all, not zlib). Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Special-casing even more configurations simply does not make sense. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Getting started contributing to Git can be difficult on a Windows machine. CONTRIBUTING.md contains a guide to getting started, including detailed steps for setting up build tools, running tests, and submitting patches to upstream. [includes an example by Pratik Karki how to submit v2, v3, v4, etc.] Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Handle Ctrl+C in Git Bash nicely Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and Philip Oakley. Helped-by: Clive Chan <cc@clive.io> Helped-by: Adric Norris <landstander668@gmail.com> Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com> Helped-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Brendan Forster <brendan@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
In this time and age, AI is everywhere. However, it's sometimes not very easy to use. For green-field projects it works quite a bit better than for existing legacy projects. And Git's source code is _quite_ as legacy code as they come... 😁 Now, the only way how AI can be used efficiently with legacy code is by providing enough information by way of prompt context for the AI to have a chance to make any sense of the code. The structure and the architecture is, after all, not designed for AI, but rather the opposite: By virtue of having grown organically over two decades, there is no design that AI coding models would readily grasp. So here is a document that describes all kinds of aspects about this project. The idea is to help AI by providing information that it does not have ingrained in its weights. The idea is to provide information that a human prompter might take for granted, but no coding model will have been trained on specifically. Assisted-by: Claude Opus 4.5 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…opment This adds an extensive section about resolving merge conflicts during rebases, which happens quite often in Git for Windows' day-to-day. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…opment AGENTS.md: add upstream contribution and worktree guidance Add sections covering the GitGitGadget workflow for contributing to upstream Git, commit message conventions specific to the upstream project, how to manage patch series with dependencies (branch thickets), effective worktree usage including --update-refs for history rewrites, and techniques for analyzing merge-structured topic branches with git replay. These learnings come from a session contributing the safe.bareRepository test preparation patches via GitGitGadget. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Assisted-by: Claude Opus 4.6
…opment AGENTS.md: document rebase, staging, and log -L tricks for AI agents Add practical recipes for three workflows that are particularly useful when AI agents work with Git: Non-interactive "interactive" rebases using `sed -i 1ib` as a sequence editor to insert a `break` command, then editing the todo file directly via the path from `git rev-parse --git-path rebase-merge/git-rebase-todo`. This avoids the impossible task of driving an interactive editor from an AI agent. Scripted hunk staging via `printf '%s\n' s y q | git add -p`, which feeds predictable keystrokes to the add-patch protocol to stage individual hunks without human interaction. The `git log -L <start>,+<count>:<file>` trick for finding which commit last touched specific lines, enabling an `hg absorb`-like workflow where the agent can identify the right fixup! target surgically rather than grepping through full diffs. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Assisted-by: Claude Opus 4.6
…opment AGENTS.md: add pre-commit checklist for lint checks Bundle the existing ASCII-only, 80-column, and whitespace validation recipes into a "pre-commit checklist" block that agents should run before every commit. The individual recipes already existed in the Coding Conventions section but were presented as reference material rather than as an actionable workflow step. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Assisted-by: Claude Opus 4.6
…opment AGENTS: document learnings from split-index + fsmonitor investigation While investigating a CI failure in the `linux-TEST-vars` job caused by the interaction between the `pt/fsmonitor-linux` and `hn/git-checkout-m-with-stash` topics in `seen`, several debugging techniques proved essential and were not previously documented. The investigation required bisecting the first-parent history of `seen` while temporarily merging the fsmonitor topic at each step. This revealed that `GIT_TEST_SPLIT_INDEX=yes` corrupts the bisect machinery's own index operations unless it is unset before cleanup checkouts. It also revealed that `fprintf(stderr, ...)` instrumentation in Git's C code is swallowed by the test framework, making Trace2 the correct instrumentation approach. A key insight was that the bug appeared Linux-specific only because `linux-TEST-vars` is the sole CI job setting `GIT_TEST_SPLIT_INDEX=yes`; there is no macOS or Windows equivalent. The actual root cause (the `index.skipHash=true` + split-index interaction producing a null `base_oid` in the shared index) is platform-independent. Add four documentation sections capturing these learnings: bisecting `seen` interactions, reproducing with exact CI variables, verifying CI platform coverage before concluding platform-specificity, and using Trace2 for instrumentation inside the test framework. Assisted-by: Claude Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This was marked as a temporary work-around in 4538ee6 (ci: work around a problem with HTTP/2 vs libcurl v8.10.0 (git-for-windows#5165), 2024-09-24), to help CI builds pass even on macOS. The faulty libcurl version has hence been replaced with plenty of fixed ones, therefore this work-around is no longer necessary. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…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).
This was a preparatory commit for the path-walk API, which has since been upstreamed into v2.54.0. During the merging-rebase, the code changes this commit introduced were already present in the new base, leaving it empty. Drop it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
Over time, as upstream Git absorbs fixes and features that originated in or were carried by Git for Windows, downstream patches accumulate that are no longer needed. The steady stream of merged PRs makes this virtually inevitable. This PR collects fixup! commits to drop three such patches during the next autosquash rebase. The HTTP/2 workaround in `t5551` was a temporary fix for a libcurl v8.10.0 regression on macOS CI runners. The faulty libcurl has long been superseded by fixed versions, making it unnecessary. The `unix-socket: avoid leak when initialization fails` patch changed `return -1` to `goto fail` in `unix_stream_connect()` so cleanup would run when `unix_sockaddr_init()` failed. Upstream fixed the same leak more surgically in c5fe29f (unix-socket: fix memory leak when chdir(3p) fails, 2025-01-30) by having `unix_sockaddr_init()` call `FREE_AND_NULL(ctx->orig_dir)` before returning, making the downstream caller-side fix redundant. The `revision: create mark_trees_uninteresting_dense()` commit was a preparatory patch for the path-walk API. That API has since been upstreamed, and this commit became empty during the merging-rebase because its changes were already in the new base.
…s#6215) This PR is a companion of gitgitgadget#2103. On Windows, `maintenance_task_geometric_repack()` opens pack index files via `pack_geometry_init()` (which `mmap()`s the `.idx` files), then spawns `git repack` as a child process without setting `child.odb_to_close`. The parent's `mmap()`s prevent the child from deleting old `.idx` files. On Windows 10 builds before the POSIX delete semantics change (between Build 17134.1304 and 18363.657, see https://stackoverflow.com/a/60512798), this results in `Unlink of file '.git/objects/pack/pack-<hash>.idx' failed. Should I try again?` during fetch-triggered auto-maintenance with the geometric strategy. The fix adds the missing `child.odb_to_close = the_repository->objects` line, matching all other maintenance tasks. The first commit introduces a `GIT_TEST_LEGACY_DELETE` environment variable to simulate legacy (pre-POSIX) delete semantics on modern Windows, so the regression test can verify the fix even on Windows 11. This fixes git-for-windows#6210. Tested-by: Patryk Miś <foss@patrykmis.com>
…erver Bump actions/checkout from v5 to v6 and git-for-windows/setup-git-for-windows-sdk from v1 to v2. Both bumps are Node.js 20 to Node.js 24 runtime migrations with no functional changes to the actions themselves. checkout v6 moves persisted credentials to `` instead of `.git/config`, which does not affect this workflow since no subsequent steps rely on the credential location. The setup-sdk v2 provisions the same minimal SDK as v1. Risk: very low. The only precondition is a recent Actions Runner, which github.com-hosted runners already satisfy. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…windows#6220) This includes gitgitgadget#2097 and a `fixup!` for a workflow that is not upstream (Nano Server).
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: 66e384bfa5 (Update GitHub Actions versions used in the GitHub workflows (git-for-windows#6220), 2026-04-30) (08d15c73da..66e384bfa5)
Dropped (empty after resolution): 2c30ad8640 (Merge branch 'pr-2097', 2026-04-29)
resolved checkout@v5 vs v6 conflicts by keeping HEAD's v6 in both locations
To: 3bd2171464 (Update GitHub Actions versions used in the GitHub workflows (git-for-windows#6220), 2026-04-30) (ee6e578309..3bd2171464)
Statistics
Range-diff (click to expand)
1: fea4616 = 1: f65514d ci(dockerized): reduce the PID limit for private repositories
2: 1edbe1e = 2: f1d0086 mingw: skip symlink type auto-detection for network share targets
3: 4594b77 = 3: b9fbf4a Merge branch 'fix-ci'
4: b4c4f4d = 4: 6b44128 unix-socket: avoid leak when initialization fails
5: ec95f91 = 5: d899f9d Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: c2a4c44 = 6: c4bbdff grep: prevent
^$false match at end of file7: 83952a8 = 7: 20584a0 Merge branch 'v2.53.0.windows.3'
8: 89e77e6 = 8: 3ee7cdb Merge branch 'fixes-from-the-git-mailing-list'
16: 1871f93 = 9: ee8c005 vcpkg_install: detect lack of Git
17: 0d663bd = 10: b0edaa8 vcpkg_install: add comment regarding slow network connections
18: a8f782e = 11: 4ce039a vcbuild: install ARM64 dependencies when building ARM64 binaries
19: aca0b59 = 12: 1b27649 vcbuild: add an option to install individual 'features'
20: 20c5135 = 13: d8e54a3 cmake: allow building for Windows/ARM64
21: 4c51d85 = 14: 212f79c mingw: include the Python parts in the build
22: ca41e25 = 15: 2278ad2 ci(vs-build) also build Windows/ARM64 artifacts
23: 9742935 = 16: e4fb347 win32/pthread: avoid name clashes with winpthread
24: eaf600c = 17: 8bfb3c7 Add schannel to curl installation
25: 87c8944 = 18: 0651517 hash-object: demonstrate a >4GB/LLP64 problem
26: 1e53c95 = 19: b0867e1 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
27: bff540c = 20: 321a1fb cmake(): allow setting HOST_CPU for cross-compilation
28: d726289 = 21: ce160fb object-file.c: use size_t for header lengths
29: d7bcbb4 = 22: 0dbe12c Import the source code of mimalloc v2.2.7
9: 0ba73bc = 23: 3f9b144 t9350: point out that refs are not updated correctly
30: 7893e4e = 24: 5fad1c0 CMake: default Visual Studio generator has changed
31: 03f06e3 = 25: 0edd1e3 hash algorithms: use size_t for section lengths
32: 60298a0 = 26: c1a470d mimalloc: adjust for building inside Git
10: 3fa194f = 27: 707e3d2 transport-helper: add trailing --
33: df15775 = 28: 1784841 mingw: demonstrate a
git addissue with NTFS junctions34: 7537700 = 29: 7b1445d .gitignore: add Visual Studio CMakeSetting.json file
35: 14f3f91 = 30: 3580dd5 hash-object --stdin: verify that it works with >4GB/LLP64
36: daf8706 = 31: b655f2b mimalloc: offer a build-time option to enable it
37: a1bb95b = 32: 29bfc54 t5505/t5516: allow running without
.git/branches/in the templates11: 809df8a = 33: d10582c remote-helper: check helper status after import/export
12: 227441a = 34: 36591de clean: do not traverse mount points
38: 51d25f1 = 35: 8bddb5c strbuf_realpath(): use platform-dependent API if available
39: be924f6 = 36: ea0a6fd http: use new "best effort" strategy for Secure Channel revoke checking
40: 93f35e1 = 37: 6df2f58 subtree: update
contrib/subtreetesttarget41: 039199d = 38: 8a61232 CMakeLists: add default "x64-windows" arch for Visual Studio
42: a937b1e = 39: 4a2f479 hash-object: add another >4GB/LLP64 test case
45: c22f755 = 40: 2fc5be1 mingw: use mimalloc
46: 067b9c0 = 41: e1846f7 t5505/t5516: fix white-space around redirectors
13: 18fd6b3 = 42: 8d65775 Always auto-gc after calling a fast-import transport
14: c761e62 = 43: 83ad2cf mingw: prevent regressions with "drive-less" absolute paths
15: f0861f4 = 44: 4de327e clean: remove mount points when possible
48: 8aad95d = 45: 78e95c5 transport: optionally disable side-band-64k
49: 66eb480 = 46: c241c43 mingw: fix fatal error working on mapped network drives on Windows
50: 2700d63 = 47: 9926b35 clink.pl: fix MSVC compile script to handle libcurl-d.lib
51: 9c2d89c = 48: c5ce4f9 mingw: implement a platform-specific
strbuf_realpath()52: 4f5888c = 49: b15e822 t3701: verify that we can add lots of files interactively
53: 97d7dbb = 50: 7c54322 commit: accept "scissors" with CR/LF line endings
54: a9b1566 = 51: 2eae361 t0014: fix indentation
55: 5c6635b = 52: 900a931 git-gui: accommodate for intent-to-add files
56: f872ab5 = 53: b32ce63 mingw: allow for longer paths in
parse_interpreter()57: fdd9904 = 54: 3346194 compat/vcbuild: document preferred way to build in Visual Studio
58: e849803 = 55: 6ef23cd http: optionally send SSL client certificate
59: 986f41c = 56: a5c01c4 ci: run
contrib/subtreetests in CI builds60: cbadf16 = 57: 179807d CMake: show Win32 and Generator_platform build-option values
61: 51d253c = 58: 74fa844 hash-object: add a >4GB/LLP64 test case using filtered input
68: 3e9f29a = 59: 31091c1 windows: skip linking
git-<command>for built-ins69: 28dcb47 = 60: 0deeb68 mingw: stop hard-coding
CC = gcc70: e053793 = 61: 2dabc1c mingw: drop the -D_USE_32BIT_TIME_T option
71: 9d31cbe = 62: 51826dc mingw: only use -Wl,--large-address-aware for 32-bit builds
72: a66d05f = 63: 8582d26 mingw: avoid over-specifying
--pic-executable73: 889cf17 = 64: 9ac2669 mingw: set the prefix and HOST_CPU as per MSYS2's settings
74: 95cedd1 = 65: 6a3a16d mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
75: 5d0864d = 66: b405542 mingw: rely on MSYS2's metadata instead of hard-coding it
76: 390948c = 67: 373bb38 mingw: always define
ETC_*for MSYS2 environments77: 31d74de = 68: edc2762 max_tree_depth: lower it for clang builds in general on Windows
78: 192eefc = 69: 6ab44ec mingw: ensure valid CTYPE
80: 4366be9 = 70: 79f95c0 mingw: allow
git.exeto be used instead of the "Git wrapper"82: 5253e99 = 71: 4b5ff02 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
79: a4a8502 = 72: 475d5ec ci: work around a problem with HTTP/2 vs libcurl v8.10.0
84: d3fbb1d = 73: e408d53 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
81: 07786ef = 74: 6dc9bcd revision: create mark_trees_uninteresting_dense()
86: 81b9985 = 75: b4ab4e1 clink.pl: fix libexpatd.lib link error when using MSVC
83: ba51757 = 76: 6aa14bf survey: stub in new experimental 'git-survey' command
88: 28b9802 = 77: 46bab8f Makefile: clean up .ilk files when MSVC=1
85: bb3357a = 78: 96541c1 survey: add command line opts to select references
90: 7446ff9 = 79: c64a109 vcbuild: add support for compiling Windows resource files
87: 5b724ae = 80: 55b6465 survey: start pretty printing data in table form
92: 407ee70 = 81: afec8cd config.mak.uname: add git.rc to MSVC builds
47: c4ddd99 = 82: 7ec45c2 MinGW: link as terminal server aware
89: 07dc24f = 83: 73c4b79 survey: add object count summary
96: e12ea7f = 84: 4db17cc clink.pl: ignore no-stack-protector arg on MSVC=1 builds
97: 649cc20 = 85: dd69644 http: optionally load libcurl lazily
91: 75f81f2 = 86: 601b9c6 survey: summarize total sizes by object type
101: ee3d4cb = 87: 7d540b4 clink.pl: move default linker options for MSVC=1 builds
102: 4ff862b = 88: 9791b6b http: support lazy-loading libcurl also on Windows
93: 6c94901 = 89: 1039cca survey: show progress during object walk
43: b587c22 = 90: a027351 setup: properly use "%(prefix)/" when in WSL
44: 5269f79 = 91: 6c9c255 Add config option
windows.appendAtomically106: 990c064 = 92: 85c0199 cmake: install headless-git.
107: 766231b = 93: 2f67f6e http: when loading libcurl lazily, allow for multiple SSL backends
98: 5f00faf = 94: 7b1073d survey: add ability to track prioritized lists
62: bbc522e = 95: 1211ebf compat/mingw.c: do not warn when failing to get owner
63: 46143b2 = 96: 71f68c4 mingw: $env:TERM="xterm-256color" for newer OSes
64: 11ef565 = 97: 245499b winansi: check result and Buffer before using Name
65: ac6a06b = 98: fa7a40d mingw: change core.fsyncObjectFiles = 1 by default
66: 192bc92 = 99: b66d2d6 Fix Windows version resources
67: 1c41978 = 100: 89f1e99 status: fix for old-style submodules with commondir
111: 5850693 = 101: 8904795 git.rc: include winuser.h
112: 88ce879 = 102: 9e9b82d mingw: do load libcurl dynamically by default
113: ae530c5 = 103: 8f1e925 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
114: 52e63e6 = 104: 5e5d1e5 mingw: suggest
windows.appendAtomicallyin more cases115: 90cb7dd = 105: 85e640b win32: use native ANSI sequence processing, if possible
116: 07faef6 = 106: 61396b2 common-main.c: fflush stdout buffer upon exit
117: 773643c = 107: 990a1e7 t5601/t7406(mingw): do run tests with symlink support
118: bae9536 = 108: 1764e62 win32: ensure that
localtime_r()is declared even in i686 builds119: e3cfe50 = 109: 67ef69b Fallback to AppData if XDG_CONFIG_HOME is unset
120: c9f96ac = 110: 5d02154 run-command: be helpful with Git LFS fails on Windows 7
127: 98566ae = 111: fc5c982 Merge 'remote-hg-prerequisites' into HEAD
128: 460bb08 = 112: e4d494a Merge branch 'drive-prefix'
129: a436207 = 113: c070b40 Merge branch 'dont-clean-junctions'
130: 633051b = 114: 6c61c3a Merge branch 'msys2-python'
131: e966ed8 = 115: 0759be8 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
132: 918c661 = 116: 1e3acad Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
133: ef0dfa6 = 117: c77c995 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
134: cd6c221 = 118: b66c0a7 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
135: 646f06e = 119: 36f6e7e Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction136: c0a5ba9 = 120: bba73e3 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
137: 27612fe = 121: cc9a3fb Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
138: e9d0c62 = 122: 254379f Merge 'add-p-many-files'
139: 4277ad4 = 123: b8a651f Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
140: 811fb14 = 124: dd428bb Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
94: f6d3e9c = 125: d5cb6dc mingw: make sure
errnois set correctly when socket operations fail95: 53a8a91 = 126: 3b70b4b t5563: verify that NTLM authentication works
141: ad7ad92 = 127: 1bb9a81 Merge 'git-gui/js/intent-to-add'
99: 866c6c2 = 128: 0befc70 compat/mingw: handle WSA errors in strerror
100: da497f6 = 129: 3ef0440 http: disallow NTLM authentication by default
142: 7352df0 = 130: 5cb6d6e Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
103: 3a3e723 = 131: ee36fc9 survey: add report of "largest" paths
104: 83b3ed7 = 132: 2e5efc3 compat/mingw: drop outdated comment
105: 5dc623e = 133: 7ee31d4 http: warn if might have failed because of NTLM
143: b4d5ab8 = 134: 0f8e567 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
108: 5761be0 = 135: 4fe5724 survey: add --top= option and config
109: 401e367 = 136: e288295 t0301: actually test credential-cache on Windows
110: e73ed4f = 137: 411af4b credential: advertise NTLM suppression and allow helpers to re-enable
144: dc08089 = 138: a3f61a1 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
121: 3b86b0d = 139: c1083d5 survey: clearly note the experimental nature in the output
122: 085e383 = 140: c14d0aa credential-cache: handle ECONNREFUSED gracefully
123: 59a5241 = 141: e006e24 reftable: do make sure to use custom allocators
124: 1d56b54 = 142: ba3a705 check-whitespace: avoid alerts about upstream commits
125: 9e9ad8b = 143: 852f387 t/t5571-prep-push-hook.sh: Add test with writing to stderr
126: 4cf636a = 144: f7483b4 dir: do not traverse mount points
155: a8b44ab = 145: f4f19df win32: thread-utils: handle multi-socket systems
156: 75558ba = 146: 4fc4510 t5563: add tests for http.emptyAuth with Negotiate
145: 162c133 = 147: d68dc17 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path146: fbf40ec = 148: 8e0d16b 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: 447b4e4 = 149: e0abce3 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: cec3d05 = 150: 775d46f Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests149: 607d8cf = 151: d62bd74 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
150: 793886d = 152: 2c91b35 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t151: 20c2ce8 = 153: 879ab9f Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory152: b0f6e07 = 154: b506c9b Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
153: 76673f0 = 155: 6fdbfd4 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
154: 02ae0dc = 156: 84a0098 Merge branch 'optionally-dont-append-atomically-on-windows'
157: f65fc11 = 157: d2d6cde Merge branch 'fsync-object-files-always'
158: 19fec8c = 158: a024635 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
159: 150769e = 159: 92cf0c8 Fix Windows version resources (Fix Windows version resources git#4092)
160: 257e4f4 = 160: a49b8f0 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
161: e9f321d = 161: 05f94f3 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)162: 5adc862 = 162: d3257e4 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)163: b5cf7bb = 163: 5a05e28 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283164: 186acc6 = 164: 8108cdc Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
165: 1567674 = 165: 25d226a ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
166: b1d960b = 166: d23c6e0 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
167: b98e13f = 167: c94f73f Merge branch 'nano-server'
168: c21faa9 = 168: f06a5a3 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
169: 74c6cc4 = 169: 67bae2e win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
170: da1a7ac = 170: 42ea367 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
171: 66214ff = 171: ed75378 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
172: db7be16 = 172: e675cae Merge branch 'Fix-i686-build-with-GCC-v14'
173: 7c2bf5d = 173: f846a83 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
174: 4a1d138 = 174: 252e5a8 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
175: 8eb9a1b = 175: 8aa9af4 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
176: 37cd1b4 = 176: c990583 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
177: 22e3d9b = 177: 5d57439 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
178: a04d47f = 178: dfeb666 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
179: 7c6f8a4 = 179: f599386 Merge branch 'reftable-vs-custom-allocators'
180: 929a0e6 = 180: f27a658 Merge branch 'check-whitespace-only-downstream'
181: 4a90c97 = 181: a8307fb t/t5571-prep-push-hook.sh: Add test with writing to stderr (t/t5571-prep-push-hook.sh: Add test with writing to stderr git#6063)
182: bd0a985 = 182: 565ed1a Merge branch 'disallow-ntlm-auth-by-default'
183: e2803c7 = 183: e5a8012 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)184: 730e41b = 184: f9c94dd Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
185: 5d911a3 = 185: 783e07b http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
186: bec1c67 = 186: 2640ee3 Merge branch 'ready-for-upstream'
187: 9bc87ba = 187: 1609bb1 ci(macos): skip the
git p4tests188: 7d4fe15 = 188: ed3f726 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)190: f12f04c = 189: 58f169f Win32: make FILETIME conversion functions public
191: fc091a5 = 190: fdb458c Win32: dirent.c: Move opendir down
192: 50d8473 = 191: c024b0a mingw: make the dirent implementation pluggable
193: cf66bf8 = 192: 5ca486e Win32: make the lstat implementation pluggable
194: 2bd0477 = 193: a8f9abd mingw: add infrastructure for read-only file system level caches
195: 47005dd = 194: 85124b9 mingw: add a cache below mingw's lstat and dirent implementations
196: 5e4d02c = 195: 945555d fscache: load directories only once
197: c9a962d = 196: f699b23 fscache: add key for GIT_TRACE_FSCACHE
198: 2b98999 = 197: 7d4f52e fscache: remember not-found directories
199: 76918fb = 198: 5f9104d fscache: add a test for the dir-not-found optimization
200: 007817e = 199: aad7034 add: use preload-index and fscache for performance
201: 6ad0866 = 200: 89db7c2 dir.c: make add_excludes aware of fscache during status
202: 185f6d2 = 201: db6778c fscache: make fscache_enabled() public
203: c5013df = 202: 8bf921f dir.c: regression fix for add_excludes with fscache
204: 3593bc7 = 203: cd68324 fetch-pack.c: enable fscache for stats under .git/objects
189: bc19b93 = 204: cb1224d git-gui--askyesno: fix funny text wrapping
205: 2a294ea = 205: c8d0c35 checkout.c: enable fscache for checkout again
242: d80604e = 206: 78027fb git-gui--askyesno (mingw): use Git for Windows' icon, if available
206: cc30a21 = 207: f0af55d Enable the filesystem cache (fscache) in refresh_index().
245: 8a35816 = 208: ed38c95 Merge branch 'git-gui-askyesno'
207: 8002110 = 209: ef5b2e3 fscache: use FindFirstFileExW to avoid retrieving the short name
208: 4129906 = 210: b763a0b fscache: add GIT_TEST_FSCACHE support
209: cefa12d = 211: d56d028 fscache: add fscache hit statistics
210: 47eff31 = 212: 1d6b5dd unpack-trees: enable fscache for sparse-checkout
211: c2fb591 = 213: 37f714e status: disable and free fscache at the end of the status command
212: d52ccd3 = 214: 56a5418 mem_pool: add GIT_TRACE_MEMPOOL support
213: 3a0a73c = 215: f49c94f fscache: fscache takes an initial size
214: ab3c13f = 216: 4f4bab1 fscache: update fscache to be thread specific instead of global
215: 6ffd7ee = 217: 6cf5495 fscache: teach fscache to use mempool
216: cd9c5f6 = 218: b453371 fscache: make fscache_enable() thread safe
217: d12a70c = 219: 0e16599 fscache: teach fscache to use NtQueryDirectoryFile
218: cd3c598 = 220: 92b7f11 fscache: remember the reparse tag for each entry
219: f2d8d3f = 221: 6844e77 Merge branch 'fscache'
220: 7616aa3 = 222: 715fb4f fscache: implement an FSCache-aware is_mount_point()
221: 2002831 = 223: 4ff05bb Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
222: faa6230 = 224: f000323 clean: make use of FSCache
223: 8026167 = 225: 72acab3 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
224: 8765db0 = 226: 558e24f Merge branch 'dont-clean-junctions-fscache'
225: de85c70 = 227: 790a5df pack-objects (mingw): demonstrate a segmentation fault with large deltas
226: ea75610 ! 228: c6079fd mingw: support long paths
227: 4978f94 = 229: 71f544e win32(long path support): leave drive-less absolute paths intact
228: 1f21b9c = 230: 78a47bb compat/fsmonitor/fsm-*-win32: support long paths
229: dc238a9 = 231: 6b645bf clean: suggest using
core.longPathsif paths are too long to remove230: 1da388e = 232: 9a0218c mingw: Support
git_terminal_promptwith more terminals231: 472d25a = 233: cd88b55 compat/terminal.c: only use the Windows console if bash 'read -r' fails
232: 1bf8a02 = 234: d7d76cd mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
233: 33b0735 = 235: d45d79a Win32: symlink: move phantom symlink creation to a separate function
234: 822ced4 = 236: 9ec26e1 Introduce helper to create symlinks that knows about index_state
235: 7e7f61a = 237: 4421289 mingw: allow to specify the symlink type in .gitattributes
237: 1b23396 = 238: 9496458 Win32: symlink: add test for
symlinkattribute239: 1795496 = 239: cc97060 mingw: explicitly specify with which cmd to prefix the cmdline
241: 04bb6ed = 240: f27222f mingw: when path_lookup() failed, try BusyBox
244: 5ab8aef = 241: 6543c42 test-tool: learn to act as a drop-in replacement for
iconv247: 2ea6bc5 = 242: a967730 tests(mingw): if
iconvis unavailable, usetest-helper --iconv248: b91b3a2 = 243: f23c1c7 gitattributes: mark .png files as binary
249: af43afd = 244: 21ca277 tests: move test PNGs into t/lib-diff/
250: b51e21e = 245: 82ce39d tests: only override sort & find if there are usable ones in /usr/bin/
251: bd8111a = 246: 9c29847 tests: use the correct path separator with BusyBox
236: b60b9e0 = 247: 3826c6a mingw: introduce code to detect whether we're inside a Windows container
252: ca6d121 = 248: 08b8799 mingw: only use Bash-ism
builtin pwd -Wwhen available238: 40e1eb2 = 249: 04a0cc5 mingw: when running in a Windows container, try to rename() harder
253: 59e0647 = 250: c3cb56a tests (mingw): remove Bash-specific pwd option
240: d3e9d6b = 251: c0da64f mingw: move the file_attr_to_st_mode() function definition
254: 0d8294e = 252: e6b121f test-lib: add BUSYBOX prerequisite
243: 5917cf2 = 253: 346ab4e mingw: Windows Docker volumes are not symbolic links
256: 69e1ada = 254: a5f4a8e t5003: use binary file from t/lib-diff/
246: d8db7a2 = 255: e0c0e28 mingw: work around rename() failing on a read-only file
255: 8a58896 = 256: 51e8995 Merge branch 'gitk-and-git-gui-patches'
257: fa43016 = 257: ff0659e Merge branch 'long-paths'
258: 79a4485 = 258: df9de3c t5532: workaround for BusyBox on Windows
259: fe3cc91 = 259: f416311 Merge branch 'msys2'
260: cc21a3b = 260: 2402807 t5605: special-case hardlink test for BusyBox-w32
261: 217de80 = 261: 72e8f5a Merge 'docker-volumes-are-no-symlinks'
263: 912ca40 = 262: 45b7ac1 t5813: allow for $PWD to be a Windows path
264: df41273 = 263: 2dd9e41 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
266: d078580 = 264: 0fbf8d3 t9200: skip tests when $PWD contains a colon
267: f51a1bf = 265: bf2c23c Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
262: 5f18a94 = 266: 7a8d2f7 Describe Git for Windows' architecture
269: ec91e92 = 267: e6b8291 mingw: kill child processes in a gentler way
270: a8239fa = 268: 1e845ee mingw: optionally enable wsl compability file mode bits
271: 899be28 = 269: b4c68c2 Merge branch 'busybox-w32'
265: 068489f = 270: d801f7b Modify the Code of Conduct for Git for Windows
273: 05e7d11 = 271: fcdbb4e mingw: really handle SIGINT
274: a50b6e8 = 272: 702aa6a Merge branch 'wsl-file-mode-bits'
268: 18c39bb = 273: f012a35 CONTRIBUTING.md: add guide for first-time contributors
276: ae8a769 = 274: ba4bc7d Partially un-revert "editor: save and reset terminal after calling EDITOR"
277: 959aa35 = 275: 2190243 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
272: 3dda3ee = 276: 6f6ecea README.md: Add a Windows-specific preamble
280: 1bf210a = 277: 9c54474 reset: reinstate support for the deprecated --stdin option
281: 28a0635 = 278: 3fbf7fc Merge branch 'un-revert-editor-save-and-reset'
275: bf81f12 = 279: d6183ce Add an issue template
278: d47f0ba = 280: 7249591 Add a GitHub workflow to monitor component updates
282: 17a9372 = 281: 123dfa7 fsmonitor: reintroduce core.useBuiltinFSMonitor
285: 5c9c30d = 282: e3d6547 Merge branch 'phase-out-reset-stdin'
279: 187295e = 283: 4b5391d Modify the GitHub Pull Request template (to reflect Git for Windows)
283: 02fd9a8 = 284: 44e1d3d dependabot: help keeping GitHub Actions versions up to date
286: 5c6aabc = 285: 3b26056 Merge branch 'deprecate-core.useBuiltinFSMonitor'
284: 9d49daa = 286: a221f22 SECURITY.md: document Git for Windows' policies
287: f9272ab = 287: 3304ece Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
288: 99ec3dd = 288: d1a2bad Merge 'readme' into HEAD
289: 1a497f4 = 289: c4621df Add an AGENTS.md file to help with AI-assisted debugging/development
290: 4a207fa = 290: 10815da fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
291: bd85beb = 291: 080381f fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
292: 4f2c6a6 = 292: 5cbfda8 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
293: 976f777 = 293: bd1317f fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
294: fd47802 = 294: e1451b1 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
295: b5bc25f = 295: 0244e1d Add an AGENTS.md file to help with AI-assisted debugging/development (Add an AGENTS.md file to help with AI-assisted debugging/development git#6198)
296: 534e975 = 296: 37685cd ??? t5563: add tests for http.emptyAuth with Negotiate
297: 717bcc4 = 297: 7e542fc fixup! ci: work around a problem with HTTP/2 vs libcurl v8.10.0
298: d38ad5f = 298: 03fd252 fixup! revision: create mark_trees_uninteresting_dense()
299: b402c25 = 299: 53d2a7a Drop obsolete downstream patches (Drop obsolete downstream patches git#6208)
-: ---------- > 300: da657a7 maintenance(geometric): avoid deadlocks on Windows 10 (maintenance(geometric): avoid deadlocks on Windows 10 git#6215)
-: ---------- > 301: c59e5a2 fixup! Add a GitHub workflow to verify that Git/Scalar work in Nano Server
-: ---------- > 302: 3bd2171 Update GitHub Actions versions used in the GitHub workflows (Update GitHub Actions versions used in the GitHub workflows git#6220)