Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#25241478259)#146
Open
gitforwindowshelper[bot] wants to merge 302 commits intobase/shears/seen-25241478259from
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#25241478259)#146gitforwindowshelper[bot] wants to merge 302 commits intobase/shears/seen-25241478259from
gitforwindowshelper[bot] wants to merge 302 commits intobase/shears/seen-25241478259from
Conversation
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>
This is no longer true in general, not with supporting Clang out of the box. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib` rather than `libexpat.lib`. It appears that the `vcpkg` package for "libexpat" has changed and now creates `libexpatd.lib` for debug mode builds. Previously, both debug and release builds created a ".lib" with the same basename. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
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>
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>
Previously, we did not install any handler for Ctrl+C, but now we really want to because the MSYS2 runtime learned the trick to call the ConsoleCtrlHandler when Ctrl+C was pressed. With this, hitting Ctrl+C while `git log` is running will only terminate the Git process, but not the pager. This finally matches the behavior on Linux and on macOS. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This patch introduces support to set special NTFS attributes that are interpreted by the Windows Subsystem for Linux as file mode bits, UID and GID. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…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>
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>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
…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 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 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
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 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
…opment AGENTS: document learnings from split-index + fsmonitor investigation While investigating a CI failure in the `linux-TEST-vars` job caused by the interaction between the `pt/fsmonitor-linux` and `hn/git-checkout-m-with-stash` topics in `seen`, several debugging techniques proved essential and were not previously documented. The investigation required bisecting the first-parent history of `seen` while temporarily merging the fsmonitor topic at each step. This revealed that `GIT_TEST_SPLIT_INDEX=yes` corrupts the bisect machinery's own index operations unless it is unset before cleanup checkouts. It also revealed that `fprintf(stderr, ...)` instrumentation in Git's C code is swallowed by the test framework, making Trace2 the correct instrumentation approach. A key insight was that the bug appeared Linux-specific only because `linux-TEST-vars` is the sole CI job setting `GIT_TEST_SPLIT_INDEX=yes`; there is no macOS or Windows equivalent. The actual root cause (the `index.skipHash=true` + split-index interaction producing a null `base_oid` in the shared index) is platform-independent. Add four documentation sections capturing these learnings: bisecting `seen` interactions, reproducing with exact CI variables, verifying CI platform coverage before concluding platform-specificity, and using Trace2 for instrumentation inside the test framework. Assisted-by: Claude Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This was marked as a temporary work-around in 4538ee6 (ci: work around a problem with HTTP/2 vs libcurl v8.10.0 (git-for-windows#5165), 2024-09-24), to help CI builds pass even on macOS. The faulty libcurl version has hence been replaced with plenty of fixed ones, therefore this work-around is no longer necessary. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…it-for-windows#6198) AI-assisted contributions are a reality of open source in 2025 and beyond. Contributors will use AI tools, and that includes the maintainers themselves. Over recent months, I have found AI increasingly useful for the kind of menial, tedious work that does not require much creativity but is highly boring when done by hand: resolving merge conflicts during merging-rebases, chasing down CI failures across platforms, adapting downstream patches to upstream API changes. To that end, I would like to have an `AGENTS.md` file in the code base that helps any LLM to understand the context of the project. A secondary goal of this is to preemptively help outside contributors. The risk is not AI usage per se, but low-quality AI slop: contributions where the human hits "accept" without sufficient context being available to the model (and without proper review by the human, we've all been there), resulting in changes that miss conventions, break patterns, or misunderstand the project's architecture. Git's source code is about as legacy as they come, having grown organically over two decades with no design that AI coding models would readily grasp from a narrow code sample alone. This `AGENTS.md` is designed to raise the floor on AI-assisted contributions by providing enough context that even when a human contributor fails to steer carefully, the model has the information it needs to produce something reasonable. It documents the repository structure, build process, test conventions, the object model and ODB internals, debugging techniques (Trace2, instrumenting tests, bisecting failures), the merging-rebase workflow, conflict resolution patterns, coding conventions (ASCII only, 80 columns, tabs), commit message expectations, and the GitGitGadget contribution workflow. This is information that a human might take for granted, but no coding model will have been trained on specifically. Similar `AGENTS.md` files have recently been added to other repositories in the Git for Windows project: [MINGW-packages](git-for-windows/MINGW-packages#194), [git-for-windows.github.io](git-for-windows/git-for-windows.github.io#88) and [msys2-runtime](git-for-windows/msys2-runtime@1e0ff37).
This was a preparatory commit for the path-walk API, which has since been upstreamed into v2.54.0. During the merging-rebase, the code changes this commit introduced were already present in the new base, leaving it empty. Drop it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The downstream NTLM topic (883674c, "t5563: verify that NTLM authentication works") and upstream commit 7e98eb8 ("t5563: add tests for http.emptyAuth with Negotiate") both added SPNEGO tests to the end of t5563. When both topics landed in shears/seen, the SPNEGO tests were duplicated: the first set appears before the NTLM tests (from upstream), the second set after (from the downstream topic). Since GIT_TRACE_CURL appends to the trace file rather than overwriting it, the second set of tests sees the 401 responses from both runs. Test 21 (auto mode) expects 3 lines in trace-auto but finds 6 (3 + 3), and test 22 (false mode) expects 1 but finds 2 (1 + 1), causing all four macOS CI jobs to fail. Remove the duplicate second set; the first (upstream) copy is sufficient. Assisted-by: Claude Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Over time, as upstream Git absorbs fixes and features that originated in or were carried by Git for Windows, downstream patches accumulate that are no longer needed. The steady stream of merged PRs makes this virtually inevitable. This PR collects fixup! commits to drop three such patches during the next autosquash rebase. The HTTP/2 workaround in `t5551` was a temporary fix for a libcurl v8.10.0 regression on macOS CI runners. The faulty libcurl has long been superseded by fixed versions, making it unnecessary. The `unix-socket: avoid leak when initialization fails` patch changed `return -1` to `goto fail` in `unix_stream_connect()` so cleanup would run when `unix_sockaddr_init()` failed. Upstream fixed the same leak more surgically in c5fe29f (unix-socket: fix memory leak when chdir(3p) fails, 2025-01-30) by having `unix_sockaddr_init()` call `FREE_AND_NULL(ctx->orig_dir)` before returning, making the downstream caller-side fix redundant. The `revision: create mark_trees_uninteresting_dense()` commit was a preparatory patch for the path-walk API. That API has since been upstreamed, and this commit became empty during the merging-rebase because its changes were already in the new base.
…s#6215) This PR is a companion of gitgitgadget#2103. On Windows, `maintenance_task_geometric_repack()` opens pack index files via `pack_geometry_init()` (which `mmap()`s the `.idx` files), then spawns `git repack` as a child process without setting `child.odb_to_close`. The parent's `mmap()`s prevent the child from deleting old `.idx` files. On Windows 10 builds before the POSIX delete semantics change (between Build 17134.1304 and 18363.657, see https://stackoverflow.com/a/60512798), this results in `Unlink of file '.git/objects/pack/pack-<hash>.idx' failed. Should I try again?` during fetch-triggered auto-maintenance with the geometric strategy. The fix adds the missing `child.odb_to_close = the_repository->objects` line, matching all other maintenance tasks. The first commit introduces a `GIT_TEST_LEGACY_DELETE` environment variable to simulate legacy (pre-POSIX) delete semantics on modern Windows, so the regression test can verify the fix even on Windows 11. This fixes git-for-windows#6210. Tested-by: Patryk Miś <foss@patrykmis.com>
…erver Bump actions/checkout from v5 to v6 and git-for-windows/setup-git-for-windows-sdk from v1 to v2. Both bumps are Node.js 20 to Node.js 24 runtime migrations with no functional changes to the actions themselves. checkout v6 moves persisted credentials to `` instead of `.git/config`, which does not affect this workflow since no subsequent steps rely on the credential location. The setup-sdk v2 provisions the same minimal SDK as v1. Risk: very low. The only precondition is a recent Actions Runner, which github.com-hosted runners already satisfy. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…windows#6220) This includes gitgitgadget#2097 and a `fixup!` for a workflow that is not upstream (Nano Server).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: seen
From: 779fb62efc (Update GitHub Actions versions used in the GitHub workflows (git-for-windows#6220), 2026-04-30) (08d15c73da..779fb62efc)
Dropped (empty after resolution): 3b415e40cb (Merge branch 'pr-2097', 2026-04-29)
kept actions/checkout@v6 from upstream, preserved setup-git-for-windows-sdk@v2 from patch; both conflicts were trivial v5-vs-v6 checkout version picks
To: 84ba0f0958 (Update GitHub Actions versions used in the GitHub workflows (git-for-windows#6220), 2026-04-30) (8b39952d6e..84ba0f0958)
Statistics
Range-diff (click to expand)
1: fea4616 = 1: 9407317 ci(dockerized): reduce the PID limit for private repositories
2: 1edbe1e = 2: efe0ec2 mingw: skip symlink type auto-detection for network share targets
3: 4594b77 = 3: b9a2a60 Merge branch 'fix-ci'
4: b4c4f4d = 4: da92717 unix-socket: avoid leak when initialization fails
5: ec95f91 = 5: 5f910bc Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: c2a4c44 = 6: 686899c grep: prevent
^$false match at end of file7: 83952a8 = 7: 6af5d19 Merge branch 'v2.53.0.windows.3'
8: 89e77e6 = 8: 22892e5 Merge branch 'fixes-from-the-git-mailing-list'
16: 1871f93 = 9: 00b6a3c vcpkg_install: detect lack of Git
17: 0d663bd = 10: cb1dcde vcpkg_install: add comment regarding slow network connections
18: a8f782e = 11: 988f381 vcbuild: install ARM64 dependencies when building ARM64 binaries
19: aca0b59 = 12: bedaaf5 vcbuild: add an option to install individual 'features'
20: 20c5135 = 13: ef7147f cmake: allow building for Windows/ARM64
21: 4c51d85 = 14: ba54733 mingw: include the Python parts in the build
22: ca41e25 = 15: 93b8fcd ci(vs-build) also build Windows/ARM64 artifacts
23: 9742935 = 16: 34b9182 win32/pthread: avoid name clashes with winpthread
24: eaf600c = 17: b3cecc8 Add schannel to curl installation
26: 1e53c95 = 18: 71e0efd git-compat-util: avoid redeclaring _DEFAULT_SOURCE
27: bff540c = 19: 38b14e8 cmake(): allow setting HOST_CPU for cross-compilation
29: d7bcbb4 = 20: 6987d20 Import the source code of mimalloc v2.2.7
9: 0ba73bc = 21: 78ebfaa t9350: point out that refs are not updated correctly
30: 7893e4e = 22: 06c9283 CMake: default Visual Studio generator has changed
32: 60298a0 = 23: 9dbd170 mimalloc: adjust for building inside Git
10: 3fa194f = 24: 6e4875f transport-helper: add trailing --
33: df15775 = 25: 9f63b19 mingw: demonstrate a
git addissue with NTFS junctions34: 7537700 = 26: 0021f09 .gitignore: add Visual Studio CMakeSetting.json file
36: daf8706 = 27: 13e9a24 mimalloc: offer a build-time option to enable it
37: a1bb95b = 28: 9110e00 t5505/t5516: allow running without
.git/branches/in the templates11: 809df8a = 29: d6233b5 remote-helper: check helper status after import/export
12: 227441a = 30: 1b81313 clean: do not traverse mount points
38: 51d25f1 = 31: d5b9896 strbuf_realpath(): use platform-dependent API if available
39: be924f6 = 32: 916560a http: use new "best effort" strategy for Secure Channel revoke checking
40: 93f35e1 = 33: 21f43da subtree: update
contrib/subtreetesttarget41: 039199d = 34: 0188993 CMakeLists: add default "x64-windows" arch for Visual Studio
45: c22f755 = 35: 32cad38 mingw: use mimalloc
46: 067b9c0 = 36: 88c11fa t5505/t5516: fix white-space around redirectors
25: 87c8944 = 37: 19e5b42 hash-object: demonstrate a >4GB/LLP64 problem
13: 18fd6b3 = 38: ff303b6 Always auto-gc after calling a fast-import transport
14: c761e62 = 39: 2e87a07 mingw: prevent regressions with "drive-less" absolute paths
15: f0861f4 = 40: 295986b clean: remove mount points when possible
48: 8aad95d = 41: b76eb11 transport: optionally disable side-band-64k
49: 66eb480 = 42: 0b22e93 mingw: fix fatal error working on mapped network drives on Windows
50: 2700d63 = 43: 8528562 clink.pl: fix MSVC compile script to handle libcurl-d.lib
51: 9c2d89c = 44: e6cae76 mingw: implement a platform-specific
strbuf_realpath()52: 4f5888c = 45: 5f7cf33 t3701: verify that we can add lots of files interactively
53: 97d7dbb = 46: 2986dac commit: accept "scissors" with CR/LF line endings
54: a9b1566 = 47: a1c5f09 t0014: fix indentation
55: 5c6635b = 48: 25d4c35 git-gui: accommodate for intent-to-add files
56: f872ab5 = 49: 0a26772 mingw: allow for longer paths in
parse_interpreter()57: fdd9904 = 50: 12a5ac4 compat/vcbuild: document preferred way to build in Visual Studio
58: e849803 = 51: 04e273d http: optionally send SSL client certificate
59: 986f41c = 52: 59eb36b ci: run
contrib/subtreetests in CI builds60: cbadf16 = 53: cbd424d CMake: show Win32 and Generator_platform build-option values
68: 3e9f29a = 54: d9d7339 windows: skip linking
git-<command>for built-ins69: 28dcb47 = 55: 411b1ec mingw: stop hard-coding
CC = gcc70: e053793 = 56: 50c0b96 mingw: drop the -D_USE_32BIT_TIME_T option
71: 9d31cbe = 57: 531da7b mingw: only use -Wl,--large-address-aware for 32-bit builds
72: a66d05f = 58: 4810859 mingw: avoid over-specifying
--pic-executable73: 889cf17 = 59: 62bac89 mingw: set the prefix and HOST_CPU as per MSYS2's settings
74: 95cedd1 = 60: 3516eb8 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
75: 5d0864d = 61: 83a0efb mingw: rely on MSYS2's metadata instead of hard-coding it
76: 390948c = 62: 9b7a75d mingw: always define
ETC_*for MSYS2 environments77: 31d74de = 63: cd8795b max_tree_depth: lower it for clang builds in general on Windows
78: 192eefc = 64: 6abffed mingw: ensure valid CTYPE
80: 4366be9 = 65: 6d8f6fa mingw: allow
git.exeto be used instead of the "Git wrapper"82: 5253e99 = 66: f624bb1 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
84: d3fbb1d = 67: 446825d Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
86: 81b9985 = 68: 18622af clink.pl: fix libexpatd.lib link error when using MSVC
88: 28b9802 = 69: 4685ad3 Makefile: clean up .ilk files when MSVC=1
90: 7446ff9 = 70: 27fc486 vcbuild: add support for compiling Windows resource files
28: d726289 = 71: 6aa62f2 object-file.c: use size_t for header lengths
92: 407ee70 = 72: 7ee9a81 config.mak.uname: add git.rc to MSVC builds
47: c4ddd99 = 73: 268a83c MinGW: link as terminal server aware
31: 03f06e3 = 74: fe51681 hash algorithms: use size_t for section lengths
96: e12ea7f = 75: 602ccf9 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
97: 649cc20 = 76: eb46180 http: optionally load libcurl lazily
35: 14f3f91 = 77: 45106ef hash-object --stdin: verify that it works with >4GB/LLP64
101: ee3d4cb = 78: 80dbdba clink.pl: move default linker options for MSVC=1 builds
102: 4ff862b = 79: 84d33d2 http: support lazy-loading libcurl also on Windows
79: a4a8502 = 80: 6dc7e04 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
42: a937b1e = 81: 66d60b0 hash-object: add another >4GB/LLP64 test case
43: b587c22 = 82: c9aa001 setup: properly use "%(prefix)/" when in WSL
44: 5269f79 = 83: ee6adc9 Add config option
windows.appendAtomically106: 990c064 = 84: 45faaee cmake: install headless-git.
107: 766231b = 85: d04e66b http: when loading libcurl lazily, allow for multiple SSL backends
81: 07786ef = 86: f15de87 revision: create mark_trees_uninteresting_dense()
61: 51d253c = 87: 14c98c5 hash-object: add a >4GB/LLP64 test case using filtered input
62: bbc522e = 88: e5ce7d7 compat/mingw.c: do not warn when failing to get owner
63: 46143b2 = 89: 1c99397 mingw: $env:TERM="xterm-256color" for newer OSes
64: 11ef565 = 90: b06327e winansi: check result and Buffer before using Name
65: ac6a06b = 91: 59be933 mingw: change core.fsyncObjectFiles = 1 by default
66: 192bc92 = 92: 93fd3e8 Fix Windows version resources
67: 1c41978 = 93: d4388d7 status: fix for old-style submodules with commondir
111: 5850693 = 94: 7cce6fc git.rc: include winuser.h
112: 88ce879 = 95: 27a79bf mingw: do load libcurl dynamically by default
113: ae530c5 = 96: 2d2615e Add a GitHub workflow to verify that Git/Scalar work in Nano Server
114: 52e63e6 = 97: b48de9e mingw: suggest
windows.appendAtomicallyin more cases115: 90cb7dd = 98: ad7a429 win32: use native ANSI sequence processing, if possible
116: 07faef6 = 99: 71f8005 common-main.c: fflush stdout buffer upon exit
117: 773643c = 100: 65836ab t5601/t7406(mingw): do run tests with symlink support
118: bae9536 = 101: 25ae93e win32: ensure that
localtime_r()is declared even in i686 builds119: e3cfe50 = 102: 9e0937c Fallback to AppData if XDG_CONFIG_HOME is unset
120: c9f96ac = 103: 404f480 run-command: be helpful with Git LFS fails on Windows 7
127: 98566ae = 104: c77441b Merge 'remote-hg-prerequisites' into HEAD
128: 460bb08 = 105: 88ab760 Merge branch 'drive-prefix'
129: a436207 = 106: ec29ebb Merge branch 'dont-clean-junctions'
130: 633051b = 107: d683de9 Merge branch 'msys2-python'
83: ba51757 = 108: 620b460 survey: stub in new experimental 'git-survey' command
131: e966ed8 = 109: 4a85b24 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
85: bb3357a = 110: fae1bee survey: add command line opts to select references
132: 918c661 = 111: 5520668 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
87: 5b724ae = 112: b39bb65 survey: start pretty printing data in table form
133: ef0dfa6 = 113: 52790be Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
89: 07dc24f = 114: d897762 survey: add object count summary
134: cd6c221 = 115: fa8104f Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
91: 75f81f2 = 116: 4cb0b12 survey: summarize total sizes by object type
135: 646f06e = 117: ad55369 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction93: 6c94901 = 118: 427c720 survey: show progress during object walk
94: f6d3e9c = 119: a3401ad mingw: make sure
errnois set correctly when socket operations fail95: 53a8a91 = 120: d693437 t5563: verify that NTLM authentication works
136: c0a5ba9 = 121: a61df71 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
98: 5f00faf = 122: faf7271 survey: add ability to track prioritized lists
99: 866c6c2 = 123: f273ef8 compat/mingw: handle WSA errors in strerror
100: da497f6 = 124: e33a1da http: disallow NTLM authentication by default
137: 27612fe = 125: e3926c2 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
103: 3a3e723 = 126: f9a6650 survey: add report of "largest" paths
104: 83b3ed7 = 127: df077e8 compat/mingw: drop outdated comment
105: 5dc623e = 128: dcab148 http: warn if might have failed because of NTLM
138: e9d0c62 = 129: 3c3eae0 Merge 'add-p-many-files'
108: 5761be0 = 130: 93f1f0d survey: add --top= option and config
109: 401e367 = 131: fbeb4fb t0301: actually test credential-cache on Windows
110: e73ed4f = 132: c8dcc8b credential: advertise NTLM suppression and allow helpers to re-enable
139: 4277ad4 = 133: 845e10a Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
121: 3b86b0d = 134: d34612d survey: clearly note the experimental nature in the output
122: 085e383 = 135: ff62b37 credential-cache: handle ECONNREFUSED gracefully
123: 59a5241 = 136: 67967d0 reftable: do make sure to use custom allocators
124: 1d56b54 = 137: cbd9983 check-whitespace: avoid alerts about upstream commits
125: 9e9ad8b = 138: 27cb24f t/t5571-prep-push-hook.sh: Add test with writing to stderr
126: 4cf636a = 139: df9334a dir: do not traverse mount points
155: a8b44ab = 140: 5346ec9 win32: thread-utils: handle multi-socket systems
156: 75558ba = 141: c350b98 t5563: add tests for http.emptyAuth with Negotiate
140: 811fb14 = 142: 2500824 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
141: ad7ad92 = 143: 93a5476 Merge 'git-gui/js/intent-to-add'
142: 7352df0 = 144: ca4f28e Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
143: b4d5ab8 = 145: a15e763 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
144: dc08089 = 146: 736b99d Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
145: 162c133 = 147: 8dcc5d4 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path146: fbf40ec = 148: 1a2c67a Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
147: 447b4e4 = 149: a12b14f Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
148: cec3d05 = 150: 27278d5 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests149: 607d8cf = 151: 94cad38 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
150: 793886d = 152: a72561e Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t151: 20c2ce8 = 153: d8c5cc6 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory152: b0f6e07 = 154: 3a6d23e Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
153: 76673f0 = 155: 02027d2 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
154: 02ae0dc = 156: 147d586 Merge branch 'optionally-dont-append-atomically-on-windows'
157: f65fc11 = 157: 6e7b7ab Merge branch 'fsync-object-files-always'
158: 19fec8c = 158: dc937df Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
159: 150769e = 159: a28243b Fix Windows version resources (Fix Windows version resources git#4092)
160: 257e4f4 = 160: c309143 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
161: e9f321d = 161: e4f5802 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)162: 5adc862 = 162: c72a88d Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)163: b5cf7bb = 163: a15205a Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283164: 186acc6 = 164: 8c1615e Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
165: 1567674 = 165: c708635 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
166: b1d960b = 166: 077fd9c Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
167: b98e13f = 167: 417c46b Merge branch 'nano-server'
168: c21faa9 = 168: c895afe Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
169: 74c6cc4 = 169: 67c1e45 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
170: da1a7ac = 170: 3310c11 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
171: 66214ff = 171: 51a35f6 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
172: db7be16 = 172: 7961ade Merge branch 'Fix-i686-build-with-GCC-v14'
173: 7c2bf5d = 173: e71ff89 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
174: 4a1d138 = 174: 230febd Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
175: 8eb9a1b = 175: 29bb8b2 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
176: 37cd1b4 = 176: 61bf847 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
177: 22e3d9b = 177: 6f4c9f7 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
178: a04d47f = 178: 666300a credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
179: 7c6f8a4 = 179: a337eca Merge branch 'reftable-vs-custom-allocators'
180: 929a0e6 = 180: 918b8c2 Merge branch 'check-whitespace-only-downstream'
181: 4a90c97 = 181: a2fb969 t/t5571-prep-push-hook.sh: Add test with writing to stderr (t/t5571-prep-push-hook.sh: Add test with writing to stderr git#6063)
182: bd0a985 = 182: 5234b95 Merge branch 'disallow-ntlm-auth-by-default'
183: e2803c7 = 183: 9c1396b Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)184: 730e41b = 184: 70d1f34 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
185: 5d911a3 = 185: ae7ce16 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
186: bec1c67 = 186: 6058cc9 Merge branch 'ready-for-upstream'
187: 9bc87ba = 187: c319c10 ci(macos): skip the
git p4tests188: 7d4fe15 = 188: d79077e ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)190: f12f04c = 189: 5032cb5 Win32: make FILETIME conversion functions public
191: fc091a5 = 190: be37685 Win32: dirent.c: Move opendir down
192: 50d8473 = 191: 60139b9 mingw: make the dirent implementation pluggable
193: cf66bf8 = 192: 8551e65 Win32: make the lstat implementation pluggable
194: 2bd0477 = 193: 4c56aaa mingw: add infrastructure for read-only file system level caches
195: 47005dd = 194: f8264f2 mingw: add a cache below mingw's lstat and dirent implementations
196: 5e4d02c = 195: 49cd4bb fscache: load directories only once
189: bc19b93 = 196: 59b6b08 git-gui--askyesno: fix funny text wrapping
197: c9a962d = 197: 7f73bf4 fscache: add key for GIT_TRACE_FSCACHE
242: d80604e = 198: 76579f3 git-gui--askyesno (mingw): use Git for Windows' icon, if available
198: 2b98999 = 199: 23dab98 fscache: remember not-found directories
245: 8a35816 = 200: 769980b Merge branch 'git-gui-askyesno'
199: 76918fb = 201: 430ff83 fscache: add a test for the dir-not-found optimization
200: 007817e = 202: 91cd8a4 add: use preload-index and fscache for performance
201: 6ad0866 = 203: 29eee6e dir.c: make add_excludes aware of fscache during status
202: 185f6d2 = 204: 9776290 fscache: make fscache_enabled() public
203: c5013df = 205: 889e112 dir.c: regression fix for add_excludes with fscache
204: 3593bc7 = 206: 1368e35 fetch-pack.c: enable fscache for stats under .git/objects
205: 2a294ea = 207: 82a874c checkout.c: enable fscache for checkout again
206: cc30a21 = 208: 9c9b1f1 Enable the filesystem cache (fscache) in refresh_index().
207: 8002110 = 209: 105f197 fscache: use FindFirstFileExW to avoid retrieving the short name
208: 4129906 = 210: cfcd991 fscache: add GIT_TEST_FSCACHE support
209: cefa12d = 211: 259fb6e fscache: add fscache hit statistics
210: 47eff31 = 212: f4a44d6 unpack-trees: enable fscache for sparse-checkout
211: c2fb591 = 213: 95106d4 status: disable and free fscache at the end of the status command
212: d52ccd3 = 214: 45fdc5b mem_pool: add GIT_TRACE_MEMPOOL support
213: 3a0a73c = 215: 98681f5 fscache: fscache takes an initial size
214: ab3c13f = 216: ffb57a8 fscache: update fscache to be thread specific instead of global
215: 6ffd7ee = 217: a3620b3 fscache: teach fscache to use mempool
216: cd9c5f6 = 218: 0966668 fscache: make fscache_enable() thread safe
217: d12a70c = 219: 3a8fc18 fscache: teach fscache to use NtQueryDirectoryFile
218: cd3c598 = 220: b545adf fscache: remember the reparse tag for each entry
219: f2d8d3f = 221: d687909 Merge branch 'fscache'
220: 7616aa3 = 222: 81b3783 fscache: implement an FSCache-aware is_mount_point()
221: 2002831 = 223: 95639b8 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
222: faa6230 = 224: b7d1e84 clean: make use of FSCache
223: 8026167 = 225: f5429db Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
224: 8765db0 = 226: 543bb50 Merge branch 'dont-clean-junctions-fscache'
225: de85c70 = 227: b48171f pack-objects (mingw): demonstrate a segmentation fault with large deltas
226: ea75610 ! 228: 2d86bd6 mingw: support long paths
227: 4978f94 = 229: 52192e5 win32(long path support): leave drive-less absolute paths intact
228: 1f21b9c = 230: 10c9968 compat/fsmonitor/fsm-*-win32: support long paths
229: dc238a9 = 231: 264b185 clean: suggest using
core.longPathsif paths are too long to remove230: 1da388e = 232: 8672451 mingw: Support
git_terminal_promptwith more terminals231: 472d25a = 233: 1e324e7 compat/terminal.c: only use the Windows console if bash 'read -r' fails
232: 1bf8a02 = 234: 893412b mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
233: 33b0735 = 235: a2142f4 Win32: symlink: move phantom symlink creation to a separate function
234: 822ced4 = 236: 4b77855 Introduce helper to create symlinks that knows about index_state
235: 7e7f61a = 237: 5069d22 mingw: allow to specify the symlink type in .gitattributes
237: 1b23396 = 238: 2af100e Win32: symlink: add test for
symlinkattribute239: 1795496 = 239: 15600eb mingw: explicitly specify with which cmd to prefix the cmdline
241: 04bb6ed = 240: 274d303 mingw: when path_lookup() failed, try BusyBox
244: 5ab8aef = 241: 1ef1f9e test-tool: learn to act as a drop-in replacement for
iconv236: b60b9e0 = 242: c894dc7 mingw: introduce code to detect whether we're inside a Windows container
247: 2ea6bc5 = 243: a17cb7f tests(mingw): if
iconvis unavailable, usetest-helper --iconv238: 40e1eb2 = 244: 78e3873 mingw: when running in a Windows container, try to rename() harder
248: b91b3a2 = 245: b25f712 gitattributes: mark .png files as binary
240: d3e9d6b = 246: cd3527e mingw: move the file_attr_to_st_mode() function definition
249: af43afd = 247: 2823a2d tests: move test PNGs into t/lib-diff/
243: 5917cf2 = 248: 92e6264 mingw: Windows Docker volumes are not symbolic links
250: b51e21e = 249: 38897d1 tests: only override sort & find if there are usable ones in /usr/bin/
246: d8db7a2 = 250: 32188fa mingw: work around rename() failing on a read-only file
251: bd8111a = 251: d183c66 tests: use the correct path separator with BusyBox
252: ca6d121 = 252: 0a9c80a mingw: only use Bash-ism
builtin pwd -Wwhen available253: 59e0647 = 253: 29c7a0b tests (mingw): remove Bash-specific pwd option
254: 0d8294e = 254: 6de409a test-lib: add BUSYBOX prerequisite
255: 8a58896 = 255: 48b39d8 Merge branch 'gitk-and-git-gui-patches'
256: 69e1ada = 256: e8ab076 t5003: use binary file from t/lib-diff/
257: fa43016 = 257: f295238 Merge branch 'long-paths'
258: 79a4485 = 258: 40d7757 t5532: workaround for BusyBox on Windows
259: fe3cc91 = 259: 952b31c Merge branch 'msys2'
262: 5f18a94 = 260: b200ca3 Describe Git for Windows' architecture
260: cc21a3b = 261: 5589dc0 t5605: special-case hardlink test for BusyBox-w32
261: 217de80 = 262: 426a0ca Merge 'docker-volumes-are-no-symlinks'
265: 068489f = 263: 0bd5867 Modify the Code of Conduct for Git for Windows
263: 912ca40 = 264: f9954d1 t5813: allow for $PWD to be a Windows path
264: df41273 = 265: 283c70a mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
268: 18c39bb = 266: d9cd869 CONTRIBUTING.md: add guide for first-time contributors
266: d078580 = 267: 771f9f1 t9200: skip tests when $PWD contains a colon
267: f51a1bf = 268: 546e690 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
272: 3dda3ee = 269: 880c821 README.md: Add a Windows-specific preamble
269: ec91e92 = 270: cd650d3 mingw: kill child processes in a gentler way
270: a8239fa = 271: 036ea35 mingw: optionally enable wsl compability file mode bits
271: 899be28 = 272: 9f67e6e Merge branch 'busybox-w32'
275: bf81f12 = 273: 46332d5 Add an issue template
273: 05e7d11 = 274: 873cc1c mingw: really handle SIGINT
274: a50b6e8 = 275: 8d072b2 Merge branch 'wsl-file-mode-bits'
278: d47f0ba = 276: ee6f7e9 Add a GitHub workflow to monitor component updates
279: 187295e = 277: fecdb83 Modify the GitHub Pull Request template (to reflect Git for Windows)
276: ae8a769 = 278: 66c3bd9 Partially un-revert "editor: save and reset terminal after calling EDITOR"
277: 959aa35 = 279: 034f118 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
280: 1bf210a = 280: cc534f7 reset: reinstate support for the deprecated --stdin option
282: 17a9372 = 281: b44fe87 fsmonitor: reintroduce core.useBuiltinFSMonitor
283: 02fd9a8 = 282: 27e169a dependabot: help keeping GitHub Actions versions up to date
284: 9d49daa = 283: 45033a3 SECURITY.md: document Git for Windows' policies
281: 28a0635 = 284: a82ab84 Merge branch 'un-revert-editor-save-and-reset'
285: 5c9c30d = 285: d549587 Merge branch 'phase-out-reset-stdin'
286: 5c6aabc = 286: dfcf92c Merge branch 'deprecate-core.useBuiltinFSMonitor'
287: f9272ab = 287: 85d4a7c Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
288: 99ec3dd = 288: c5d316a Merge 'readme' into HEAD
289: 1a497f4 = 289: 1f2014a Add an AGENTS.md file to help with AI-assisted debugging/development
290: 4a207fa = 290: e5e7bd9 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
291: bd85beb = 291: 655e3bd fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
292: 4f2c6a6 = 292: 015b4e5 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
293: 976f777 = 293: 8e3732d fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
294: fd47802 = 294: de8af34 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
295: b5bc25f = 295: 23e0664 Add an AGENTS.md file to help with AI-assisted debugging/development (Add an AGENTS.md file to help with AI-assisted debugging/development git#6198)
296: 534e975 = 296: 0dd34ab ??? t5563: add tests for http.emptyAuth with Negotiate
297: 717bcc4 = 297: f84fbdb fixup! ci: work around a problem with HTTP/2 vs libcurl v8.10.0
298: d38ad5f = 298: 63b689b fixup! revision: create mark_trees_uninteresting_dense()
299: b402c25 = 299: 94aa4bf Drop obsolete downstream patches (Drop obsolete downstream patches git#6208)
-: ---------- > 300: 6c2a94b maintenance(geometric): avoid deadlocks on Windows 10 (maintenance(geometric): avoid deadlocks on Windows 10 git#6215)
-: ---------- > 301: 91aaed1 fixup! Add a GitHub workflow to verify that Git/Scalar work in Nano Server
-: ---------- > 302: 84ba0f0 Update GitHub Actions versions used in the GitHub workflows (Update GitHub Actions versions used in the GitHub workflows git#6220)