Rebase shears/next: 1 conflict(s) (0 skipped, 1 resolved) (#26355322229)#192
Open
gitforwindowshelper[bot] wants to merge 303 commits into
Open
Rebase shears/next: 1 conflict(s) (0 skipped, 1 resolved) (#26355322229)#192gitforwindowshelper[bot] wants to merge 303 commits into
gitforwindowshelper[bot] wants to merge 303 commits into
Conversation
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib` rather than `libexpat.lib`. It appears that the `vcpkg` package for "libexpat" has changed and now creates `libexpatd.lib` for debug mode builds. Previously, both debug and release builds created a ".lib" with the same basename. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
On LLP64 systems, such as Windows, the size of `long`, `int`, etc. is only 32 bits (for backward compatibility). Git's use of `unsigned long` for file memory sizes in many places, rather than size_t, limits the handling of large files on LLP64 systems (commonly given as `>4GB`). Provide a minimum test for handling a >4GB file. The `hash-object` command, with the `--literally` and without `-w` option avoids writing the object, either loose or packed. This avoids the code paths hitting the `bigFileThreshold` config test code, the zlib code, and the pack code. Subsequent patches will walk the test's call chain, converting types to `size_t` (which is larger in LLP64 data models) where appropriate. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In bf2d5d8 (Don't let ld strip relocations, 2016-01-16) (picked from git-for-windows@6a237925bf10), Git for Windows introduced the `-Wl,-pic-executable` flag, specifying the exact entry point via `-e`. This required discerning between i686 and x86_64 code because the former required the symbol to be prefixed with an underscore, the latter did not. As per https://sourceware.org/bugzilla/show_bug.cgi?id=10865, the specified symbols are already the default, though. So let's drop the overly-specific definition. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Continue walking the code path for the >4GB `hash-object --literally` test. The `hash_object_file_literally()` function internally uses both `hash_object_file()` and `write_object_file_prepare()`. Both function signatures use `unsigned long` rather than `size_t` for the mem buffer sizes. Use `size_t` instead, for LLP64 compatibility. While at it, convert those function's object's header buffer length to `size_t` for consistency. The value is already upcast to `uintmax_t` for print format compatibility. Note: The hash-object test still does not pass. A subsequent commit continues to walk the call tree's lower level hash functions to identify further fixes. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 already defines a couple of helpful environment variables, and we can use those to infer the installation location as well as the CPU. No need for hard-coding ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Create a wrapper for the Windows Resource Compiler (RC.EXE) for use by the MSVC=1 builds. This is similar to the CL.EXE and LIB.EXE wrappers used for the MSVC=1 builds. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Continue walking the code path for the >4GB `hash-object --literally`
test to the hash algorithm step for LLP64 systems.
This patch lets the SHA1DC code use `size_t`, making it compatible with
LLP64 data models (as used e.g. by Windows).
The interested reader of this patch will note that we adjust the
signature of the `git_SHA1DCUpdate()` function without updating _any_
call site. This certainly puzzled at least one reviewer already, so here
is an explanation:
This function is never called directly, but always via the macro
`platform_SHA1_Update`, which is usually called via the macro
`git_SHA1_Update`. However, we never call `git_SHA1_Update()` directly
in `struct git_hash_algo`. Instead, we call `git_hash_sha1_update()`,
which is defined thusly:
static void git_hash_sha1_update(git_hash_ctx *ctx,
const void *data, size_t len)
{
git_SHA1_Update(&ctx->sha1, data, len);
}
i.e. it contains an implicit downcast from `size_t` to `unsigned long`
(before this here patch). With this patch, there is no downcast anymore.
With this patch, finally, the t1007-hash-object.sh "files over 4GB hash
literally" test case is fixed.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The tell-tale is the presence of the `MSYSTEM` value while compiling, of course. In that case, we want to ensure that `MSYSTEM` is set when running `git.exe`, and also enable the magic MSYS2 tty detection. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Teach MSVC=1 builds to depend on the `git.rc` file so that the resulting executables have Windows-style resources and version number information within them. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This compile-time option allows to ask Git to load libcurl dynamically at runtime. Together with a follow-up patch that optionally overrides the file name depending on the `http.sslBackend` setting, this kicks open the door for installing multiple libcurl flavors side by side, and load the one corresponding to the (runtime-)configured SSL/TLS backend. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Just like the `hash-object --literally` code path, the `--stdin` code path also needs to use `size_t` instead of `unsigned long` to represent memory sizes, otherwise it would cause problems on platforms using the LLP64 data model (such as Windows). To limit the scope of the test case, the object is explicitly not written to the object store, nor are any filters applied. The `big` file from the previous test case is reused to save setup time; To avoid relying on that side effect, it is generated if it does not exist (e.g. when running via `sh t1007-*.sh --long --run=1,41`). Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 defines some helpful environment variables, e.g. `MSYSTEM`. There is code in Git for Windows to ensure that that `MSYSTEM` variable is set, hard-coding a default. However, the existing solution jumps through hoops to reconstruct the proper default, and is even incomplete doing so, as we found out when we extended it to support CLANGARM64. This is absolutely unnecessary because there is already a perfectly valid `MSYSTEM` value we can use at build time. This is even true when building the MINGW32 variant on a MINGW64 system because `makepkg-mingw` will override the `MSYSTEM` value as per the `MINGW_ARCH` array. The same is equally true for the `/mingw64`, `/mingw32` and `/clangarm64` prefix: those values are already available via the `MINGW_PREFIX` environment variable, and we just need to pass that setting through. Only when `MINGW_PREFIX` is not set (as is the case in Git for Windows' minimal SDK, where only `MSYSTEM` is guaranteed to be set correctly), we use as fall-back the top-level directory whose name is the down-cased value of the `MSYSTEM` variable. Incidentally, this also broadens the support to all the configurations supported by the MSYS2 project, i.e. clang64 & ucrt64, too. Note: This keeps the same, hard-coded MSYSTEM platform support for CMake as before, but drops it for Meson (because it is unclear how Meson could do this in a more flexible manner). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A change between versions 2.4.1 and 2.6.0 of the MSYS2 runtime modified how Cygwin's runtime (and hence Git for Windows' MSYS2 runtime derivative) handles locales: d16a56306d (Consolidate wctomb/mbtowc calls for POSIX-1.2008, 2016-07-20). An unintended side-effect is that "cold-calling" into the POSIX emulation will start with a locale based on the current code page, something that Git for Windows is very ill-prepared for, as it expects to be able to pass a command-line containing non-ASCII characters to the shell without having those characters munged. One symptom of this behavior: when `git clone` or `git fetch` shell out to call `git-upload-pack` with a path that contains non-ASCII characters, the shell tried to interpret the entire command-line (including command-line parameters) as executable path, which obviously must fail. This fixes git-for-windows#1036 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Ignore the `-fno-stack-protector` compiler argument when building with MSVC. This will be used in a later commit that needs to build a Win32 GUI app. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This implements the Windows-specific support code, because everything is slightly different on Windows, even loading shared libraries. Note: I specifically do _not_ use the code from `compat/win32/lazyload.h` here because that code is optimized for loading individual functions from various system DLLs, while we specifically want to load _many_ functions from _one_ DLL here, and distinctly not a system DLL (we expect libcurl to be located outside `C:\Windows\system32`, something `INIT_PROC_ADDR` refuses to work with). Also, the `curl_easy_getinfo()`/`curl_easy_setopt()` functions are declared as vararg functions, which `lazyload.h` cannot handle. Finally, we are about to optionally override the exact file name that is to be loaded, which is a goal contrary to `lazyload.h`'s design. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
To complement the `--stdin` and `--literally` test cases that verify that we can hash files larger than 4GB on 64-bit platforms using the LLP64 data model, here is a test case that exercises `hash-object` _without_ any options. Just as before, we use the `big` file from the previous test case if it exists to save on setup time, otherwise generate it. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
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>
Move the default `-ENTRY` and `-SUBSYSTEM` arguments for MSVC=1 builds from `config.mak.uname` into `clink.pl`. These args are constant for console-mode executables. Add support to `clink.pl` for generating a Win32 GUI application using the `-mwindows` argument (to match how GCC does it). This changes the `-ENTRY` and `-SUBSYSTEM` arguments accordingly. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
The previous commits introduced a compile-time option to load libcurl lazily, but it uses the hard-coded name "libcurl-4.dll" (or equivalent on platforms other than Windows). To allow for installing multiple libcurl flavors side by side, where each supports one specific SSL/TLS backend, let's first look whether `libcurl-<backend>-4.dll` exists, and only use `libcurl-4.dll` as a fall back. That will allow us to ship with a libcurl by default that only supports the Secure Channel backend for the `https://` protocol. This libcurl won't suffer from any dependency problem when upgrading OpenSSL to a new major version (which will change the DLL name, and hence break every program and library that depends on it). This is crucial because Git for Windows relies on libcurl to keep working when building and deploying a new OpenSSL package because that library is used by `git fetch` and `git clone`. Note that this feature is by no means specific to Windows. On Ubuntu, for example, a `git` built using `LAZY_LOAD_LIBCURL` will use `libcurl.so.4` for `http.sslbackend=openssl` and `libcurl-gnutls.so.4` for `http.sslbackend=gnutls`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
To verify that the `clean` side of the `clean`/`smudge` filter code is correct with regards to LLP64 (read: to ensure that `size_t` is used instead of `unsigned long`), here is a test case using a trivial filter, specifically _not_ writing anything to the object store to limit the scope of the test case. As in previous commits, the `big` file from previous test cases is reused if available, to save setup time, otherwise re-generated. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In the case of Git for Windows (say, in a Git Bash window) running in a Windows Subsystem for Linux (WSL) directory, the GetNamedSecurityInfoW() call in is_path_owned_By_current_side() returns an error code other than ERROR_SUCCESS. This is consistent behavior across this boundary. In these cases, the owner would always be different because the WSL owner is a different entity than the Windows user. The change here is to suppress the error message that looks like this: error: failed to get owner for '//wsl.localhost/...' (1) Before this change, this warning happens for every Git command, regardless of whether the directory is marked with safe.directory. Signed-off-by: Derrick Stolee <derrickstolee@github.com>
For Windows builds >= 15063 set $env:TERM to "xterm-256color" instead of "cygwin" because they have a more capable console system that supports this. Also set $env:COLORTERM="truecolor" if unset. $env:TERM is initialized so that ANSI colors in color.c work, see 29a3963 (Win32: patch Windows environment on startup, 2012-01-15). See git-for-windows#3629 regarding problems caused by always setting $env:TERM="cygwin". This is the same heuristic used by the Cygwin runtime. Signed-off-by: Rafael Kitover <rkitover@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NtQueryObject under Wine can return a success but fill out no name. In those situations, Wine will set Buffer to NULL, and set result to the sizeof(OBJECT_NAME_INFORMATION). Running a command such as echo "$(git.exe --version 2>/dev/null)" will crash due to a NULL pointer dereference when the code attempts to null terminate the buffer, although, weirdly, removing the subshell or redirecting stdout to a file will not trigger the crash. Code has been added to also check Buffer and Length to ensure the check is as robust as possible due to the current behavior being fragile at best, and could potentially change in the future This code is based on the behavior of NtQueryObject under wine and reactos. Signed-off-by: Christopher Degawa <ccom@randomderp.com>
Atomic append on windows is only supported on local disk files, and it may cause errors in other situations, e.g. network file system. If that is the case, this config option should be used to turn atomic append off. Co-Authored-By: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: 孙卓识 <sunzhuoshi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…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>
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
…updates Start monitoring updates of Git for Windows' component in the open
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>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This corresponds to gitgitgadget#2097.
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).
…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>
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.
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: next
From: 90fc25bd70 (build: tolerate use of _Generic from glibc 2.43 with Clang (git-for-windows#6233), 2026-05-08) (0890517643..90fc25bd70)
Resolved: 44eba88 (compat/mingw: handle WSA errors in strerror, 2024-12-22)
kept both u-mingw and u-odb-inmemory entries in alphabetical order in Makefile and t/meson.build
Range-diff
1: 44eba88 ! 1: 1b29497 compat/mingw: handle WSA errors in strerror
To: 644b5a89af (build: tolerate use of _Generic from glibc 2.43 with Clang (git-for-windows#6233), 2026-05-08) (313fe43838..644b5a89af)
Statistics
Range-diff (click to expand)
1: f3012ab = 1: b2ad2e8 ci(dockerized): reduce the PID limit for private repositories
2: 76a8af7 = 2: 051c6bd mingw: skip symlink type auto-detection for network share targets
3: f1fbdd3 = 3: 034718f Merge branch 'fix-ci'
4: c78446a = 4: e97f933 unix-socket: avoid leak when initialization fails
5: a22fa26 = 5: f36af2d Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: 81a4146 = 6: 1cf8b7c grep: prevent
^$false match at end of file7: 8afb81e = 7: f4177ab Merge branch 'v2.53.0.windows.3'
8: e2e73f3 = 8: 3273204 Merge branch 'fixes-from-the-git-mailing-list'
13: 54abc3d = 9: 52fef2b t9350: point out that refs are not updated correctly
15: d3f865d = 10: 900e312 transport-helper: add trailing --
19: 8fd5208 = 11: 0b1b1c4 remote-helper: check helper status after import/export
25: e2dd0d5 = 12: 0c7b29c Always auto-gc after calling a fast-import transport
44: de00d58 = 13: e9ee270 vcpkg_install: detect lack of Git
46: fa2f045 = 14: 5a869a8 vcpkg_install: add comment regarding slow network connections
48: 0c8db83 = 15: 9641c29 vcbuild: install ARM64 dependencies when building ARM64 binaries
50: c730810 = 16: ee37745 vcbuild: add an option to install individual 'features'
52: 3fe2155 = 17: c4adb7d cmake: allow building for Windows/ARM64
9: ce99e5b = 18: a98ae62 mingw: include the Python parts in the build
54: 8921519 = 19: ee8b10b ci(vs-build) also build Windows/ARM64 artifacts
10: 7e0b910 ! 20: 683ecc2 win32/pthread: avoid name clashes with winpthread
56: 1a5b095 = 21: d98d289 Add schannel to curl installation
11: 3444062 = 22: 5ff9c5f git-compat-util: avoid redeclaring _DEFAULT_SOURCE
59: 1f594cf = 23: 2c275cc cmake(): allow setting HOST_CPU for cross-compilation
12: 3126d94 = 24: 95f1276 Import the source code of mimalloc v2.2.7
62: b08d6ed = 25: 342f40a CMake: default Visual Studio generator has changed
14: 927dab1 = 26: 8eee95f mimalloc: adjust for building inside Git
16: fdb757c = 27: 3c13548 mingw: demonstrate a
git addissue with NTFS junctions65: e248352 = 28: 594da83 .gitignore: add Visual Studio CMakeSetting.json file
17: 41b0542 = 29: 11bfad8 mimalloc: offer a build-time option to enable it
18: 147c554 = 30: 63175cf t5505/t5516: allow running without
.git/branches/in the templates20: c51d114 = 31: 433d8a3 clean: do not traverse mount points
21: 4288d84 = 32: d6882c7 strbuf_realpath(): use platform-dependent API if available
24: 6768762 = 33: 2dcf4e6 http: use new "best effort" strategy for Secure Channel revoke checking
68: 3903d5b = 34: 8e863b5 subtree: update
contrib/subtreetesttarget69: f0d05a1 = 35: 10f0554 CMakeLists: add default "x64-windows" arch for Visual Studio
22: 72f5024 = 36: 014982a mingw: use mimalloc
23: f548334 = 37: cce38c7 t5505/t5516: fix white-space around redirectors
26: bb5a269 = 38: 13e2aa9 mingw: prevent regressions with "drive-less" absolute paths
27: 36ba272 = 39: 2b21c01 clean: remove mount points when possible
28: 26039c1 = 40: e953d85 transport: optionally disable side-band-64k
29: ee1c587 = 41: 5c6802c mingw: fix fatal error working on mapped network drives on Windows
30: edee103 = 42: 5d5c0d7 clink.pl: fix MSVC compile script to handle libcurl-d.lib
31: fb3b93d = 43: 8c819b5 mingw: implement a platform-specific
strbuf_realpath()32: 8c1a8d2 = 44: 8beb377 t3701: verify that we can add lots of files interactively
33: df63a57 = 45: 7d5fa76 commit: accept "scissors" with CR/LF line endings
75: a837f50 = 46: 1902d19 t0014: fix indentation
76: 25e9ee9 = 47: aa18143 git-gui: accommodate for intent-to-add files
77: 10d2984 = 48: d08deca mingw: allow for longer paths in
parse_interpreter()78: a901d8f = 49: 0ff7cf0 compat/vcbuild: document preferred way to build in Visual Studio
79: dd7a356 = 50: 8afe175 http: optionally send SSL client certificate
80: 0bbc3fe = 51: 41fdee0 ci: run
contrib/subtreetests in CI builds81: aa7f7e2 = 52: c42bd21 CMake: show Win32 and Generator_platform build-option values
34: 0e23675 = 53: 3aff885 windows: skip linking
git-<command>for built-ins35: b32c2f1 = 54: b361a61 mingw: stop hard-coding
CC = gcc36: 2752041 = 55: 820953c mingw: drop the -D_USE_32BIT_TIME_T option
37: 89c4dde = 56: 207d0b3 mingw: only use -Wl,--large-address-aware for 32-bit builds
38: 01cdeed = 57: 7a1fc12 mingw: avoid over-specifying
--pic-executable39: 73705ff = 58: 115c4b7 mingw: set the prefix and HOST_CPU as per MSYS2's settings
40: e30502c = 59: d7155c7 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
41: 6aa2cea = 60: 6eccd79 mingw: rely on MSYS2's metadata instead of hard-coding it
42: 24b6709 = 61: 714c5d7 mingw: always define
ETC_*for MSYS2 environments43: ae2c39a = 62: d639e2d max_tree_depth: lower it for clang builds in general on Windows
45: 11933e4 = 63: 83f07d6 mingw: ensure valid CTYPE
47: 0abf5c2 = 64: c9d8b42 mingw: allow
git.exeto be used instead of the "Git wrapper"49: 6aaf50d = 65: 466b114 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
51: 1461a29 = 66: d2050ca Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
53: a2dc421 = 67: 00cc6e9 clink.pl: fix libexpatd.lib link error when using MSVC
55: 9ac04ee = 68: c9db542 Makefile: clean up .ilk files when MSVC=1
57: b65fea9 = 69: 79b9a26 hash-object: demonstrate a >4GB/LLP64 problem
58: 0ad553a = 70: 99ed061 vcbuild: add support for compiling Windows resource files
60: 1458a25 = 71: 9234aa6 object-file.c: use size_t for header lengths
61: 0863b93 = 72: 8f26f60 config.mak.uname: add git.rc to MSVC builds
73: 8635f42 = 73: ed94cbf MinGW: link as terminal server aware
63: 1f100ee = 74: f0b7e80 hash algorithms: use size_t for section lengths
64: 3902f52 = 75: 3e04797 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
100: 18b06f4 = 76: 3fc7c1b http: optionally load libcurl lazily
66: be9c705 = 77: 8a30055 hash-object --stdin: verify that it works with >4GB/LLP64
67: 517d52b = 78: 4750518 clink.pl: move default linker options for MSVC=1 builds
105: 5ca3f7e = 79: 8865c41 http: support lazy-loading libcurl also on Windows
89: 9a3580d = 80: 621c8bb ci: work around a problem with HTTP/2 vs libcurl v8.10.0
70: 45cad00 = 81: 8a71fa7 hash-object: add another >4GB/LLP64 test case
71: 7ca5454 ! 82: e26f328 setup: properly use "%(prefix)/" when in WSL
@@ Commit message Signed-off-by: Derrick Stolee <derrickstolee@github.com> ## setup.c ## -@@ setup.c: const char *setup_git_directory_gently(int *nongit_ok) +@@ setup.c: const char *setup_git_directory_gently(struct repository *repo, int *nongit_ok) break; case GIT_DIR_INVALID_OWNERSHIP: if (!nongit_ok) {72: 8c1956e = 83: 9007951 Add config option
windows.appendAtomically74: 7fce307 = 84: 4642c6d cmake: install headless-git.
110: 9b5e1f6 = 85: 6cedc76 http: when loading libcurl lazily, allow for multiple SSL backends
90: f670270 = 86: 5badd99 revision: create mark_trees_uninteresting_dense()
82: 6e0737c = 87: 8a70578 hash-object: add a >4GB/LLP64 test case using filtered input
83: a39e9e2 = 88: 70175af compat/mingw.c: do not warn when failing to get owner
84: 4e38a61 = 89: 6942c9e mingw: $env:TERM="xterm-256color" for newer OSes
85: fefea44 = 90: af621a8 winansi: check result and Buffer before using Name
86: 65fa507 = 91: bfe7c7a mingw: change core.fsyncObjectFiles = 1 by default
87: 19a3768 = 92: 339b85e Fix Windows version resources
88: 35d7d3b = 93: 5934e0d status: fix for old-style submodules with commondir
115: de0ea73 = 94: cf8dd98 git.rc: include winuser.h
116: a60cc6c = 95: 6cf2097 mingw: do load libcurl dynamically by default
117: a2478b1 = 96: 11858f8 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
118: 1d26323 = 97: ce2a502 mingw: suggest
windows.appendAtomicallyin more cases119: 3847cef = 98: d68d14c win32: use native ANSI sequence processing, if possible
120: 480387c = 99: 1ec7ec3 common-main.c: fflush stdout buffer upon exit
121: ad93fb4 = 100: d72c927 t5601/t7406(mingw): do run tests with symlink support
122: 7312cad = 101: def5b9a win32: ensure that
localtime_r()is declared even in i686 builds123: 8e6d2f1 = 102: 8b6e80c Fallback to AppData if XDG_CONFIG_HOME is unset
124: 8c39648 = 103: ba9b6a4 run-command: be helpful with Git LFS fails on Windows 7
91: f1d2efb = 104: 91dac2c survey: stub in new experimental 'git-survey' command
92: 0468a5c = 105: c300822 survey: add command line opts to select references
93: da5f1f8 = 106: 4a8f9d2 survey: start pretty printing data in table form
94: c821569 = 107: a00d564 survey: add object count summary
95: ab582e5 = 108: 95a7981 survey: summarize total sizes by object type
96: a796d9b = 109: 127df7a survey: show progress during object walk
101: f0a44bb = 110: d3abd23 survey: add ability to track prioritized lists
106: 2fcd680 = 111: d982b10 survey: add report of "largest" paths
111: 962afbe = 112: 6f775aa survey: add --top= option and config
97: 7ab6389 = 113: 676c864 mingw: make sure
errnois set correctly when socket operations fail125: d345408 = 114: bf08161 survey: clearly note the experimental nature in the output
99: bda7312 = 115: 70d2de0 Merge 'remote-hg-prerequisites' into HEAD
104: 0bedd60 = 116: 5db941a Merge branch 'drive-prefix'
109: 693326f = 117: 28d5ffa Merge branch 'dont-clean-junctions'
114: 4018c51 = 118: eb5af70 Merge branch 'msys2-python'
133: a8d36b9 = 119: 6c2b548 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
134: acaed27 = 120: 3e86229 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
135: 1486134 = 121: 3da18b3 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
136: 45ba4b2 = 122: fa0eeba Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
137: 933c239 = 123: 7f586f3 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction138: c2c9f1b = 124: dcb3c37 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
139: e321018 = 125: a053f9b Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
140: 7100bf2 = 126: 8648ad8 Merge 'add-p-many-files'
141: 6bffc0d = 127: 344bf1c Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
142: 41e396b = 128: 428838f Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
98: 572ede9 = 129: 8c6d130 t5563: verify that NTLM authentication works
143: 27e58c6 = 130: 5f21a16 Merge 'git-gui/js/intent-to-add'
102: 44eba88 ! 131: 1b29497 compat/mingw: handle WSA errors in strerror
103: 2576daa = 132: 6da68aa http: disallow NTLM authentication by default
144: 191e226 = 133: 1e72ce1 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
107: 7d6e60d = 134: 39a5cb0 compat/mingw: drop outdated comment
108: 456bc2e = 135: 82aac27 http: warn if might have failed because of NTLM
145: 0c6e1ef = 136: c12fefe Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
112: fa70a23 = 137: ff2f8a6 t0301: actually test credential-cache on Windows
113: 3aebc8b = 138: f46f03a credential: advertise NTLM suppression and allow helpers to re-enable
146: c00405e = 139: f418739 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
126: 3aaf302 = 140: ed68eda credential-cache: handle ECONNREFUSED gracefully
127: 8a9003b = 141: 18c7b24 reftable: do make sure to use custom allocators
128: c1fd0d7 = 142: dcaacff check-whitespace: avoid alerts about upstream commits
129: 98c0e98 = 143: 54e976e t/t5571-prep-push-hook.sh: Add test with writing to stderr
130: 9adc6f6 = 144: 20821dd dir: do not traverse mount points
131: d9e316c = 145: d3765cf win32: thread-utils: handle multi-socket systems
132: 261d4b0 = 146: 0e404c4 t5563: add tests for http.emptyAuth with Negotiate
147: d24bb15 = 147: 1b21688 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path148: 63e941b = 148: 12981bc Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
149: 93b6b30 = 149: f045706 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
150: 6682630 = 150: cb87bdd Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests151: ca040b9 = 151: dde49b7 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
152: fe904b5 = 152: 1814910 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t153: 544667e = 153: 312e21c Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory154: 17f67aa = 154: dd43e65 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
155: 824ea34 = 155: 3fc42ab Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
156: e412d4e = 156: f3be1d8 Merge branch 'optionally-dont-append-atomically-on-windows'
157: a60b592 = 157: a26ee49 Merge branch 'fsync-object-files-always'
158: efaea19 = 158: 16bf03a Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
159: e202630 = 159: f7cc75b Fix Windows version resources (Fix Windows version resources git#4092)
160: 17918f4 = 160: 57948c1 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
161: 2838a1b = 161: dd8d320 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)162: 1b7dc37 = 162: 9798b74 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)163: 7063075 = 163: 3f41f98 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283164: 9b742f0 = 164: ec3c465 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
165: a65cffa = 165: 7771b78 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
166: fe45bd7 = 166: 5c9fad2 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
167: e837552 = 167: cbefd61 Merge branch 'nano-server'
168: 7a0192e = 168: 354ef51 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
169: 777523b = 169: d83d665 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
170: 3260106 = 170: 4ebc762 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
171: a65139c = 171: d162cd6 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
172: dd55c33 = 172: 7c96704 Merge branch 'Fix-i686-build-with-GCC-v14'
173: 6b24d14 = 173: 0336fe5 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
174: c2fe8df = 174: d64da8b Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
175: 2055460 = 175: 3098a5b pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
176: 3eea9bb = 176: 780beea Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
177: f5dedcc = 177: ce0bd67 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
178: 8ca8087 = 178: 2741b77 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
179: 583346b = 179: deecac3 Merge branch 'reftable-vs-custom-allocators'
180: d22a102 = 180: f7121b3 Merge branch 'check-whitespace-only-downstream'
181: fd48820 = 181: a6c589c t/t5571-prep-push-hook.sh: Add test with writing to stderr (t/t5571-prep-push-hook.sh: Add test with writing to stderr git#6063)
182: c336dda = 182: 7b293db Merge branch 'disallow-ntlm-auth-by-default'
183: 69e670d = 183: 9360562 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)184: e7acaac = 184: 62ab0db Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
185: 4b1e7f4 = 185: 5a01b22 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
186: 1758198 = 186: 6d32c15 Merge branch 'ready-for-upstream'
187: b7195c8 = 187: 65a1de3 ci(macos): skip the
git p4tests188: 48e33a9 = 188: b9b83e0 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)189: 65d9f3a = 189: c0f558b Win32: make FILETIME conversion functions public
190: 1975479 = 190: ba64fca Win32: dirent.c: Move opendir down
191: e28770d = 191: b5d9c78 mingw: make the dirent implementation pluggable
192: 2273147 = 192: 75161db Win32: make the lstat implementation pluggable
193: 3aedfb5 = 193: c76e6dc mingw: add infrastructure for read-only file system level caches
194: eeeaa3f = 194: 5578aa3 mingw: add a cache below mingw's lstat and dirent implementations
195: 7c4809a = 195: 4030a57 fscache: load directories only once
196: 349536c = 196: 02569cd fscache: add key for GIT_TRACE_FSCACHE
197: 720c773 = 197: e8e8f05 fscache: remember not-found directories
198: ad1262c = 198: df2e0ee fscache: add a test for the dir-not-found optimization
199: 6c75ee5 = 199: eede534 add: use preload-index and fscache for performance
200: 81cee0a = 200: 0d7b311 dir.c: make add_excludes aware of fscache during status
201: 467f439 = 201: 29d9363 fscache: make fscache_enabled() public
202: 8f93937 = 202: a9e1062 dir.c: regression fix for add_excludes with fscache
203: da36c3c = 203: 8f311ab fetch-pack.c: enable fscache for stats under .git/objects
204: d01eb85 = 204: b0c2959 checkout.c: enable fscache for checkout again
205: 7161b79 = 205: ecec4c5 Enable the filesystem cache (fscache) in refresh_index().
206: 20d2ba6 = 206: a328b61 fscache: use FindFirstFileExW to avoid retrieving the short name
207: 7f91ce2 = 207: edc5db3 fscache: add GIT_TEST_FSCACHE support
210: 91a61bf = 208: 89bd150 git-gui--askyesno: fix funny text wrapping
208: 338b0ee = 209: 3060a78 fscache: add fscache hit statistics
212: 5f7c318 = 210: e3dedc7 git-gui--askyesno (mingw): use Git for Windows' icon, if available
209: 82ad887 = 211: 4e0ed81 unpack-trees: enable fscache for sparse-checkout
214: 3fb249c = 212: 1916127 Merge branch 'git-gui-askyesno'
211: c9d4b3d = 213: ce75a70 status: disable and free fscache at the end of the status command
213: 399244e = 214: c22b7cc mem_pool: add GIT_TRACE_MEMPOOL support
215: 9fa2750 = 215: bc59269 fscache: fscache takes an initial size
216: 55f2e09 = 216: 01fb5e6 fscache: update fscache to be thread specific instead of global
217: dce3f2d = 217: 25ec5ba fscache: teach fscache to use mempool
218: e9afbff = 218: 4c6d701 fscache: make fscache_enable() thread safe
219: 7ae83d4 = 219: 4d14144 fscache: teach fscache to use NtQueryDirectoryFile
220: 8011fd3 = 220: 57ade1d fscache: remember the reparse tag for each entry
221: abdc331 = 221: e2a64db Merge branch 'fscache'
222: bf1a75a = 222: 16e5292 fscache: implement an FSCache-aware is_mount_point()
223: 8edd7a4 = 223: ba9a2be Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
224: 68f9241 = 224: 8f0b551 clean: make use of FSCache
225: 6c15e94 = 225: e41db45 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
226: 22f35ee = 226: d43a50e Merge branch 'dont-clean-junctions-fscache'
227: bdb7b29 = 227: d2cf2ab pack-objects (mingw): demonstrate a segmentation fault with large deltas
228: 825cf35 = 228: a912d91 mingw: support long paths
229: d3bebdf = 229: c037aec win32(long path support): leave drive-less absolute paths intact
230: deeeef1 = 230: 5696230 compat/fsmonitor/fsm-*-win32: support long paths
231: 8470a0d = 231: 48d59a2 clean: suggest using
core.longPathsif paths are too long to remove232: a7f502c = 232: 0b1b23b mingw: Support
git_terminal_promptwith more terminals233: 4e087fc = 233: 3b96e22 compat/terminal.c: only use the Windows console if bash 'read -r' fails
234: f4714db = 234: b2a05aa mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
235: 266d031 = 235: 2717fce Win32: symlink: move phantom symlink creation to a separate function
236: 7ae9183 ! 236: cefeae8 Introduce helper to create symlinks that knows about index_state
237: 2622933 = 237: 3cfa760 mingw: allow to specify the symlink type in .gitattributes
238: 41b140b = 238: 3e8bbfc Win32: symlink: add test for
symlinkattribute239: 4de59df = 239: a5f6969 mingw: explicitly specify with which cmd to prefix the cmdline
240: 0e73be0 = 240: 906d4bf mingw: when path_lookup() failed, try BusyBox
241: 6d4ae9e = 241: 4a0a6ff test-tool: learn to act as a drop-in replacement for
iconv242: d94ecc1 = 242: 8a534c4 tests(mingw): if
iconvis unavailable, usetest-helper --iconv243: bc667af = 243: 24dddd4 gitattributes: mark .png files as binary
244: 2905962 = 244: 28bc2f0 tests: move test PNGs into t/lib-diff/
245: d41acd8 = 245: fe48706 tests: only override sort & find if there are usable ones in /usr/bin/
246: 88faed0 = 246: 1adc965 tests: use the correct path separator with BusyBox
247: fcc67dd = 247: 75cc9bb mingw: only use Bash-ism
builtin pwd -Wwhen available248: 3ad0548 = 248: 1e9be49 tests (mingw): remove Bash-specific pwd option
251: 4b2f02b = 249: 23c5056 mingw: introduce code to detect whether we're inside a Windows container
249: 1070eed = 250: c984567 test-lib: add BUSYBOX prerequisite
253: 7fb46bb = 251: fca5af7 mingw: when running in a Windows container, try to rename() harder
250: 9dbe552 = 252: 7c6e063 t5003: use binary file from t/lib-diff/
255: 15374ba = 253: 709717b mingw: move the file_attr_to_st_mode() function definition
252: c886b5d = 254: 6f437f0 t5532: workaround for BusyBox on Windows
257: 279f741 = 255: e0bb426 mingw: Windows Docker volumes are not symbolic links
254: 7941811 = 256: 2306461 t5605: special-case hardlink test for BusyBox-w32
259: 0ca0b77 = 257: 37daef9 mingw: work around rename() failing on a read-only file
261: 69ec53f = 258: b78ba4e Merge branch 'gitk-and-git-gui-patches'
262: 90dc2d7 = 259: 5c3190c Merge branch 'long-paths'
263: 7c3a910 = 260: e6a05ec Merge branch 'msys2'
264: 87cac95 = 261: da57238 Merge 'docker-volumes-are-no-symlinks'
256: 8c94c26 = 262: c2505fc t5813: allow for $PWD to be a Windows path
265: 06e3864 = 263: 23973fc mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
258: 54086d1 = 264: ab2484b t9200: skip tests when $PWD contains a colon
266: 2a63545 = 265: 27f6946 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
267: a5acc4a = 266: f32ac14 Describe Git for Windows' architecture
268: 03af5a8 = 267: bfdf3dc mingw: kill child processes in a gentler way
260: 6387b79 = 268: 2544d08 mingw: optionally enable wsl compability file mode bits
269: f85748d = 269: 2d15388 Merge branch 'busybox-w32'
270: c3dc1a5 = 270: cbeb116 Modify the Code of Conduct for Git for Windows
271: d99182d = 271: 9af6cba mingw: really handle SIGINT
272: 690c98a = 272: cc0fbc7 Merge branch 'wsl-file-mode-bits'
273: a0839d0 = 273: fcf5cfd CONTRIBUTING.md: add guide for first-time contributors
274: 6e2b87b = 274: d414468 Partially un-revert "editor: save and reset terminal after calling EDITOR"
275: 3650e11 = 275: a1c16b8 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
276: 122d15c = 276: 901cb8e README.md: Add a Windows-specific preamble
277: 8df03b1 = 277: 9dfdf13 reset: reinstate support for the deprecated --stdin option
278: 847f6d7 = 278: d6b880f Merge branch 'un-revert-editor-save-and-reset'
279: 88bd605 = 279: 08a4ec8 Add an issue template
280: ea455fb = 280: 4e4874f Add a GitHub workflow to monitor component updates
281: e03ecde = 281: f38c886 fsmonitor: reintroduce core.useBuiltinFSMonitor
282: c60578c = 282: de9a0dd Merge branch 'phase-out-reset-stdin'
283: 12491d0 = 283: acf97e5 Modify the GitHub Pull Request template (to reflect Git for Windows)
284: 959eba2 = 284: 3308d92 dependabot: help keeping GitHub Actions versions up to date
285: 257b2bb = 285: 01e9273 Merge branch 'deprecate-core.useBuiltinFSMonitor'
286: bdd250b = 286: 611201f SECURITY.md: document Git for Windows' policies
287: 08b1391 = 287: 003b0ec Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
288: df9b169 = 288: b49ecf9 Merge 'readme' into HEAD
289: 06e3c61 = 289: 7cd0410 Add an AGENTS.md file to help with AI-assisted debugging/development
290: 67d22b3 = 290: 14906f3 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
291: 33a43bd = 291: 4e11769 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
292: 25a8151 = 292: 765cb55 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
293: c770ccc = 293: 07420de fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
294: b9ce732 = 294: a6247a1 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
295: d645c71 = 295: e5d0f93 Add an AGENTS.md file to help with AI-assisted debugging/development (Add an AGENTS.md file to help with AI-assisted debugging/development git#6198)
296: b2576b6 = 296: f01ad07 fixup! ci: work around a problem with HTTP/2 vs libcurl v8.10.0
297: 0445f17 = 297: b85aee6 fixup! revision: create mark_trees_uninteresting_dense()
298: 40880a6 = 298: 5e2092f Drop obsolete downstream patches (Drop obsolete downstream patches git#6208)
299: b275ee7 = 299: 986a66d Merge branch 'pr-2097'
300: 7dca141 = 300: 5f61b01 fixup! Add a GitHub workflow to verify that Git/Scalar work in Nano Server
301: f2af517 = 301: e4890f4 Update GitHub Actions versions used in the GitHub workflows (Update GitHub Actions versions used in the GitHub workflows git#6220)
302: 0638d90 = 302: 4fc3198 build: tolerate use of _Generic from glibc 2.43 with Clang
303: 90fc25b = 303: 644b5a8 build: tolerate use of _Generic from glibc 2.43 with Clang (build: tolerate use of _Generic from glibc 2.43 with Clang git#6233)