Rebase shears/main: 2 conflict(s) (0 skipped, 2 resolved) (#25647594412)#154
Open
gitforwindowshelper[bot] wants to merge 310 commits intobase/shears/main-25647594412from
Open
Rebase shears/main: 2 conflict(s) (0 skipped, 2 resolved) (#25647594412)#154gitforwindowshelper[bot] wants to merge 310 commits intobase/shears/main-25647594412from
gitforwindowshelper[bot] wants to merge 310 commits intobase/shears/main-25647594412from
Conversation
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>
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>
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>
Since we are already walking our reachable objects using the path-walk API,
let's now collect lists of the paths that contribute most to different
metrics. Specifically, we care about
* Number of versions.
* Total size on disk.
* Total inflated size (no delta or zlib compression).
This information can be critical to discovering which parts of the
repository are causing the most growth, especially on-disk size. Different
packing strategies might help compress data more efficiently, but the toal
inflated size is a representation of the raw size of all snapshots of those
paths. Even when stored efficiently on disk, that size represents how much
information must be processed to complete a command such as 'git blame'.
The exact disk size seems to be not quite robust enough for testing, as
could be seen by the `linux-musl-meson` job consistently failing, possibly
because of zlib-ng deflates differently: t8100.4(git survey
(default)) was failing with a symptom like this:
TOTAL OBJECT SIZES BY TYPE
===============================================
Object Type | Count | Disk Size | Inflated Size
------------+-------+-----------+--------------
- Commits | 10 | 1523 | 2153
+ Commits | 10 | 1528 | 2153
Trees | 10 | 495 | 1706
Blobs | 10 | 191 | 101
- Tags | 4 | 510 | 528
+ Tags | 4 | 547 | 528
This means: the disk size is unlikely something we can verify robustly.
Since zlib-ng seems to increase the disk size of the tags from 528 to
547, we cannot even assume that the disk size is always smaller than the
inflated size. We will most likely want to either skip verifying the
disk size altogether, or go for some kind of fuzzy matching, say, by
replacing `s/ 1[45][0-9][0-9] / ~1.5k /` and `s/ [45][0-9][0-9] / ~½k /`
or something like that.
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Special-casing even more configurations simply does not make sense. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows wants to add `git.exe` to the users' `PATH`, without cluttering the latter with unnecessary executables such as `wish.exe`. To that end, it invented the concept of its "Git wrapper", i.e. a tiny executable located in `C:\Program Files\Git\cmd\git.exe` (originally a CMD script) whose sole purpose is to set up a couple of environment variables and then spawn the _actual_ `git.exe` (which nowadays lives in `C:\Program Files\Git\mingw64\bin\git.exe` for 64-bit, and the obvious equivalent for 32-bit installations). Currently, the following environment variables are set unless already initialized: - `MSYSTEM`, to make sure that the MSYS2 Bash and the MSYS2 Perl interpreter behave as expected, and - `PLINK_PROTOCOL`, to force PuTTY's `plink.exe` to use the SSH protocol instead of Telnet, - `PATH`, to make sure that the `bin` folder in the user's home directory, as well as the `/mingw64/bin` and the `/usr/bin` directories are included. The trick here is that the `/mingw64/bin/` and `/usr/bin/` directories are relative to the top-level installation directory of Git for Windows (which the included Bash interprets as `/`, i.e. as the MSYS pseudo root directory). Using the absence of `MSYSTEM` as a tell-tale, we can detect in `git.exe` whether these environment variables have been initialized properly. Therefore we can call `C:\Program Files\Git\mingw64\bin\git` in-place after this change, without having to call Git through the Git wrapper. Obviously, above-mentioned directories must be _prepended_ to the `PATH` variable, otherwise we risk picking up executables from unrelated Git installations. We do that by constructing the new `PATH` value from scratch, appending `$HOME/bin` (if `HOME` is set), then the MSYS2 system directories, and then appending the original `PATH`. Side note: this modification of the `PATH` variable is independent of the modification necessary to reach the executables and scripts in `/mingw64/libexec/git-core/`, i.e. the `GIT_EXEC_PATH`. That modification is still performed by Git, elsewhere, long after making the changes described above. While we _still_ cannot simply hard-link `mingw64\bin\git.exe` to `cmd` (because the former depends on a couple of `.dll` files that are only in `mingw64\bin`, i.e. calling `...\cmd\git.exe` would fail to load due to missing dependencies), at least we can now avoid that extra process of running the Git wrapper (which then has to wait for the spawned `git.exe` to finish) by calling `...\mingw64\bin\git.exe` directly, via its absolute path. Testing this is in Git's test suite tricky: we set up a "new" MSYS pseudo-root and copy the `git.exe` file into the appropriate location, then verify that `MSYSTEM` is set properly, and also that the `PATH` is modified so that scripts can be found in `$HOME/bin`, `/mingw64/bin/` and `/usr/bin/`. This addresses git-for-windows#2283 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>
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>
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>
…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>
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>
…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
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
…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
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…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).
This corresponds to gitgitgadget#2097.
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.
…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>
…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>
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>
…windows#6220) This includes gitgitgadget#2097 and a `fixup!` for a workflow that is not upstream (Nano Server).
…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: 126291e800 (build: tolerate use of _Generic from glibc 2.43 with Clang (git-for-windows#6233), 2026-05-08) (81fe37b3dd..126291e800)
Resolved: 8699090 (tests: use the correct path separator with BusyBox, 2018-11-19)
kept both upstream's GIT_TEST_USE_SET_E block and downstream's PATH_SEP detection block as independent additions at the same location
Range-diff
1: 8699090 ! 1: eb1ad52 tests: use the correct path separator with BusyBox
Resolved: e05631f (t9200: skip tests when $PWD contains a colon, 2017-07-07)
kept downstream PWD-colon guard, adopted upstream's modernized cvs version check
Range-diff
1: e05631f ! 1: 4d2a5bd t9200: skip tests when $PWD contains a colon
To: 28264f0012 (build: tolerate use of _Generic from glibc 2.43 with Clang (git-for-windows#6233), 2026-05-08) (15e39be361..28264f0012)
Statistics
Range-diff (click to expand)
1: 3274ae3 = 1: a763c80 sideband: mask control characters
2: 0462ca5 = 2: f7034e5 sideband: introduce an "escape hatch" to allow control characters
3: f207802 = 3: 2c58a82 ci(dockerized): reduce the PID limit for private repositories
4: 8c8e102 = 4: 9953874 sideband: do allow ANSI color sequences by default
7: 3415b43 = 5: 2dd09c6 unix-socket: avoid leak when initialization fails
5: 00ede0d = 6: f3272eb mingw: skip symlink type auto-detection for network share targets
6: 3fdd1ff = 7: c2dadbe Merge branch 'fix-ci'
8: 390b530 = 8: 3d1a649 Merge branch 'disallow-control-characters-in-sideband-channel'
9: edca4c6 = 9: 5762986 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
10: 62adce4 = 10: 5a80961 grep: prevent
^$false match at end of file11: 7d28d16 = 11: a2beed6 Merge branch 'v2.53.0.windows.3'
12: 7687dac = 12: f8bcda5 Merge branch 'fixes-from-the-git-mailing-list'
17: e7c4434 = 13: 6f2ae46 t9350: point out that refs are not updated correctly
28: f5b513d = 14: 59c84d1 vcpkg_install: detect lack of Git
29: 6d42a10 = 15: c96168c vcpkg_install: add comment regarding slow network connections
30: 998daa7 = 16: 188d341 vcbuild: install ARM64 dependencies when building ARM64 binaries
31: 72e9d1e = 17: 0bafbdf vcbuild: add an option to install individual 'features'
32: cd21147 = 18: da97129 cmake: allow building for Windows/ARM64
13: eb61d7a = 19: 7c3cadd mingw: include the Python parts in the build
34: 0ec6c45 = 20: 7cd4dfe ci(vs-build) also build Windows/ARM64 artifacts
14: fe44ba7 = 21: 8790eda win32/pthread: avoid name clashes with winpthread
37: dad2636 = 22: 4b0e297 Add schannel to curl installation
47: 8f64f0b = 23: 0cd3967 hash-object: demonstrate a >4GB/LLP64 problem
15: 3cdd671 = 24: 6fa66c4 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
48: 56570fa = 25: 5c6e06a cmake(): allow setting HOST_CPU for cross-compilation
49: ae5f782 = 26: dcfdf6a object-file.c: use size_t for header lengths
16: d67535b = 27: 6dea35f Import the source code of mimalloc v2.2.7
50: 6fe34e4 = 28: fbb8ac2 CMake: default Visual Studio generator has changed
51: d7810fc = 29: 8733034 hash algorithms: use size_t for section lengths
18: 417747b = 30: efe2b2a mimalloc: adjust for building inside Git
19: a21a7a2 = 31: 7c5f7fe transport-helper: add trailing --
33: b3ca408 = 32: e7ae867 mingw: demonstrate a
git addissue with NTFS junctions52: 3f54362 = 33: 966c9f0 .gitignore: add Visual Studio CMakeSetting.json file
53: 39b6525 = 34: ac002fe hash-object --stdin: verify that it works with >4GB/LLP64
20: fe5704a = 35: 46166bc mimalloc: offer a build-time option to enable it
35: 5ab3d0c = 36: 1e0a00d t5505/t5516: allow running without
.git/branches/in the templates21: 991ee76 = 37: 7dd3cfb remote-helper: check helper status after import/export
22: 85268e0 = 38: 22b5ee5 clean: do not traverse mount points
36: 6055f9b = 39: 5c8a594 strbuf_realpath(): use platform-dependent API if available
38: c1f2d53 = 40: f7efd3e http: use new "best effort" strategy for Secure Channel revoke checking
54: 430ee58 = 41: e8c05bf subtree: update
contrib/subtreetesttarget55: 0df5aa0 = 42: 4447411 CMakeLists: add default "x64-windows" arch for Visual Studio
56: b289cb7 = 43: bd2f986 hash-object: add another >4GB/LLP64 test case
57: 9afac8d = 44: 525aaad setup: properly use "%(prefix)/" when in WSL
23: 6a29c2d = 45: 18a333c mingw: use mimalloc
39: a2cb1cd = 46: 27c8e74 t5505/t5516: fix white-space around redirectors
24: 05d54b0 = 47: 0d8b3ae Always auto-gc after calling a fast-import transport
25: 3ea5f7a = 48: 427393f mingw: prevent regressions with "drive-less" absolute paths
26: a5918a7 = 49: 42c2255 clean: remove mount points when possible
27: f44c173 = 50: 3691398 transport: optionally disable side-band-64k
40: 63241cf = 51: e035dcc mingw: fix fatal error working on mapped network drives on Windows
41: b6464dc = 52: 47a2899 clink.pl: fix MSVC compile script to handle libcurl-d.lib
42: ab2a1ba = 53: 525429c mingw: implement a platform-specific
strbuf_realpath()43: b914a04 = 54: c35bad5 t3701: verify that we can add lots of files interactively
44: 6b36218 = 55: 769af46 commit: accept "scissors" with CR/LF line endings
45: 83ec9c2 = 56: 548d717 t0014: fix indentation
46: ecc65b3 = 57: c4aa0f1 git-gui: accommodate for intent-to-add files
60: dd172a9 = 58: 4b46a9c mingw: allow for longer paths in
parse_interpreter()61: 38db771 = 59: 30c365d compat/vcbuild: document preferred way to build in Visual Studio
62: c5edd54 = 60: 9a71486 http: optionally send SSL client certificate
63: b988e69 = 61: 7b33dbf ci: run
contrib/subtreetests in CI builds64: c0fedda = 62: 8203d37 CMake: show Win32 and Generator_platform build-option values
65: 4238648 = 63: 8e7a832 hash-object: add a >4GB/LLP64 test case using filtered input
66: f0975a6 = 64: 016c95c compat/mingw.c: do not warn when failing to get owner
71: 0818084 = 65: cc65e42 windows: skip linking
git-<command>for built-ins72: 0ee4c75 = 66: eba53da mingw: stop hard-coding
CC = gcc73: 75bad99 = 67: 8d398ac mingw: drop the -D_USE_32BIT_TIME_T option
74: ca38850 = 68: 4a79e04 mingw: only use -Wl,--large-address-aware for 32-bit builds
75: 074859b = 69: 4ffa89a mingw: avoid over-specifying
--pic-executable76: 218d179 = 70: cead293 mingw: set the prefix and HOST_CPU as per MSYS2's settings
77: 08222da = 71: 2f45e88 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
78: df9f03e = 72: ac41dfd mingw: rely on MSYS2's metadata instead of hard-coding it
79: f333f0f = 73: f2d7e6c mingw: always define
ETC_*for MSYS2 environments80: a097f61 = 74: 53dbb12 max_tree_depth: lower it for clang builds in general on Windows
81: c1de0af = 75: b169c5a mingw: ensure valid CTYPE
93: 5386412 = 76: 6122b2c ci: work around a problem with HTTP/2 vs libcurl v8.10.0
82: cf124bd = 77: c960582 mingw: allow
git.exeto be used instead of the "Git wrapper"94: 1e10377 = 78: e378526 revision: create mark_trees_uninteresting_dense()
83: f1c351c = 79: ab1041d mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
95: 47653ef = 80: 00a1010 survey: stub in new experimental 'git-survey' command
84: 7f9f7b9 = 81: fd5a2cb Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
96: 6b7f7b1 = 82: d9e87ae survey: add command line opts to select references
85: fd1088b = 83: 29f35da clink.pl: fix libexpatd.lib link error when using MSVC
98: cdf6081 = 84: 625a8a0 survey: start pretty printing data in table form
86: a5686e4 = 85: 63a6e9a Makefile: clean up .ilk files when MSVC=1
100: 3f3a91b = 86: 975760b survey: add object count summary
87: 9ffd46f = 87: 9e4965e vcbuild: add support for compiling Windows resource files
102: 4096b83 = 88: 4b7ac83 survey: summarize total sizes by object type
88: c3eae2e = 89: 8dda196 config.mak.uname: add git.rc to MSVC builds
59: a86140e = 90: 6d15381 MinGW: link as terminal server aware
113: 722177e = 91: afad1b4 survey: show progress during object walk
89: a879ea5 = 92: 5a43553 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
97: 52c0536 = 93: 557c159 http: optionally load libcurl lazily
116: f529c33 = 94: 8c4e455 survey: add ability to track prioritized lists
90: 0bcdce9 = 95: f0dfc4c clink.pl: move default linker options for MSVC=1 builds
99: e291432 = 96: c710f6a http: support lazy-loading libcurl also on Windows
119: b659b2a = 97: fe11161 survey: add report of "largest" paths
58: 236f7a9 = 98: 09d2e6a Add config option
windows.appendAtomically91: a506d62 = 99: 4907b18 cmake: install headless-git.
101: 8dbe31a = 100: b61d301 http: when loading libcurl lazily, allow for multiple SSL backends
122: 1e942bb = 101: fee6ab7 survey: add --top= option and config
67: 6d35a86 = 102: eaa79b8 mingw: $env:TERM="xterm-256color" for newer OSes
68: 12506a8 = 103: f4162ad winansi: check result and Buffer before using Name
69: f058d3c = 104: d28c939 mingw: change core.fsyncObjectFiles = 1 by default
70: 83c13c3 = 105: 06491f4 Fix Windows version resources
92: 5f81752 = 106: bc2b047 status: fix for old-style submodules with commondir
103: 08af2fc = 107: 126e1e7 git.rc: include winuser.h
104: 52d4116 = 108: 0221b25 mingw: do load libcurl dynamically by default
105: ad471d0 = 109: 1a8448b Add a GitHub workflow to verify that Git/Scalar work in Nano Server
106: b3c9707 = 110: 351df33 mingw: suggest
windows.appendAtomicallyin more cases107: 1b7b146 = 111: 8ea062f win32: use native ANSI sequence processing, if possible
108: 3e8b6f1 = 112: 92cfeea common-main.c: fflush stdout buffer upon exit
109: b1955b4 = 113: 8f1b1c6 t5601/t7406(mingw): do run tests with symlink support
110: 6c98ef7 = 114: 131b5ae win32: ensure that
localtime_r()is declared even in i686 builds111: 56a1deb = 115: d4e08a4 Fallback to AppData if XDG_CONFIG_HOME is unset
112: 7c656f3 = 116: 8c1eaa2 run-command: be helpful with Git LFS fails on Windows 7
125: 65915bf = 117: dc4557d survey: clearly note the experimental nature in the output
132: 9bc31c1 = 118: 79af5e5 Merge 'remote-hg-prerequisites' into HEAD
133: b2fa140 = 119: 5431961 Merge branch 'drive-prefix'
134: 7f130aa = 120: 1798b45 Merge branch 'dont-clean-junctions'
135: a9d5ecc = 121: bbf55f9 Merge branch 'msys2-python'
137: c3aa116 = 122: b298301 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
139: 3538929 = 123: a61ed78 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
141: 5071daf = 124: 05e7c6e Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
142: fda52e5 = 125: efaaf1e Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
143: 255f5e7 = 126: b113789 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction144: 117e03c = 127: 950643d Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
145: 1f118db = 128: 88b5edd Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
146: f7e56fc = 129: 6d5e0f7 Merge 'add-p-many-files'
147: 07d61db = 130: 4c3c84d Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
148: 1e570ff = 131: bc50113 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
115: 3203a5c = 132: f3b4e7d t5563: verify that NTLM authentication works
149: 35eae91 = 133: 25663c2 Merge 'git-gui/js/intent-to-add'
118: e3e0345 = 134: 9d461fd http: disallow NTLM authentication by default
150: 6965d2d = 135: dbee058 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
114: e00d893 = 136: c8b2acb mingw: make sure
errnois set correctly when socket operations fail121: 8f740e0 = 137: 2439efc http: warn if might have failed because of NTLM
151: a161a52 = 138: 2acdf7a Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
117: 62db9f4 = 139: 0a4632c compat/mingw: handle WSA errors in strerror
124: fa2dbd0 = 140: 57fd8fa credential: advertise NTLM suppression and allow helpers to re-enable
152: 0a99240 = 141: 6abb0c8 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
120: 51d8c18 = 142: 93fe42d compat/mingw: drop outdated comment
136: 7f0f061 = 143: f613903 http: extract http_reauth_prepare() from retry paths
153: 9a0a78c = 144: 2064b9c Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path123: fd325b2 = 145: 996064a t0301: actually test credential-cache on Windows
138: 579159e = 146: 0594344 http: attempt Negotiate auth in http.emptyAuth=auto mode
154: 7932e12 = 147: c1f53bb Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
126: ffa5ab2 = 148: 4c5634f credential-cache: handle ECONNREFUSED gracefully
127: 3ee0fd5 = 149: 7ec0f10 reftable: do make sure to use custom allocators
128: 12b561d = 150: b64a498 check-whitespace: avoid alerts about upstream commits
129: dbd653b = 151: 54fe454 t/t5571-prep-push-hook.sh: Add test with writing to stderr
130: 9cf6271 = 152: 51c42ae dir: do not traverse mount points
131: 9da0b5e = 153: d47abaf win32: thread-utils: handle multi-socket systems
140: e3c938b = 154: 3a1127b t5563: add tests for http.emptyAuth with Negotiate
155: c691619 = 155: 845d14d Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
156: 49b6bac = 156: 216c759 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests157: 0a44024 = 157: fc38a12 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
158: 34ddcfb = 158: b689d2f Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t159: 716a08f = 159: 43b116a Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory160: 8b55d34 = 160: 7626061 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
161: 312edc9 = 161: 69b3145 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
162: 6df11e5 = 162: 105f496 Merge branch 'optionally-dont-append-atomically-on-windows'
163: 7bff5cf = 163: ed4c4dc Merge branch 'fsync-object-files-always'
164: 0d669dd = 164: 787461a Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
165: 5ab1362 = 165: 6b7ba7b Fix Windows version resources (Fix Windows version resources git#4092)
166: 6bb2e41 = 166: 892b985 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
167: 41bbbf6 = 167: 4ae519e Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)168: 17f179a = 168: de15d34 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)169: a782590 = 169: 5a2b14a Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283170: 8eda6a9 = 170: 9b64099 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
171: 66fbdb8 = 171: e2977c8 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
172: 20b5512 = 172: 9fce81b Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
173: a9dad84 = 173: a237f12 Merge branch 'nano-server'
174: 331f8d6 = 174: 1a33739 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
175: 49f4e7a = 175: ceb952c win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
176: 4a163f4 = 176: aba6471 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
177: 4aca1e2 = 177: d4b2333 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
178: 480c80a = 178: 81949b7 Merge branch 'Fix-i686-build-with-GCC-v14'
179: 4546b94 = 179: 97cb276 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
180: 878b964 = 180: 42675fb Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
181: 2fe158a = 181: a23b321 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
182: a88c485 = 182: 2bb19af Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
183: ac93a8a = 183: ec71b9a Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
184: e0d91b9 = 184: 3205f1b credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
185: c668ccd = 185: 49051c3 Merge branch 'reftable-vs-custom-allocators'
186: 1ba95c4 = 186: 2aa02c3 Merge branch 'check-whitespace-only-downstream'
187: 61e9376 = 187: d04e65e 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)
188: 8db1e10 = 188: 99a60c7 Merge branch 'disallow-ntlm-auth-by-default'
189: 0e06c1d = 189: 157cc6c Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)190: df35587 = 190: ede09f1 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
191: 9e799d3 = 191: c3e40a3 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
192: 53da437 = 192: 175efb8 Merge branch 'ready-for-upstream'
193: 4e992ed = 193: 502c88c ci(macos): skip the
git p4tests194: 07f9b4e = 194: 8128cf1 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)195: fc27d53 = 195: 3311e2e Win32: make FILETIME conversion functions public
196: 73c3fad = 196: f9d8568 Win32: dirent.c: Move opendir down
197: 68e5344 = 197: 0331eca mingw: make the dirent implementation pluggable
198: bee2a75 = 198: 48b6a39 Win32: make the lstat implementation pluggable
199: 51736b2 = 199: af0b350 mingw: add infrastructure for read-only file system level caches
200: 3167997 = 200: e6eb932 mingw: add a cache below mingw's lstat and dirent implementations
201: 43ec30e = 201: 6d4319c fscache: load directories only once
202: e7b3a2c = 202: 81c2f68 fscache: add key for GIT_TRACE_FSCACHE
204: f865c7c = 203: a736c76 fscache: remember not-found directories
206: 066afb5 = 204: a4d744f fscache: add a test for the dir-not-found optimization
208: 6d30b7e = 205: b406d27 add: use preload-index and fscache for performance
209: 6f1b0e8 = 206: 9524a62 dir.c: make add_excludes aware of fscache during status
210: 0046bea = 207: bfa8390 fscache: make fscache_enabled() public
211: aba3b3b = 208: bac01d2 dir.c: regression fix for add_excludes with fscache
212: e4bc62d = 209: ce47533 fetch-pack.c: enable fscache for stats under .git/objects
213: 0b68195 = 210: 08aeb32 checkout.c: enable fscache for checkout again
214: 65c7726 = 211: 4f667ff Enable the filesystem cache (fscache) in refresh_index().
215: 8756c0a = 212: 1a5a643 fscache: use FindFirstFileExW to avoid retrieving the short name
203: 682cfd5 = 213: 6826e4d git-gui--askyesno: fix funny text wrapping
216: 2795619 = 214: a892dc6 fscache: add GIT_TEST_FSCACHE support
205: 33c3173 = 215: 5f58b73 git-gui--askyesno (mingw): use Git for Windows' icon, if available
217: accc3b0 = 216: f659baf fscache: add fscache hit statistics
207: 057c84c = 217: 6c7eb05 Merge branch 'git-gui-askyesno'
218: b2dbe31 = 218: bbd9c0a unpack-trees: enable fscache for sparse-checkout
219: 62cf57b = 219: be57d31 status: disable and free fscache at the end of the status command
220: 32c5e52 = 220: 825e40f mem_pool: add GIT_TRACE_MEMPOOL support
221: 6378e39 = 221: 0aff2c0 fscache: fscache takes an initial size
222: 332003f = 222: 2d2d06f fscache: update fscache to be thread specific instead of global
223: 952e433 = 223: 6722cfb fscache: teach fscache to use mempool
224: 932d3b2 = 224: 000e789 fscache: make fscache_enable() thread safe
225: bc199d2 = 225: fecb7c2 fscache: teach fscache to use NtQueryDirectoryFile
226: 135b2cf = 226: 47196d0 fscache: remember the reparse tag for each entry
227: 80f9f76 = 227: 539b616 Merge branch 'fscache'
228: fcaf4cc = 228: 103a527 fscache: implement an FSCache-aware is_mount_point()
229: 9e7af57 = 229: 694456b Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
230: 7591eeb = 230: ec9870d clean: make use of FSCache
231: 5a0705a = 231: 3492761 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
232: 2de9933 = 232: 6665c25 Merge branch 'dont-clean-junctions-fscache'
233: 1163e1f = 233: 30adf92 pack-objects (mingw): demonstrate a segmentation fault with large deltas
234: 994b318 = 234: 2b2fb7f mingw: support long paths
235: 23721ec = 235: ce2e416 win32(long path support): leave drive-less absolute paths intact
236: 7373203 = 236: dbb41e6 compat/fsmonitor/fsm-*-win32: support long paths
237: 7f13315 = 237: 71990f9 clean: suggest using
core.longPathsif paths are too long to remove238: 650c6e2 = 238: e123df2 mingw: Support
git_terminal_promptwith more terminals239: 56cc21f = 239: d3c2de7 compat/terminal.c: only use the Windows console if bash 'read -r' fails
240: 48c7707 = 240: 7c9f989 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
241: 3f22655 = 241: e9a950d Win32: symlink: move phantom symlink creation to a separate function
242: 3394e01 = 242: e265a9e Introduce helper to create symlinks that knows about index_state
243: 82cf690 = 243: c131e52 mingw: allow to specify the symlink type in .gitattributes
244: 24f1828 = 244: 8b7db0e Win32: symlink: add test for
symlinkattribute245: 21dab4c = 245: 53debbc mingw: explicitly specify with which cmd to prefix the cmdline
246: 7da099e = 246: c45ea03 mingw: when path_lookup() failed, try BusyBox
247: 5b2f2b8 = 247: 813d2c2 test-tool: learn to act as a drop-in replacement for
iconv248: fcdead2 = 248: 80f47a5 mingw: introduce code to detect whether we're inside a Windows container
249: b33b515 = 249: a65f7fd tests(mingw): if
iconvis unavailable, usetest-helper --iconv250: f019e94 = 250: fe34510 mingw: when running in a Windows container, try to rename() harder
251: 06acf32 = 251: 0b65b95 gitattributes: mark .png files as binary
252: 948807d = 252: 4757539 mingw: move the file_attr_to_st_mode() function definition
253: 15d2203 = 253: 58cbc19 tests: move test PNGs into t/lib-diff/
254: c6d8161 = 254: 9881148 mingw: Windows Docker volumes are not symbolic links
255: b28a90d = 255: f86ef80 tests: only override sort & find if there are usable ones in /usr/bin/
256: 79b811d = 256: 3c6968c mingw: work around rename() failing on a read-only file
257: 8699090 ! 257: eb1ad52 tests: use the correct path separator with BusyBox
258: 452cc00 = 258: 84a0d0a mingw: only use Bash-ism
builtin pwd -Wwhen available259: bb2194f = 259: 398b1b3 tests (mingw): remove Bash-specific pwd option
260: 6e73f85 = 260: b6d8b92 test-lib: add BUSYBOX prerequisite
261: d7ed9c9 = 261: fbf8050 t5003: use binary file from t/lib-diff/
262: 89ede41 = 262: c4c9b4d t5532: workaround for BusyBox on Windows
263: 343213a = 263: b9c79dd t5605: special-case hardlink test for BusyBox-w32
264: f9da0b5 = 264: 9757db4 t5813: allow for $PWD to be a Windows path
265: e05631f ! 265: 4d2a5bd t9200: skip tests when $PWD contains a colon
276: 9bda540 = 266: a7eb938 Merge branch 'gitk-and-git-gui-patches'
278: 1d3631a = 267: d90dec1 Merge branch 'long-paths'
280: 8127adf = 268: 6d626bd Merge branch 'msys2'
282: 00848ca = 269: 0841784 Merge 'docker-volumes-are-no-symlinks'
284: 6dfd499 = 270: 6c22f92 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
286: b25ee84 = 271: e8605f7 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
273: beb773c = 272: d0ffccb Describe Git for Windows' architecture
266: 41814b8 = 273: 7cf57aa mingw: kill child processes in a gentler way
267: 40dcbcf = 274: 2bb6a3f mingw: optionally enable wsl compability file mode bits
287: 8970d31 = 275: c12e5c2 Merge branch 'busybox-w32'
275: 8c0db9a = 276: 1747431 Modify the Code of Conduct for Git for Windows
268: d8b4bb2 = 277: 22b5def mingw: really handle SIGINT
288: afb697b = 278: 77b4923 Merge branch 'wsl-file-mode-bits'
277: 1cbd77d = 279: c7e0c72 CONTRIBUTING.md: add guide for first-time contributors
269: 0a0670a = 280: a0c14d7 Partially un-revert "editor: save and reset terminal after calling EDITOR"
289: 1b3b2af = 281: 6119f54 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
279: 2a827be = 282: ab1047e README.md: Add a Windows-specific preamble
270: e527f47 = 283: bcc4cbd reset: reinstate support for the deprecated --stdin option
290: 10aa5b3 = 284: 36c314e Merge branch 'un-revert-editor-save-and-reset'
281: a959dd0 = 285: a480313 Add an issue template
272: 0110fc9 = 286: f68f802 Add a GitHub workflow to monitor component updates
271: 80096a9 = 287: 02f95f4 fsmonitor: reintroduce core.useBuiltinFSMonitor
291: c9c345b = 288: dd0f965 Merge branch 'phase-out-reset-stdin'
283: d4cc54f = 289: e26a7e8 Modify the GitHub Pull Request template (to reflect Git for Windows)
274: b3921c2 = 290: 62707d8 dependabot: help keeping GitHub Actions versions up to date
292: 9c69e9f = 291: fa6617c Merge branch 'deprecate-core.useBuiltinFSMonitor'
285: 53fa513 = 292: 1473b9c SECURITY.md: document Git for Windows' policies
293: e217681 = 293: 2eba9f0 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
294: 2b8a3ab = 294: 5cd9ac4 Merge 'readme' into HEAD
-: ---------- > 295: 63e0864 Add an AGENTS.md file to help with AI-assisted debugging/development
-: ---------- > 296: 347d807 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
-: ---------- > 297: 4ca471a fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
-: ---------- > 298: fbaffed fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
-: ---------- > 299: 929bac3 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
-: ---------- > 300: 6a1b3bf fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
-: ---------- > 301: 9f587d3 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)
-: ---------- > 302: 85172e2 fixup! ci: work around a problem with HTTP/2 vs libcurl v8.10.0
-: ---------- > 303: 0ba8e13 fixup! revision: create mark_trees_uninteresting_dense()
-: ---------- > 304: 9e73f5d Drop obsolete downstream patches (Drop obsolete downstream patches git#6208)
-: ---------- > 305: 3a4749d maintenance(geometric): avoid deadlocks on Windows 10 (maintenance(geometric): avoid deadlocks on Windows 10 git#6215)
-: ---------- > 306: 35de1ed Merge branch 'pr-2097'
-: ---------- > 307: 17644e9 fixup! Add a GitHub workflow to verify that Git/Scalar work in Nano Server
-: ---------- > 308: 6c6659c Update GitHub Actions versions used in the GitHub workflows (Update GitHub Actions versions used in the GitHub workflows git#6220)
-: ---------- > 309: 42ea738 build: tolerate use of _Generic from glibc 2.43 with Clang
-: ---------- > 310: 28264f0 build: tolerate use of _Generic from glibc 2.43 with Clang (build: tolerate use of _Generic from glibc 2.43 with Clang git#6233)