Rebase shears/main: 1 conflict(s) (1 skipped, 0 resolved) (#25723071296)#160
Open
gitforwindowshelper[bot] wants to merge 305 commits into
Open
Rebase shears/main: 1 conflict(s) (1 skipped, 0 resolved) (#25723071296)#160gitforwindowshelper[bot] wants to merge 305 commits into
gitforwindowshelper[bot] wants to merge 305 commits into
Conversation
This adds support for a new http.sslAutoClientCert config value. In cURL 7.77 or later the schannel backend does not automatically send client certificates from the Windows Certificate Store anymore. This config value is only used if http.sslBackend is set to "schannel", and can be used to opt in to the old behavior and force cURL to send client certificates. This fixes git-for-windows#3292 Signed-off-by: Pascal Muller <pascalmuller@gmail.com>
Because `git subtree` (unlike most other `contrib` modules) is included as part of the standard release of Git for Windows, its stability should be verified as consistently as it is for the rest of git. By including the `git subtree` tests in the CI workflow, these tests are as much of a gate to merging and indicator of stability as the standard test suite. Signed-off-by: Victoria Dye <vdye@github.com>
Ensure key CMake option values are part of the CMake output to facilitate user support when tool updates impact the wider CMake actions, particularly ongoing 'improvements' in Visual Studio. These CMake displays perform the same function as the build-options.txt provided in the main Git for Windows. CMake is already chatty. The setting of CMAKE_EXPORT_COMPILE_COMMANDS is also reported. Include the environment's CMAKE_EXPORT_COMPILE_COMMANDS value which may have been propogated to CMake's internal value. Testing the CMAKE_EXPORT_COMPILE_COMMANDS processing can be difficult in the Visual Studio environment, as it may be cached in many places. The 'environment' may include the OS, the user shell, CMake's own environment, along with the Visual Studio presets and caches. See previous commit for arefacts that need removing for a clean test. Signed-off-by: Philip Oakley <philipoakley@iee.email>
To verify that the `clean` side of the `clean`/`smudge` filter code is correct with regards to LLP64 (read: to ensure that `size_t` is used instead of `unsigned long`), here is a test case using a trivial filter, specifically _not_ writing anything to the object store to limit the scope of the test case. As in previous commits, the `big` file from previous test cases is reused if available, to save setup time, otherwise re-generated. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In the case of Git for Windows (say, in a Git Bash window) running in a Windows Subsystem for Linux (WSL) directory, the GetNamedSecurityInfoW() call in is_path_owned_By_current_side() returns an error code other than ERROR_SUCCESS. This is consistent behavior across this boundary. In these cases, the owner would always be different because the WSL owner is a different entity than the Windows user. The change here is to suppress the error message that looks like this: error: failed to get owner for '//wsl.localhost/...' (1) Before this change, this warning happens for every Git command, regardless of whether the directory is marked with safe.directory. Signed-off-by: Derrick Stolee <derrickstolee@github.com>
For Windows builds >= 15063 set $env:TERM to "xterm-256color" instead of "cygwin" because they have a more capable console system that supports this. Also set $env:COLORTERM="truecolor" if unset. $env:TERM is initialized so that ANSI colors in color.c work, see 29a3963 (Win32: patch Windows environment on startup, 2012-01-15). See git-for-windows#3629 regarding problems caused by always setting $env:TERM="cygwin". This is the same heuristic used by the Cygwin runtime. Signed-off-by: Rafael Kitover <rkitover@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NtQueryObject under Wine can return a success but fill out no name. In those situations, Wine will set Buffer to NULL, and set result to the sizeof(OBJECT_NAME_INFORMATION). Running a command such as echo "$(git.exe --version 2>/dev/null)" will crash due to a NULL pointer dereference when the code attempts to null terminate the buffer, although, weirdly, removing the subshell or redirecting stdout to a file will not trigger the crash. Code has been added to also check Buffer and Length to ensure the check is as robust as possible due to the current behavior being fragile at best, and could potentially change in the future This code is based on the behavior of NtQueryObject under wine and reactos. Signed-off-by: Christopher Degawa <ccom@randomderp.com>
Start work on a new 'git survey' command to scan the repository for monorepo performance and scaling problems. The goal is to measure the various known "dimensions of scale" and serve as a foundation for adding additional measurements as we learn more about Git monorepo scaling problems. The initial goal is to complement the scanning and analysis performed by the GO-based 'git-sizer' (https://github.com/github/git-sizer) tool. It is hoped that by creating a builtin command, we may be able to take advantage of internal Git data structures and code that is not accessible from GO to gain further insight into potential scaling problems. Co-authored-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
This is no longer true in general, not with supporting Clang out of the box. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
By default we will scan all references in "refs/heads/", "refs/tags/" and "refs/remotes/". Add command line opts let the use ask for all refs or a subset of them and to include a detached HEAD. Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When 'git survey' provides information to the user, this will be presented in one of two formats: plaintext and JSON. The JSON implementation will be delayed until the functionality is complete for the plaintext format. The most important parts of the plaintext format are headers specifying the different sections of the report and tables providing concreted data. Create a custom table data structure that allows specifying a list of strings for the row values. When printing the table, check each column for the maximum width so we can create a table of the correct size from the start. The table structure is designed to be flexible to the different kinds of output that will be implemented in future changes. Signed-off-by: Derrick Stolee <stolee@gmail.com>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib` rather than `libexpat.lib`. It appears that the `vcpkg` package for "libexpat" has changed and now creates `libexpatd.lib` for debug mode builds. Previously, both debug and release builds created a ".lib" with the same basename. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
At the moment, nothing is obvious about the reason for the use of the
path-walk API, but this will become more prevelant in future iterations. For
now, use the path-walk API to sum up the counts of each kind of object.
For example, this is the reachable object summary output for my local repo:
REACHABLE OBJECT SUMMARY
========================
Object Type | Count
------------+-------
Tags | 1343
Commits | 179344
Trees | 314350
Blobs | 184030
Signed-off-by: Derrick Stolee <stolee@gmail.com>
In bf2d5d8 (Don't let ld strip relocations, 2016-01-16) (picked from git-for-windows@6a237925bf10), Git for Windows introduced the `-Wl,-pic-executable` flag, specifying the exact entry point via `-e`. This required discerning between i686 and x86_64 code because the former required the symbol to be prefixed with an underscore, the latter did not. As per https://sourceware.org/bugzilla/show_bug.cgi?id=10865, the specified symbols are already the default, though. So let's drop the overly-specific definition. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Now that we have explored objects by count, we can expand that a bit more to summarize the data for the on-disk and inflated size of those objects. This information is helpful for diagnosing both why disk space (and perhaps clone or fetch times) is growing but also why certain operations are slow because the inflated size of the abstract objects that must be processed is so large. Note: zlib-ng is slightly more efficient even at those small sizes. Even between zlib versions, there are slight differences in compression. To accommodate for that in the tests, not the exact numbers but some rough approximations are validated (the test should validate `git survey`, after all, not zlib). Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 already defines a couple of helpful environment variables, and we can use those to infer the installation location as well as the CPU. No need for hard-coding ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Create a wrapper for the Windows Resource Compiler (RC.EXE) for use by the MSVC=1 builds. This is similar to the CL.EXE and LIB.EXE wrappers used for the MSVC=1 builds. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
The tell-tale is the presence of the `MSYSTEM` value while compiling, of course. In that case, we want to ensure that `MSYSTEM` is set when running `git.exe`, and also enable the magic MSYS2 tty detection. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
In future changes, we will make use of these methods. The intention is to keep track of the top contributors according to some metric. We don't want to store all of the entries and do a sort at the end, so track a constant-size table and remove rows that get pushed out depending on the chosen sorting algorithm. Co-authored-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by; Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
The winsock2 library provides functions that work on different data types than file descriptors, therefore we wrap them. But that is not the only difference: they also do not set `errno` but expect the callers to enquire about errors via `WSAGetLastError()`. Let's translate that into appropriate `errno` values whenever the socket operations fail so that Git's code base does not have to change its expectations. This closes git-for-windows#2404 Helped-by: Jeff Hostetler <jeffhost@microsoft.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>
…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
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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
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>
…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>
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>
…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).
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.
This corresponds to gitgitgadget#2097.
…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).
When building with `make DEVELOPER=1` we explicitly pass "-std=gnu99" to
the compiler so that we don't start leaning on features exposed by more
recent versions of the C standard. Unfortunately though, glibc 2.43
started to use type-generic expressions. This works alright with GCC,
but when compiling with Clang this leads to errors:
$ make DEVELOPER=1 CC=clang
CC daemon.o
In file included from daemon.c:3:
./git-compat-util.h:344:11: error: '_Generic' is a C11 extension [-Werror,-Wc11-extensions]
344 | return !!strchr(path, '/');
| ^
/usr/include/string.h:265:3: note: expanded from macro 'strchr'
265 | __glibc_const_generic (S, const char *, strchr (S, C))
| ^
/usr/include/x86_64-linux-gnu/sys/cdefs.h:838:3: note: expanded from macro '__glibc_const_generic'
838 | _Generic (0 ? (PTR) : (void *) 1, \
| ^
In theory, the `__glibc_const_generic` macro does have feature gating:
#if !defined __cplusplus \
&& (__GNUC_PREREQ (4, 9) \
|| __glibc_has_extension (c_generic_selections) \
|| (!defined __GNUC__ && defined __STDC_VERSION__ \
&& __STDC_VERSION__ >= 201112L))
# define __HAVE_GENERIC_SELECTION 1
#else
# define __HAVE_GENERIC_SELECTION 0
#endif
But this feature gating isn't effective because `_has_extension()` will
always evaluate to true as C generics _are_ available as a language
extension to GNU C99 when using Clang. This would have been different if
`_has_feature()` was used instead, in which case it would have properly
evaluated to `false`.
Unfortunately, there is no easy way for us to work around the warning.
We cannot define `__HAVE_GENERIC_SELECTION` ourselves as that would lead
to a redefinition, and given that the conditions are or'd together we
cannot disable any of those, either.
Instead, work around the issue by not using -std=gnu99 with Clang when
using the Makefile and by disabling warnings about C11 extensions when
using Meson. This isn't ideal, but we at least retain the ability to
detect the (mis-)use of features from newer standards with GCC.
An alternative to this might be to simply bump the required C standard
to C11, which is 15 years old by now and should have support on most
platforms out there. But some more esoteric platforms may not have it.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…indows#6233) The `linux-{asan-ubsan,sha256,reftable}` jobs run inside `ubuntu:rolling`, which now resolves to Ubuntu 26.04 with glibc 2.43; that pulls `_Generic` into `<sys/cdefs.h>` and breaks our `-std=gnu99 -Werror` Clang builds. Concrete failure: https://github.com/git-for-windows/git/actions/runs/25390480083/job/74463338845. Picking up Patrick Steinhardt's fix from https://lore.kernel.org/git/20260505-b4-pks-ci-tolerate-glibc-generic-v1-1-5786386fe512@pks.im/ ahead of its upstream merge so the GfW CI goes green again. The diff conflicts with `fe5704a3695c "mimalloc: offer a build-time option to enable it"`, which wraps the affected `config.mak.dev` block in `ifndef USE_MIMALLOC`; the resolution preserves that wrap on the `gcc6`-only branch surviving Patrick's patch. `meson.build` auto-merged.
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: main
From: 21605f84e5 (build: tolerate use of _Generic from glibc 2.43 with Clang (git-for-windows#6233), 2026-05-08) (490df90c57..21605f84e5)
Skipped: c7c5a7e (maintenance(geometric): avoid deadlocks on Windows 10 (git-for-windows#6215), 2026-04-28)
Upstream equivalent: 69ed0e3 (mingw: optionally use legacy (non-POSIX) delete semantics, 2026-05-07)
Range-diff
1: c7c5a7e ! 1: 69ed0e3 maintenance(geometric): avoid deadlocks on Windows 10 (maintenance(geometric): avoid deadlocks on Windows 10 git#6215)
To: eaf875556a (build: tolerate use of _Generic from glibc 2.43 with Clang (git-for-windows#6233), 2026-05-08) (a547727dca..eaf875556a)
Statistics
Range-diff (click to expand)
1: a1d7eaf = 1: 7acca21 ci(dockerized): reduce the PID limit for private repositories
2: 8a3f24f = 2: cbc5286 mingw: skip symlink type auto-detection for network share targets
3: 5bdabe7 = 3: f3b1534 Merge branch 'fix-ci'
4: 53cfa0f = 4: 4ce5fe2 unix-socket: avoid leak when initialization fails
5: 6b61144 = 5: c8e5088 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: a4e800b = 6: e7a4168 grep: prevent
^$false match at end of file7: 9bf9c2d = 7: 3431b46 Merge branch 'v2.53.0.windows.3'
8: 084c402 = 8: 37fb3be Merge branch 'fixes-from-the-git-mailing-list'
18: 586c803 = 9: d35ed04 t9350: point out that refs are not updated correctly
21: 96f6a89 = 10: f5ddddc transport-helper: add trailing --
26: 905b736 = 11: 26738c7 remote-helper: check helper status after import/export
33: 17d11c0 = 12: 16ce771 Always auto-gc after calling a fast-import transport
9: cf947fc = 13: e181225 vcpkg_install: detect lack of Git
11: 8349b88 = 14: 15d7f8f vcpkg_install: add comment regarding slow network connections
13: 91f6212 = 15: fe5f864 vcbuild: install ARM64 dependencies when building ARM64 binaries
15: 45ae49c = 16: 18cd98c vcbuild: add an option to install individual 'features'
17: 33302d7 = 17: ebe1241 cmake: allow building for Windows/ARM64
10: 8bd2e55 = 18: 96c14ad mingw: include the Python parts in the build
20: 2805865 ! 19: e571152 ci(vs-build) also build Windows/ARM64 artifacts
@@ .github/workflows/main.yml: jobs: + group: vs-build-${{ github.ref }}-${{ matrix.arch }} cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 @@ .github/workflows/main.yml: jobs: - uses: microsoft/setup-msbuild@v2 + uses: microsoft/setup-msbuild@v3 - name: copy dlls to root shell: cmd - run: compat�cbuild�cpkg_copy_dlls.bat release @@ .github/workflows/main.yml: jobs: env: @@ .github/workflows/main.yml: jobs: - name: upload tracked files and build artifacts - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v7 with: - name: vs-artifacts + name: vs-artifacts-${{ matrix.arch }} @@ .github/workflows/main.yml: jobs: name: win+VS test @@ .github/workflows/main.yml: jobs: - name: download tracked files and build artifacts - uses: actions/download-artifact@v6 + uses: actions/download-artifact@v8 with: - name: vs-artifacts + name: vs-artifacts-x6412: 57d55ad = 20: 292bdaa win32/pthread: avoid name clashes with winpthread
25: 774f48a = 21: d8a43a5 Add schannel to curl installation
62: 6dc1c1a = 22: ed21cdd hash-object: demonstrate a >4GB/LLP64 problem
14: bd0a39e = 23: 8b033ef git-compat-util: avoid redeclaring _DEFAULT_SOURCE
31: db403a7 = 24: 1be08e7 cmake(): allow setting HOST_CPU for cross-compilation
64: 46d24e7 = 25: 52d2e74 object-file.c: use size_t for header lengths
16: b6c816f = 26: d08be8f Import the source code of mimalloc v2.2.7
67: 4cc6d2f = 27: e31cbd6 CMake: default Visual Studio generator has changed
68: 291f83f = 28: 9555f1d hash algorithms: use size_t for section lengths
19: 493b695 = 29: 58e5536 mimalloc: adjust for building inside Git
22: c4f1c13 = 30: 20e74ea mingw: demonstrate a
git addissue with NTFS junctions71: a1746f6 = 31: fbd6762 .gitignore: add Visual Studio CMakeSetting.json file
72: 66afd0e = 32: b8c8c25 hash-object --stdin: verify that it works with >4GB/LLP64
23: f2ac99f = 33: 176a369 mimalloc: offer a build-time option to enable it
24: 0ba8f9b = 34: 4f12a56 t5505/t5516: allow running without
.git/branches/in the templates27: 3e48fd9 = 35: 24e6776 clean: do not traverse mount points
28: aace6e8 = 36: d6d4fe1 strbuf_realpath(): use platform-dependent API if available
32: a7d6359 = 37: fa0437d http: use new "best effort" strategy for Secure Channel revoke checking
75: 5cfc8db = 38: a940a63 subtree: update
contrib/subtreetesttarget76: 3eaba73 = 39: 8a2ad2f CMakeLists: add default "x64-windows" arch for Visual Studio
77: d5f859b = 40: 57a8f74 hash-object: add another >4GB/LLP64 test case
78: a2c03dc = 41: 1371f4f setup: properly use "%(prefix)/" when in WSL
29: 6c8718e = 42: eb83fac mingw: use mimalloc
30: 699ae32 = 43: 7428855 t5505/t5516: fix white-space around redirectors
34: 430153a = 44: 6b18271 mingw: prevent regressions with "drive-less" absolute paths
35: e2ae3fd = 45: 807e100 clean: remove mount points when possible
36: 5224a7c = 46: c6c9ac4 transport: optionally disable side-band-64k
37: 34fb00b = 47: 7159f54 mingw: fix fatal error working on mapped network drives on Windows
38: da4b7cb = 48: 7e403e5 clink.pl: fix MSVC compile script to handle libcurl-d.lib
39: 10786e1 = 49: 5b09a0e mingw: implement a platform-specific
strbuf_realpath()40: a4e932c = 50: 410f8f7 t3701: verify that we can add lots of files interactively
41: 89fcd46 = 51: 343da8c commit: accept "scissors" with CR/LF line endings
42: 2516c44 = 52: 5f172a2 t0014: fix indentation
43: 5f61455 = 53: 9b1075f git-gui: accommodate for intent-to-add files
44: 9eeb3c8 = 54: 4c3ccf1 mingw: allow for longer paths in
parse_interpreter()45: 10120e2 = 55: d57b9c7 compat/vcbuild: document preferred way to build in Visual Studio
82: 127dd18 = 56: 263b688 http: optionally send SSL client certificate
83: aaf36ad = 57: 7ff85d9 ci: run
contrib/subtreetests in CI builds84: 2f3f759 = 58: c0c428f CMake: show Win32 and Generator_platform build-option values
85: 90725a3 = 59: 997b591 hash-object: add a >4GB/LLP64 test case using filtered input
86: ecf3a51 = 60: d67ad60 compat/mingw.c: do not warn when failing to get owner
87: 0f40103 = 61: a327261 mingw: $env:TERM="xterm-256color" for newer OSes
88: 25d5fa2 = 62: 6bc40f5 winansi: check result and Buffer before using Name
46: 2bc20d3 = 63: 61dd4df windows: skip linking
git-<command>for built-ins47: 6921fd6 = 64: 57195fa mingw: stop hard-coding
CC = gcc48: 9ae0db4 = 65: 3a425a4 mingw: drop the -D_USE_32BIT_TIME_T option
49: aed1446 = 66: f5370a4 mingw: only use -Wl,--large-address-aware for 32-bit builds
50: c82faa2 = 67: 9566909 mingw: avoid over-specifying
--pic-executable51: fb43d94 = 68: 2e115fc mingw: set the prefix and HOST_CPU as per MSYS2's settings
52: 108a0b6 = 69: c41c25b mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
53: 79a2e15 = 70: f4b6c0d mingw: rely on MSYS2's metadata instead of hard-coding it
54: cedeb0e = 71: a77fdb6 mingw: always define
ETC_*for MSYS2 environments55: 97f1ed6 = 72: fa3f880 max_tree_depth: lower it for clang builds in general on Windows
56: af08369 = 73: caeb052 mingw: ensure valid CTYPE
109: 41f69b7 = 74: 6e06f89 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
57: f09bc84 = 75: 38af918 mingw: allow
git.exeto be used instead of the "Git wrapper"111: b560439 = 76: 77ba1fd revision: create mark_trees_uninteresting_dense()
58: 4fd3762 = 77: f9b6bd8 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
113: e6afbee = 78: 53d3929 survey: stub in new experimental 'git-survey' command
59: 8409594 = 79: 28cb0ba Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
115: 33756e8 = 80: 8692dfa survey: add command line opts to select references
60: d9c2ceb = 81: d292a96 clink.pl: fix libexpatd.lib link error when using MSVC
117: 1297a9f = 82: c0e08a3 survey: start pretty printing data in table form
61: 78a42c8 = 83: d8affa6 Makefile: clean up .ilk files when MSVC=1
119: 3e2046a = 84: 37d3f8d survey: add object count summary
63: 93b53d8 = 85: ff67b2d vcbuild: add support for compiling Windows resource files
122: 44c6b32 = 86: 5c85871 survey: summarize total sizes by object type
65: 370adf7 = 87: b6c210a config.mak.uname: add git.rc to MSVC builds
66: 5c5f55d = 88: 33629cd MinGW: link as terminal server aware
125: a144785 = 89: b5197db survey: show progress during object walk
69: d500c8a = 90: 6731448 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
70: 0f89326 = 91: 1385dfe http: optionally load libcurl lazily
129: b0917da = 92: 9a03538 survey: add ability to track prioritized lists
126: 886abfb = 93: 9b8da5e mingw: make sure
errnois set correctly when socket operations fail73: 126cf56 = 94: ac584cd clink.pl: move default linker options for MSVC=1 builds
74: 7ee5dca = 95: 00c00c7 http: support lazy-loading libcurl also on Windows
133: 7e6c461 = 96: a549c11 survey: add report of "largest" paths
130: 73889aa = 97: 8e341e8 compat/mingw: handle WSA errors in strerror
79: 53f55a8 = 98: 369cb0a Add config option
windows.appendAtomically80: 2a0f360 = 99: 269b980 cmake: install headless-git.
81: 21d4d6f = 100: 886ba0b http: when loading libcurl lazily, allow for multiple SSL backends
137: 8e385f3 = 101: d618ff6 survey: add --top= option and config
134: 0c3a920 = 102: 86c76ae compat/mingw: drop outdated comment
89: 1af1ab3 = 103: 099b2bc mingw: change core.fsyncObjectFiles = 1 by default
90: 5ba8ff1 = 104: 30e2e27 Fix Windows version resources
91: 0141fba = 105: 34e108e status: fix for old-style submodules with commondir
92: 38437c6 = 106: 84ff2c8 git.rc: include winuser.h
93: f3c61cc = 107: 5302a6d mingw: do load libcurl dynamically by default
94: 458458c = 108: ab303dc Add a GitHub workflow to verify that Git/Scalar work in Nano Server
95: 210d3fa = 109: 280a59c mingw: suggest
windows.appendAtomicallyin more cases96: 122518e = 110: 2c748ad win32: use native ANSI sequence processing, if possible
97: 93cd9dd = 111: 200e8cd common-main.c: fflush stdout buffer upon exit
98: 89f6fc6 = 112: 59a805e t5601/t7406(mingw): do run tests with symlink support
99: 58e49a8 = 113: bbd3c0a win32: ensure that
localtime_r()is declared even in i686 builds100: 4a4d0f7 = 114: 6568fe3 Fallback to AppData if XDG_CONFIG_HOME is unset
101: 25f4b80 = 115: 475235d run-command: be helpful with Git LFS fails on Windows 7
141: a78fc69 = 116: e2e9abd survey: clearly note the experimental nature in the output
102: 313101c = 117: 5f3298a Merge 'remote-hg-prerequisites' into HEAD
103: 70676c1 = 118: ce280dc Merge branch 'drive-prefix'
104: a5f71c6 = 119: 57a9494 Merge branch 'dont-clean-junctions'
105: 2d30e24 = 120: f177610 Merge branch 'msys2-python'
106: 3237fcd = 121: 90a2af5 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
107: d10169f = 122: b3a6265 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
108: 3cdbf12 = 123: eff4216 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
110: 79c5ec5 = 124: 130382d Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
112: 8deb858 = 125: 637c0cf Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction114: 0c279ee = 126: 9715259 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: b314f2f = 127: 9c250af Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
118: 0ec2ebc = 128: 77d2c6a Merge 'add-p-many-files'
121: 886e5f1 = 129: 68bee5a Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
124: 5a4f5e0 = 130: 81a05ff Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
120: 1483696 = 131: 137490b t5563: verify that NTLM authentication works
128: 64ed108 = 132: ebbf4b3 Merge 'git-gui/js/intent-to-add'
123: 3e85e35 = 133: 527c0e0 http: disallow NTLM authentication by default
132: d0b6794 = 134: 697f962 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
127: 99863e1 = 135: 65e94e1 http: warn if might have failed because of NTLM
136: fb9a87a = 136: 205d617 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
131: f90acd1 = 137: 3e70145 credential: advertise NTLM suppression and allow helpers to re-enable
140: ee1bfdd = 138: 3b1458e Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
135: 33845fc = 139: b4448f7 http: extract http_reauth_prepare() from retry paths
149: 81d99fa = 140: e4988dd Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path138: 6d8df4e = 141: b060709 t0301: actually test credential-cache on Windows
139: 2689ca3 = 142: bdb5e53 http: attempt Negotiate auth in http.emptyAuth=auto mode
150: a4c3a5a = 143: a7a10d4 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
142: 3afc7eb = 144: 4d3f214 credential-cache: handle ECONNREFUSED gracefully
143: 97693b0 = 145: 0b2f320 reftable: do make sure to use custom allocators
144: 5a3ebe8 = 146: dc36af1 check-whitespace: avoid alerts about upstream commits
145: c4a9efa = 147: 0445888 t/t5571-prep-push-hook.sh: Add test with writing to stderr
146: af18122 = 148: 14a7c4d dir: do not traverse mount points
147: df88bee = 149: bf8f0f0 win32: thread-utils: handle multi-socket systems
148: 171e154 = 150: 265f1b8 t5563: add tests for http.emptyAuth with Negotiate
151: 3a21521 = 151: 1f8823b Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
152: d117a4e = 152: 3487fe4 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests153: 9ab3b6b = 153: b346e97 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
154: a79291a = 154: 9ad9978 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t155: 6bb9253 = 155: f0ca915 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory156: 23e154f = 156: af3bf2e Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
157: 149ffb5 = 157: 49fa3bd Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
158: 9c2753f = 158: 660a404 Merge branch 'optionally-dont-append-atomically-on-windows'
159: 0cdcfc8 = 159: b5538df Merge branch 'fsync-object-files-always'
160: bda18c1 = 160: b1c870a Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
161: efb65e8 = 161: 7e9e998 Fix Windows version resources (Fix Windows version resources git#4092)
162: cbcfd61 = 162: 8607f9c Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
163: 929e67c = 163: 5031d48 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)164: 2a7af21 = 164: f43ccb2 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)165: 92b05b7 = 165: ce01ad0 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283166: f85cb52 = 166: 8593915 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
167: 7b65848 = 167: 3d32aee ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
168: 62b7caf = 168: a6c7480 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
169: c77d22f = 169: 0dc2b34 Merge branch 'nano-server'
170: 96a64cd = 170: d75ed7a Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
171: 5cec6a9 = 171: f4a9928 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
172: 88cd8db = 172: 4f7302d common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
173: d9a9a27 = 173: cacd426 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
174: 5e30ec0 = 174: 16e1472 Merge branch 'Fix-i686-build-with-GCC-v14'
175: cefcde2 = 175: af6eb3d Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
176: 0d7491d = 176: 2f24732 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
177: bce43ad = 177: 0e5f6d0 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
178: b888ec7 = 178: 5ae240f Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
179: 41f7535 = 179: 94831e9 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
180: 859fecc = 180: cea595a credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
181: 5269358 = 181: 6939482 Merge branch 'reftable-vs-custom-allocators'
182: 6f4de9a = 182: 764057d Merge branch 'check-whitespace-only-downstream'
183: 5800317 = 183: ae1d37e 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)
184: 2ea691a = 184: 569d109 Merge branch 'disallow-ntlm-auth-by-default'
185: c704a0c = 185: 848ec2c Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)186: c6f3efa = 186: 8cf9a38 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
187: 30ad98b = 187: 604c028 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
188: 4d9966e = 188: 3b7099b Merge branch 'ready-for-upstream'
189: 508ade1 = 189: b1401ad ci(macos): skip the
git p4tests190: ca45950 = 190: 5447493 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)193: a117225 = 191: 01b7078 Win32: make FILETIME conversion functions public
194: e0ebd35 = 192: 8b46f65 Win32: dirent.c: Move opendir down
195: 25f31c0 = 193: 9792884 mingw: make the dirent implementation pluggable
196: 536b89f = 194: a807949 Win32: make the lstat implementation pluggable
197: c4a79f6 = 195: 880be0f mingw: add infrastructure for read-only file system level caches
198: fcf4db6 = 196: a934a8c mingw: add a cache below mingw's lstat and dirent implementations
199: 2c55918 = 197: e1802e5 fscache: load directories only once
200: 58b232d = 198: af6efa2 fscache: add key for GIT_TRACE_FSCACHE
201: 95e8cbe = 199: 6af8c00 fscache: remember not-found directories
202: b8667ea = 200: 781a778 fscache: add a test for the dir-not-found optimization
203: d105ffc = 201: 595dec3 add: use preload-index and fscache for performance
204: eac90d2 = 202: 32d047e dir.c: make add_excludes aware of fscache during status
205: d5088d5 = 203: e41ff9f fscache: make fscache_enabled() public
206: fe6a447 = 204: 5ba5899 dir.c: regression fix for add_excludes with fscache
207: 848ff86 = 205: 9e7e1b8 fetch-pack.c: enable fscache for stats under .git/objects
208: d85906d = 206: 3d3c9b2 checkout.c: enable fscache for checkout again
209: b7c6029 = 207: 2e13e62 Enable the filesystem cache (fscache) in refresh_index().
191: a8697b2 = 208: d386dc0 git-gui--askyesno: fix funny text wrapping
210: 49b5148 = 209: 813f440 fscache: use FindFirstFileExW to avoid retrieving the short name
192: 5d6a15b = 210: c4dcb8b git-gui--askyesno (mingw): use Git for Windows' icon, if available
211: 326dfe9 = 211: 80ee8f5 fscache: add GIT_TEST_FSCACHE support
249: c790469 = 212: baa9d08 Merge branch 'git-gui-askyesno'
212: 0bfbd42 = 213: a749b5a fscache: add fscache hit statistics
213: bfa1d36 = 214: 5dbd9f0 unpack-trees: enable fscache for sparse-checkout
214: 60dc1bb = 215: cda602f status: disable and free fscache at the end of the status command
215: dfd9326 = 216: cc9e273 mem_pool: add GIT_TRACE_MEMPOOL support
216: d7acdd6 = 217: 2029095 fscache: fscache takes an initial size
217: c82c595 = 218: eebde3e fscache: update fscache to be thread specific instead of global
218: 6f02538 = 219: 3d76def fscache: teach fscache to use mempool
219: e23852f = 220: de9ac60 fscache: make fscache_enable() thread safe
220: 3638188 = 221: 52d190c fscache: teach fscache to use NtQueryDirectoryFile
221: 0d5c8af = 222: c774cb0 fscache: remember the reparse tag for each entry
222: 1d25146 = 223: 7e442da Merge branch 'fscache'
223: e2e3341 = 224: 8e5c18a fscache: implement an FSCache-aware is_mount_point()
224: 29be4f7 = 225: 20aada4 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
225: 1f271bc = 226: 6660150 clean: make use of FSCache
226: 7c3bcff = 227: 5907fea Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
227: 9e0d23d = 228: 61fe299 Merge branch 'dont-clean-junctions-fscache'
228: 889c3d1 = 229: a246baa pack-objects (mingw): demonstrate a segmentation fault with large deltas
229: b11a395 ! 230: ddedb2f mingw: support long paths
230: 616cb2e = 231: e2d7eb0 win32(long path support): leave drive-less absolute paths intact
231: fa7d7de = 232: ad0908c compat/fsmonitor/fsm-*-win32: support long paths
232: 6939599 = 233: 202559d clean: suggest using
core.longPathsif paths are too long to remove233: 8632463 = 234: fdb6836 mingw: Support
git_terminal_promptwith more terminals234: 9a1d8ac = 235: 3aaeed6 compat/terminal.c: only use the Windows console if bash 'read -r' fails
235: 97d637d = 236: b56f44f mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
236: bafaa1a = 237: 3a2c658 Win32: symlink: move phantom symlink creation to a separate function
237: e186f51 = 238: 33a3dcf Introduce helper to create symlinks that knows about index_state
238: 4f4d743 = 239: 29a48c8 mingw: allow to specify the symlink type in .gitattributes
239: e4e7e0c = 240: 1e270fa Win32: symlink: add test for
symlinkattribute240: 3c7f709 = 241: a7d9bd9 mingw: explicitly specify with which cmd to prefix the cmdline
242: 58b218d = 242: 2e9cdba mingw: when path_lookup() failed, try BusyBox
244: 35768d4 = 243: 152fd76 test-tool: learn to act as a drop-in replacement for
iconv246: 4ec42c4 = 244: 450479d tests(mingw): if
iconvis unavailable, usetest-helper --iconv248: 88205a3 = 245: 253613c gitattributes: mark .png files as binary
251: 6e31233 = 246: 2adf1be tests: move test PNGs into t/lib-diff/
252: 6d8d349 = 247: 043cedc tests: only override sort & find if there are usable ones in /usr/bin/
253: e20aaed = 248: 0ed6573 tests: use the correct path separator with BusyBox
254: 6c9139f = 249: 5c6c2eb mingw: only use Bash-ism
builtin pwd -Wwhen available255: bfa8ed9 = 250: 7e2c10f tests (mingw): remove Bash-specific pwd option
241: 802f7a9 = 251: d97bb17 mingw: introduce code to detect whether we're inside a Windows container
256: 5cd34e5 = 252: c6f8599 test-lib: add BUSYBOX prerequisite
243: 401c908 = 253: 2b9cb8d mingw: when running in a Windows container, try to rename() harder
258: 9495411 = 254: b128775 t5003: use binary file from t/lib-diff/
245: 8276969 = 255: 287b415 mingw: move the file_attr_to_st_mode() function definition
260: 6130852 = 256: 78b707b t5532: workaround for BusyBox on Windows
247: acfc34e = 257: 3e67763 mingw: Windows Docker volumes are not symbolic links
262: ced0fa7 = 258: 966b9fe t5605: special-case hardlink test for BusyBox-w32
250: 7ae0a45 = 259: dfbc606 mingw: work around rename() failing on a read-only file
257: a6cedbb = 260: ce74d50 Merge branch 'gitk-and-git-gui-patches'
259: 6a15fc0 = 261: 43a75f0 Merge branch 'long-paths'
261: a6b5ef4 = 262: 01c30f2 Merge branch 'msys2'
263: e207f57 = 263: 9852614 Merge 'docker-volumes-are-no-symlinks'
264: 46987f9 = 264: b62f6d6 t5813: allow for $PWD to be a Windows path
265: 7c83aff = 265: 54836cb mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
266: 920eb20 = 266: c87f0ce t9200: skip tests when $PWD contains a colon
267: c38ad28 = 267: 0c41e8e Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
268: 1d49f53 = 268: 011e28f Describe Git for Windows' architecture
269: b5d4ef2 = 269: 35c517b mingw: kill child processes in a gentler way
270: 1559b3b = 270: d6a2189 mingw: optionally enable wsl compability file mode bits
271: d5d7f67 = 271: 9786d8e Merge branch 'busybox-w32'
272: 51810e6 = 272: 4466fb3 Modify the Code of Conduct for Git for Windows
273: b512a43 = 273: bf467ae mingw: really handle SIGINT
274: 1c84544 = 274: 123adff Merge branch 'wsl-file-mode-bits'
275: a9a13cb = 275: 2675e68 CONTRIBUTING.md: add guide for first-time contributors
276: 55fed05 = 276: f879262 Partially un-revert "editor: save and reset terminal after calling EDITOR"
277: 154b5c1 = 277: b8c9896 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
278: eb555ed = 278: 10536d5 README.md: Add a Windows-specific preamble
279: 9118d56 = 279: b555ff0 reset: reinstate support for the deprecated --stdin option
280: 70cf8c1 = 280: ba2ac83 Merge branch 'un-revert-editor-save-and-reset'
281: 198c3c4 = 281: 4e59888 Add an issue template
282: acb5625 = 282: cedb2c3 Add a GitHub workflow to monitor component updates
283: 247dcb5 = 283: 3a8a05d fsmonitor: reintroduce core.useBuiltinFSMonitor
284: 78e5a65 = 284: 577721d Merge branch 'phase-out-reset-stdin'
285: e70e2ad = 285: d1112a3 Modify the GitHub Pull Request template (to reflect Git for Windows)
286: 87aece4 = 286: 662f3d0 dependabot: help keeping GitHub Actions versions up to date
287: 13e92d5 = 287: 0c6aa4f Merge branch 'deprecate-core.useBuiltinFSMonitor'
288: 2eb9611 = 288: cc800c7 SECURITY.md: document Git for Windows' policies
289: ef5f228 = 289: 403b1b8 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
290: 99d3b44 = 290: c030b83 Merge 'readme' into HEAD
291: 9f43196 = 291: bab8ac1 Add an AGENTS.md file to help with AI-assisted debugging/development
292: d366dd1 = 292: c426b85 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
293: 3856d33 = 293: 75bbdc6 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
294: f7e685a = 294: 7a9f798 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
295: d732753 = 295: 74f4586 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
296: 4f7b27c = 296: d0eadea fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
297: 7d48373 = 297: 921658b 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)
298: 2c14fb5 = 298: f80df89 fixup! ci: work around a problem with HTTP/2 vs libcurl v8.10.0
299: 466d530 = 299: 6596c64 fixup! revision: create mark_trees_uninteresting_dense()
300: 81b821c = 300: 62180f0 Drop obsolete downstream patches (Drop obsolete downstream patches git#6208)
301: c7c5a7e < -: ---------- maintenance(geometric): avoid deadlocks on Windows 10 (maintenance(geometric): avoid deadlocks on Windows 10 git#6215)
302: 1aa859e < -: ---------- Merge branch 'pr-2097'
-: ---------- > 301: 6463ae3 Merge branch 'pr-2097'
303: 641d03e = 302: 6f8873a fixup! Add a GitHub workflow to verify that Git/Scalar work in Nano Server
304: a806e8f = 303: 3790b22 Update GitHub Actions versions used in the GitHub workflows (Update GitHub Actions versions used in the GitHub workflows git#6220)
305: 7dec932 = 304: df2cba3 build: tolerate use of _Generic from glibc 2.43 with Clang
306: 21605f8 = 305: eaf8755 build: tolerate use of _Generic from glibc 2.43 with Clang (build: tolerate use of _Generic from glibc 2.43 with Clang git#6233)