Rebase shears/main: 8 conflict(s) (1 skipped, 7 resolved) (#26381543924)#199
Open
gitforwindowshelper[bot] wants to merge 303 commits into
Open
Rebase shears/main: 8 conflict(s) (1 skipped, 7 resolved) (#26381543924)#199gitforwindowshelper[bot] wants to merge 303 commits into
gitforwindowshelper[bot] wants to merge 303 commits into
Conversation
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 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>
The intention of this change is to align with how the top-level git `Makefile` defines its own test target (which also internally calls `$(MAKE) -C t/ all`). This change also ensures the consistency of `make -C contrib/subtree test` with other testing in CI executions (which rely on `$DEFAULT_TEST_TARGET` being defined as `prove`). Signed-off-by: Victoria Dye <vdye@github.com>
In Git-for-Windows, work on using ARM64 has progressed. The commit 2d94b77 (cmake: allow building for Windows/ARM64, 2020-12-04) failed to notice that /compat/vcbuild/vcpkg_install.bat will default to using the "x64-windows" architecture for the vcpkg installation if not set, but CMake is not told of this default. Commit 635b6d9 (vcbuild: install ARM64 dependencies when building ARM64 binaries, 2020-01-31) later updated vcpkg_install.bat to accept an arch (%1) parameter, but retained the default. This default is neccessary for the use case where the project directory is opened directly in Visual Studio, which will find and build a CMakeLists.txt file without any parameters, thus expecting use of the default setting. Also Visual studio will generate internal .sln solution and .vcxproj project files needed for some extension tools. Inform users of the additional .sln/.vcxproj generation. ** How to test: rm -rf '.vs' # remove old visual studio settings rm -rf 'compat/vcbuild/vcpkg' # remove any vcpkg downloads rm -rf 'contrib/buildsystems/out' # remove builds & CMake artifacts with a fresh Visual Studio Community Edition, File>>Open>>(git *folder*) to load the project (which will take some time!). check for successful compilation. The implicit .sln (etc.) are in the hidden .vs directory created by Visual Studio. Signed-off-by: Philip Oakley <philipoakley@iee.email>
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>
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>
We used to have that `make vcxproj` hack, but a hack it is. In the meantime, we have a much cleaner solution: using CMake, either explicitly, or even more conveniently via Visual Studio's built-in CMake support (simply open Git's top-level directory via File>Open>Folder...). Let's let the `README` reflect this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This adds support for a new http.sslAutoClientCert config value. In cURL 7.77 or later the schannel backend does not automatically send client certificates from the Windows Certificate Store anymore. This config value is only used if http.sslBackend is set to "schannel", and can be used to opt in to the old behavior and force cURL to send client certificates. This fixes git-for-windows#3292 Signed-off-by: Pascal Muller <pascalmuller@gmail.com>
Because `git subtree` (unlike most other `contrib` modules) is included as part of the standard release of Git for Windows, its stability should be verified as consistently as it is for the rest of git. By including the `git subtree` tests in the CI workflow, these tests are as much of a gate to merging and indicator of stability as the standard test suite. Signed-off-by: Victoria Dye <vdye@github.com>
Ensure key CMake option values are part of the CMake output to facilitate user support when tool updates impact the wider CMake actions, particularly ongoing 'improvements' in Visual Studio. These CMake displays perform the same function as the build-options.txt provided in the main Git for Windows. CMake is already chatty. The setting of CMAKE_EXPORT_COMPILE_COMMANDS is also reported. Include the environment's CMAKE_EXPORT_COMPILE_COMMANDS value which may have been propogated to CMake's internal value. Testing the CMAKE_EXPORT_COMPILE_COMMANDS processing can be difficult in the Visual Studio environment, as it may be cached in many places. The 'environment' may include the OS, the user shell, CMake's own environment, along with the Visual Studio presets and caches. See previous commit for arefacts that need removing for a clean test. Signed-off-by: Philip Oakley <philipoakley@iee.email>
To verify that the `clean` side of the `clean`/`smudge` filter code is correct with regards to LLP64 (read: to ensure that `size_t` is used instead of `unsigned long`), here is a test case using a trivial filter, specifically _not_ writing anything to the object store to limit the scope of the test case. As in previous commits, the `big` file from previous test cases is reused if available, to save setup time, otherwise re-generated. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
From the documentation of said setting: This boolean will enable fsync() when writing object files. This is a total waste of time and effort on a filesystem that orders data writes properly, but can be useful for filesystems that do not use journalling (traditional UNIX filesystems) or that only journal metadata and not file contents (OS X’s HFS+, or Linux ext3 with "data=writeback"). The most common file system on Windows (NTFS) does not guarantee that order, therefore a sudden loss of power (or any other event causing an unclean shutdown) would cause corrupt files (i.e. files filled with NULs). Therefore we need to change the default. Note that the documentation makes it sound as if this causes really bad performance. In reality, writing loose objects is something that is done only rarely, and only a handful of files at a time. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Whith Windows 2000, Microsoft introduced a flag to the PE header to mark executables as "terminal server aware". Windows terminal servers provide a redirected Windows directory and redirected registry hives when launching legacy applications without this flag set. Since we do not use any INI files in the Windows directory and don't write to the registry, we don't need this additional preparation. Telling the OS that we don't need this should provide slightly improved startup times in terminal server environments. When building for supported Windows Versions with MSVC the /TSAWARE linker flag is automatically set, but MinGW requires us to set the --tsaware flag manually. This partially addresses git-for-windows#3935. Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Add FileVersion, which is a required field As not all required fields were present, none were being included Fixes git-for-windows#4090 Signed-off-by: Kiel Hurley <kielhurley@gmail.com>
In f9b7573 (repository: free fields before overwriting them, 2017-09-05), Git was taught to release memory before overwriting it, but 357a03e (repository.c: move env-related setup code back to environment.c, 2018-03-03) changed the code so that it would not _always_ be overwritten. As a consequence, the `commondir` attribute would point to already-free()d memory. This seems not to cause problems in core Git, but there are add-on patches in Git for Windows where the `commondir` attribute is subsequently used and causing invalid memory accesses e.g. in setups containing old-style submodules (i.e. the ones with a `.git` directory within theirs worktrees) that have `commondir` configured. This fixes git-for-windows#4083. Signed-off-by: Andrey Zabavnikov <zabavnikov@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is merely a historical wart that, say, `git-commit` exists in the `libexec/git-core/` directory, a tribute to the original idea to let Git be essentially a bunch of Unix shell scripts revolving around very few "plumbing" (AKA low-level) commands. Git has evolved a lot from there. These days, most of Git's functionality is contained within the `git` executable, in the form of "built-in" commands. To accommodate for scripts that use the "dashed" form of Git commands, even today, Git provides hard-links that make the `git` executable available as, say, `git-commit`, just in case that an old script has not been updated to invoke `git commit`. Those hard-links do not come cheap: they take about half a minute for every build of Git on Windows, they are mistaken for taking up huge amounts of space by some Windows Explorer versions that do not understand hard-links, and therefore many a "bug" report had to be addressed. The "dashed form" has been officially deprecated in Git version 1.5.4, which was released on February 2nd, 2008, i.e. a very long time ago. This deprecation was never finalized by skipping these hard-links, but we can start the process now, in Git for Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When 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>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
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>
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>
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>
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>
This was pull request git-for-windows#1645 from ZCube/master Support windows container. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ws#4527) With this patch, Git for Windows works as intended on mounted APFS volumes (where renaming read-only files would fail). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Specify symlink type in .gitattributes
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>
Handle Ctrl+C in Git Bash nicely Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In this time and age, AI is everywhere. However, it's sometimes not very easy to use. For green-field projects it works quite a bit better than for existing legacy projects. And Git's source code is _quite_ as legacy code as they come... 😁 Now, the only way how AI can be used efficiently with legacy code is by providing enough information by way of prompt context for the AI to have a chance to make any sense of the code. The structure and the architecture is, after all, not designed for AI, but rather the opposite: By virtue of having grown organically over two decades, there is no design that AI coding models would readily grasp. So here is a document that describes all kinds of aspects about this project. The idea is to help AI by providing information that it does not have ingrained in its weights. The idea is to provide information that a human prompter might take for granted, but no coding model will have been trained on specifically. Assisted-by: Claude Opus 4.5 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…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
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
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 was a preparatory commit for the path-walk API, which has since been upstreamed into v2.54.0. During the merging-rebase, the code changes this commit introduced were already present in the new base, leaving it empty. Drop it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…it-for-windows#6198) AI-assisted contributions are a reality of open source in 2025 and beyond. Contributors will use AI tools, and that includes the maintainers themselves. Over recent months, I have found AI increasingly useful for the kind of menial, tedious work that does not require much creativity but is highly boring when done by hand: resolving merge conflicts during merging-rebases, chasing down CI failures across platforms, adapting downstream patches to upstream API changes. To that end, I would like to have an `AGENTS.md` file in the code base that helps any LLM to understand the context of the project. A secondary goal of this is to preemptively help outside contributors. The risk is not AI usage per se, but low-quality AI slop: contributions where the human hits "accept" without sufficient context being available to the model (and without proper review by the human, we've all been there), resulting in changes that miss conventions, break patterns, or misunderstand the project's architecture. Git's source code is about as legacy as they come, having grown organically over two decades with no design that AI coding models would readily grasp from a narrow code sample alone. This `AGENTS.md` is designed to raise the floor on AI-assisted contributions by providing enough context that even when a human contributor fails to steer carefully, the model has the information it needs to produce something reasonable. It documents the repository structure, build process, test conventions, the object model and ODB internals, debugging techniques (Trace2, instrumenting tests, bisecting failures), the merging-rebase workflow, conflict resolution patterns, coding conventions (ASCII only, 80 columns, tabs), commit message expectations, and the GitGitGadget contribution workflow. This is information that a human might take for granted, but no coding model will have been trained on specifically. Similar `AGENTS.md` files have recently been added to other repositories in the Git for Windows project: [MINGW-packages](git-for-windows/MINGW-packages#194), [git-for-windows.github.io](git-for-windows/git-for-windows.github.io#88) and [msys2-runtime](git-for-windows/msys2-runtime@1e0ff37).
Over time, as upstream Git absorbs fixes and features that originated in or were carried by Git for Windows, downstream patches accumulate that are no longer needed. The steady stream of merged PRs makes this virtually inevitable. This PR collects fixup! commits to drop three such patches during the next autosquash rebase. The HTTP/2 workaround in `t5551` was a temporary fix for a libcurl v8.10.0 regression on macOS CI runners. The faulty libcurl has long been superseded by fixed versions, making it unnecessary. The `unix-socket: avoid leak when initialization fails` patch changed `return -1` to `goto fail` in `unix_stream_connect()` so cleanup would run when `unix_sockaddr_init()` failed. Upstream fixed the same leak more surgically in c5fe29f (unix-socket: fix memory leak when chdir(3p) fails, 2025-01-30) by having `unix_sockaddr_init()` call `FREE_AND_NULL(ctx->orig_dir)` before returning, making the downstream caller-side fix redundant. The `revision: create mark_trees_uninteresting_dense()` commit was a preparatory patch for the path-walk API. That API has since been upstreamed, and this commit became empty during the merging-rebase because its changes were already in the new base.
This corresponds to gitgitgadget#2097.
…erver Bump actions/checkout from v5 to v6 and git-for-windows/setup-git-for-windows-sdk from v1 to v2. Both bumps are Node.js 20 to Node.js 24 runtime migrations with no functional changes to the actions themselves. checkout v6 moves persisted credentials to `` instead of `.git/config`, which does not affect this workflow since no subsequent steps rely on the credential location. The setup-sdk v2 provisions the same minimal SDK as v1. Risk: very low. The only precondition is a recent Actions Runner, which github.com-hosted runners already satisfy. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When building with `make DEVELOPER=1` we explicitly pass "-std=gnu99" to
the compiler so that we don't start leaning on features exposed by more
recent versions of the C standard. Unfortunately though, glibc 2.43
started to use type-generic expressions. This works alright with GCC,
but when compiling with Clang this leads to errors:
$ make DEVELOPER=1 CC=clang
CC daemon.o
In file included from daemon.c:3:
./git-compat-util.h:344:11: error: '_Generic' is a C11 extension [-Werror,-Wc11-extensions]
344 | return !!strchr(path, '/');
| ^
/usr/include/string.h:265:3: note: expanded from macro 'strchr'
265 | __glibc_const_generic (S, const char *, strchr (S, C))
| ^
/usr/include/x86_64-linux-gnu/sys/cdefs.h:838:3: note: expanded from macro '__glibc_const_generic'
838 | _Generic (0 ? (PTR) : (void *) 1, \
| ^
In theory, the `__glibc_const_generic` macro does have feature gating:
#if !defined __cplusplus \
&& (__GNUC_PREREQ (4, 9) \
|| __glibc_has_extension (c_generic_selections) \
|| (!defined __GNUC__ && defined __STDC_VERSION__ \
&& __STDC_VERSION__ >= 201112L))
# define __HAVE_GENERIC_SELECTION 1
#else
# define __HAVE_GENERIC_SELECTION 0
#endif
But this feature gating isn't effective because `_has_extension()` will
always evaluate to true as C generics _are_ available as a language
extension to GNU C99 when using Clang. This would have been different if
`_has_feature()` was used instead, in which case it would have properly
evaluated to `false`.
Unfortunately, there is no easy way for us to work around the warning.
We cannot define `__HAVE_GENERIC_SELECTION` ourselves as that would lead
to a redefinition, and given that the conditions are or'd together we
cannot disable any of those, either.
Instead, work around the issue by not using -std=gnu99 with Clang when
using the Makefile and by disabling warnings about C11 extensions when
using Meson. This isn't ideal, but we at least retain the ability to
detect the (mis-)use of features from newer standards with GCC.
An alternative to this might be to simply bump the required C standard
to C11, which is 15 years old by now and should have support on most
platforms out there. But some more esoteric platforms may not have it.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…windows#6220) This includes gitgitgadget#2097 and a `fixup!` for a workflow that is not upstream (Nano Server).
…indows#6233) The `linux-{asan-ubsan,sha256,reftable}` jobs run inside `ubuntu:rolling`, which now resolves to Ubuntu 26.04 with glibc 2.43; that pulls `_Generic` into `<sys/cdefs.h>` and breaks our `-std=gnu99 -Werror` Clang builds. Concrete failure: https://github.com/git-for-windows/git/actions/runs/25390480083/job/74463338845. Picking up Patrick Steinhardt's fix from https://lore.kernel.org/git/20260505-b4-pks-ci-tolerate-glibc-generic-v1-1-5786386fe512@pks.im/ ahead of its upstream merge so the GfW CI goes green again. The diff conflicts with `fe5704a3695c "mimalloc: offer a build-time option to enable it"`, which wraps the affected `config.mak.dev` block in `ifndef USE_MIMALLOC`; the resolution preserves that wrap on the `gcc6`-only branch surviving Patrick's patch. `meson.build` auto-merged.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: main
From: a99c60ceeb (build: tolerate use of _Generic from glibc 2.43 with Clang (git-for-windows#6233), 2026-05-08) (c2ed2cc6f6..a99c60ceeb)
Resolved: 75b3e59 (mingw: include the Python parts in the build, 2015-02-16)
added NO_PYTHON= without the removed USE_NED_ALLOCATOR block that upstream dropped
Range-diff
1: 75b3e59 ! 1: fe1c406 mingw: include the Python parts in the build
Resolved: 3d05079 (mimalloc: offer a build-time option to enable it, 2019-06-24)
accepted mimalloc and nedmalloc additions from patch into upstream's Makefile (trivial add-only conflicts)
Range-diff
1: 3d05079 ! 1: 6e4bbf9 mimalloc: offer a build-time option to enable it
Resolved: 9f7d454 (mingw: use mimalloc, 2019-06-24)
added USE_MIMALLOC=YesPlease after upstream removed the old USE_NED_ALLOCATOR block
Range-diff
1: 9f7d454 ! 1: 33f14ec mingw: use mimalloc
Resolved: 70d9955 (mingw: rely on MSYS2's metadata instead of hard-coding it, 2025-11-21)
resolved by removing USE_NED_ALLOCATOR (upstream's change) while applying platform-specific ENSURE_MSYSTEM_IS_SET/MINGW_PREFIX definitions (patch's intent)
Range-diff
1: 70d9955 ! 1: 296470c mingw: rely on MSYS2's metadata instead of hard-coding it
Resolved: 1558b5f (t5563: verify that NTLM authentication works, 2025-11-26)
kept both upstream SPNEGO tests and downstream NTLM test, placing NTLM after SPNEGO at end of file
Range-diff
1: 1558b5f ! 1: ce8b1c2 t5563: verify that NTLM authentication works
Skipped: ff779ba (http: extract http_reauth_prepare() from retry paths, 2026-04-13)
Upstream equivalent: a8faa7a (http: extract http_reauth_prepare() from retry paths, 2026-04-16)
Range-diff
1: ff779ba ! 1: a8faa7a http: extract http_reauth_prepare() from retry paths
@@ Commit message No functional change. Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com> + Signed-off-by: Junio C Hamano <gitster@pobox.com> ## http.c ## @@ http.c: static void init_curl_http_auth(CURL *result) @@ http.c: static int http_request_recoverable(const char *url, + http_reauth_prepare(1); } - /* + ret = http_request(url, result, target, options); ## http.h ## @@ http.h: extern int http_is_verbose;Resolved: 87a237e (mingw: add a cache below mingw's lstat and dirent implementations, 2013-10-01)
added compat/win32/fscache.c to CMakeLists.txt without nedmalloc (removed upstream)
Range-diff
1: 87a237e ! 1: 75e1022 mingw: add a cache below mingw's lstat and dirent implementations
Resolved: 6a598fe (mingw: optionally enable wsl compability file mode bits, 2023-06-07)
added compat/win32/wsl.c, dropped nedmalloc line removed upstream
Range-diff
1: 6a598fe ! 1: 718b30a mingw: optionally enable wsl compability file mode bits
To: dbce1c7cd4 (build: tolerate use of _Generic from glibc 2.43 with Clang (git-for-windows#6233), 2026-05-08) (af02d4239f..dbce1c7cd4)
Statistics
Range-diff (click to expand)
1: 6f02b25 = 1: 5d642c5 ci(dockerized): reduce the PID limit for private repositories
2: 9ca3a31 = 2: 94342fb mingw: skip symlink type auto-detection for network share targets
3: d9a66d5 = 3: 2c6fc14 Merge branch 'fix-ci'
4: 4518895 = 4: 936bf06 unix-socket: avoid leak when initialization fails
5: a7e9382 = 5: c2e41b6 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: dc63ded = 6: 567dfe4 grep: prevent
^$false match at end of file7: 7fbe582 = 7: ca47b9c Merge branch 'v2.53.0.windows.3'
8: aa16116 = 8: 7ef7c37 Merge branch 'fixes-from-the-git-mailing-list'
9: c37705b = 9: 3ceed00 t9350: point out that refs are not updated correctly
10: 12e2010 = 10: 85184f5 transport-helper: add trailing --
11: 7414033 = 11: e212143 remote-helper: check helper status after import/export
36: 2bcbec0 = 12: 14b1266 clean: do not traverse mount points
12: 2d51b3a = 13: cc10467 Always auto-gc after calling a fast-import transport
13: 020e6b6 = 14: fcc33b9 mingw: prevent regressions with "drive-less" absolute paths
45: a8dfa81 = 15: 8c47dd1 clean: remove mount points when possible
-: ---------- > 16: fe1c406 mingw: include the Python parts in the build
21: eaefc8e = 17: 511cc70 win32/pthread: avoid name clashes with winpthread
24: 2a63b5a = 18: 4f7d857 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
27: db3d9f1 = 19: 3a6afdb Import the source code of mimalloc v2.2.7
30: 6e676b5 = 20: b2f441d mimalloc: adjust for building inside Git
34: 3d05079 ! 21: 6e4bbf9 mimalloc: offer a build-time option to enable it
14: e4380f8 = 22: 5ed800f vcpkg_install: detect lack of Git
15: 00efe1f = 23: 50948b9 vcpkg_install: add comment regarding slow network connections
16: 39d0de6 = 24: 7b106f2 vcbuild: install ARM64 dependencies when building ARM64 binaries
17: 42881a6 = 25: 4f8bd68 vcbuild: add an option to install individual 'features'
18: 4e0f2c7 = 26: 8662038 cmake: allow building for Windows/ARM64
19: 75b3e59 < -: ---------- mingw: include the Python parts in the build
20: fcb5a6e = 27: 19edc22 ci(vs-build) also build Windows/ARM64 artifacts
31: c09a1b7 = 28: fb323cc mingw: demonstrate a
git addissue with NTFS junctions22: 09bcf5b = 29: ac3537b Add schannel to curl installation
35: 1685552 = 30: 3d271bf t5505/t5516: allow running without
.git/branches/in the templates37: 6902a17 = 31: 3e7df65 strbuf_realpath(): use platform-dependent API if available
43: 9f7d454 ! 32: 33f14ec mingw: use mimalloc
25: 33844a3 = 33: 9404992 cmake(): allow setting HOST_CPU for cross-compilation
38: 42aa598 = 34: 0490d8d http: use new "best effort" strategy for Secure Channel revoke checking
44: 555d8cb = 35: fc0ceac t5505/t5516: fix white-space around redirectors
46: b43d783 = 36: 1e9f131 transport: optionally disable side-band-64k
47: afa7016 = 37: e49ec9d mingw: fix fatal error working on mapped network drives on Windows
48: f46cc5a = 38: 878a25d clink.pl: fix MSVC compile script to handle libcurl-d.lib
49: e2c8ebf = 39: dc14e67 mingw: implement a platform-specific
strbuf_realpath()50: ba4a08f = 40: 2c4ba23 t3701: verify that we can add lots of files interactively
51: dda1d7b = 41: cc8e40a commit: accept "scissors" with CR/LF line endings
52: ed89e09 = 42: e2ede90 t0014: fix indentation
53: aa6baba = 43: 9800a7d git-gui: accommodate for intent-to-add files
54: f063c9a = 44: e15ca79 mingw: allow for longer paths in
parse_interpreter()62: c73dfca = 45: ceaa6a3 windows: skip linking
git-<command>for built-ins63: 2fe2f02 = 46: 53c59b8 mingw: stop hard-coding
CC = gcc23: c805606 = 47: e125be8 hash-object: demonstrate a >4GB/LLP64 problem
64: 495a287 = 48: 713e15a mingw: drop the -D_USE_32BIT_TIME_T option
26: 19d3729 = 49: b3c8382 object-file.c: use size_t for header lengths
65: 01875c9 = 50: 518195b mingw: only use -Wl,--large-address-aware for 32-bit builds
28: 7e44f07 = 51: 8f7f68d CMake: default Visual Studio generator has changed
29: b341d6c = 52: 8e505d9 hash algorithms: use size_t for section lengths
66: 0a6412d = 53: 30eb95c mingw: avoid over-specifying
--pic-executable32: ed7237f = 54: 83e5cb9 .gitignore: add Visual Studio CMakeSetting.json file
33: 807e2a9 = 55: fcb8e9b hash-object --stdin: verify that it works with >4GB/LLP64
67: 0e00f3b = 56: 44acc7e mingw: set the prefix and HOST_CPU as per MSYS2's settings
39: 35d9690 = 57: 0f3c39a subtree: update
contrib/subtreetesttarget40: db8e17c = 58: 3610a13 CMakeLists: add default "x64-windows" arch for Visual Studio
41: 197c954 = 59: 8fc87b9 hash-object: add another >4GB/LLP64 test case
42: d9d1136 = 60: 05b47ac setup: properly use "%(prefix)/" when in WSL
93: 2298936 = 61: 14fad04 Add config option
windows.appendAtomically68: c1f5adc = 62: d9705de mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
85: f0edea9 = 63: 29384dd MinGW: link as terminal server aware
55: 5d67caa = 64: b505960 compat/vcbuild: document preferred way to build in Visual Studio
56: 4932991 = 65: 9af2ed3 http: optionally send SSL client certificate
57: d8523e8 = 66: 7020713 ci: run
contrib/subtreetests in CI builds58: 807e420 = 67: 484ec68 CMake: show Win32 and Generator_platform build-option values
59: c5af8be = 68: f2b1279 hash-object: add a >4GB/LLP64 test case using filtered input
60: c597689 = 69: 02cfa83 compat/mingw.c: do not warn when failing to get owner
61: 9702783 = 70: fb256b2 mingw: $env:TERM="xterm-256color" for newer OSes
97: b958c12 = 71: a43e309 winansi: check result and Buffer before using Name
98: 3ac7522 = 72: 82b3217 mingw: change core.fsyncObjectFiles = 1 by default
99: caec482 = 73: 03daa1d Fix Windows version resources
100: cb94b60 = 74: 4d74e88 status: fix for old-style submodules with commondir
69: 70d9955 ! 75: 296470c mingw: rely on MSYS2's metadata instead of hard-coding it
70: 779e6b5 = 76: 3b13ae2 mingw: always define
ETC_*for MSYS2 environments71: 579be36 = 77: d1c31ed max_tree_depth: lower it for clang builds in general on Windows
72: ca68b67 = 78: be8ccd8 mingw: ensure valid CTYPE
73: 9f4bf8a = 79: 35656ba mingw: allow
git.exeto be used instead of the "Git wrapper"74: 7986b8e = 80: 7244c33 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
76: f1de59b = 81: 0ac212d Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
78: 6fbd1d6 = 82: 71399e0 clink.pl: fix libexpatd.lib link error when using MSVC
80: aac1fdf = 83: 0580871 Makefile: clean up .ilk files when MSVC=1
82: 107d2cd = 84: 154c5cd vcbuild: add support for compiling Windows resource files
84: 178c3fd = 85: 32b0576 config.mak.uname: add git.rc to MSVC builds
87: e9ebb2f = 86: f4cb55d clink.pl: ignore no-stack-protector arg on MSVC=1 builds
88: c80e6fb = 87: 7ee3e13 http: optionally load libcurl lazily
90: 83772e5 = 88: 4f8ca86 clink.pl: move default linker options for MSVC=1 builds
91: 225aefa = 89: 12b9337 http: support lazy-loading libcurl also on Windows
94: 86647da = 90: 6848e7f cmake: install headless-git.
95: 8d05842 = 91: d66ba07 http: when loading libcurl lazily, allow for multiple SSL backends
101: fec953d = 92: f3f4fca git.rc: include winuser.h
102: daff56f = 93: 3e15a6d mingw: do load libcurl dynamically by default
103: 85fec69 = 94: 1c0703c Add a GitHub workflow to verify that Git/Scalar work in Nano Server
104: 7b21850 = 95: 2ba130c mingw: suggest
windows.appendAtomicallyin more cases105: 2f9ed14 = 96: ae1d0a6 win32: use native ANSI sequence processing, if possible
106: bcf90a0 = 97: 19cbe75 common-main.c: fflush stdout buffer upon exit
107: 09300d2 = 98: 7430fc0 t5601/t7406(mingw): do run tests with symlink support
108: c08cd64 = 99: 8a22653 win32: ensure that
localtime_r()is declared even in i686 builds75: 2d929af = 100: 49c9d6b ci: work around a problem with HTTP/2 vs libcurl v8.10.0
77: f461a39 = 101: e54ff7e revision: create mark_trees_uninteresting_dense()
79: cb6768e = 102: 8a00b9d survey: stub in new experimental 'git-survey' command
81: 6bd8ffe = 103: 59e724c survey: add command line opts to select references
83: bf3dacd = 104: 11d7467 survey: start pretty printing data in table form
86: c889993 = 105: eaa0920 survey: add object count summary
89: 3ed0933 = 106: 8ceb688 survey: summarize total sizes by object type
92: e8ce4eb = 107: 94a5b24 survey: show progress during object walk
117: 49241c1 = 108: e23d2a7 mingw: make sure
errnois set correctly when socket operations fail96: bf26d84 = 109: 5282612 survey: add ability to track prioritized lists
120: 6eedce1 = 110: 348c033 compat/mingw: handle WSA errors in strerror
123: 624f4a6 = 111: 1790061 survey: add report of "largest" paths
124: d5d33ba = 112: c7f02f1 compat/mingw: drop outdated comment
127: 5f03184 = 113: aa76e60 survey: add --top= option and config
128: cb42cd7 = 114: 3e06f40 t0301: actually test credential-cache on Windows
109: 3bb2847 = 115: 681fd69 Fallback to AppData if XDG_CONFIG_HOME is unset
110: 9c1d79c = 116: 3050cec run-command: be helpful with Git LFS fails on Windows 7
131: eb0205f = 117: 8e4044b survey: clearly note the experimental nature in the output
132: 1f6a92a = 118: ab50ddf credential-cache: handle ECONNREFUSED gracefully
133: c8c463d = 119: ac53c6f reftable: do make sure to use custom allocators
134: d02091f = 120: cac6aca check-whitespace: avoid alerts about upstream commits
135: 0ce61a6 = 121: b930b13 t/t5571-prep-push-hook.sh: Add test with writing to stderr
113: 1558b5f ! 122: ce8b1c2 t5563: verify that NTLM authentication works
115: 55ea387 = 123: 75e5c89 http: disallow NTLM authentication by default
118: ce49dde ! 124: be66822 http: warn if might have failed because of NTLM
@@ http.c: static int handle_curl_result(struct slot_results *results) + } return HTTP_NOAUTH; } else { - http_auth_methods &= ~CURLAUTH_GSSNEGOTIATE; + if (curl_empty_auth == -1 && ## t/t5563-simple-http-auth.sh ## @@ t/t5563-simple-http-auth.sh: test_expect_success NTLM 'access using NTLM auth' '121: e25849c ! 125: 120103c credential: advertise NTLM suppression and allow helpers to re-enable
"
"disabled in Git by default. You can "
@@ http.c: static int http_request_recoverable(const char *url,
197: 84748fc = 198: 7fd644f fscache: load directories only once
199: f5a0772 = 199: ffeb2d3 fscache: add key for GIT_TRACE_FSCACHE
201: a30a325 = 200: f9cedd0 fscache: remember not-found directories
203: 0a0cb48 = 201: 5cb91b7 fscache: add a test for the dir-not-found optimization
204: a221ead = 202: a6b1830 add: use preload-index and fscache for performance
205: c31c34e = 203: b32da5d dir.c: make add_excludes aware of fscache during status
206: 826e90c = 204: 6ac8c1a fscache: make fscache_enabled() public
207: 05ce41c = 205: 9cc105f dir.c: regression fix for add_excludes with fscache
208: 86fbc21 = 206: 078e9e7 fetch-pack.c: enable fscache for stats under .git/objects
209: 77fc529 = 207: 86c8dda checkout.c: enable fscache for checkout again
210: 2b117ce = 208: 42ce941 Enable the filesystem cache (fscache) in refresh_index().
211: 37f23e4 = 209: 428e4b0 fscache: use FindFirstFileExW to avoid retrieving the short name
212: 4e3a9dc = 210: b9e8962 fscache: add GIT_TEST_FSCACHE support
213: 96478af = 211: 73acc96 fscache: add fscache hit statistics
214: 1efa21e = 212: 601c16c unpack-trees: enable fscache for sparse-checkout
215: ccacb16 = 213: 9e8da16 status: disable and free fscache at the end of the status command
216: 2367c50 = 214: ade7eeb mem_pool: add GIT_TRACE_MEMPOOL support
217: 1e1643d = 215: e122b54 fscache: fscache takes an initial size
218: fde1a05 = 216: f84a2fb fscache: update fscache to be thread specific instead of global
219: e38699a = 217: 30323ec fscache: teach fscache to use mempool
220: 9e114fa = 218: 33d7ccd fscache: make fscache_enable() thread safe
221: 4a72dc0 = 219: 31b937d fscache: teach fscache to use NtQueryDirectoryFile
222: d7d5c31 = 220: 48e9212 fscache: remember the reparse tag for each entry
223: 58093a1 = 221: 640729c Merge branch 'fscache'
224: 2b41de3 = 222: 6dfa3de fscache: implement an FSCache-aware is_mount_point()
225: 874edb0 = 223: ed24d1c Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
226: 86c8047 = 224: 788df95 clean: make use of FSCache
227: ac0ef52 = 225: dd0ecdb Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
228: ef7e565 = 226: e61c193 Merge branch 'dont-clean-junctions-fscache'
229: 9f75c6e = 227: af1da48 pack-objects (mingw): demonstrate a segmentation fault with large deltas
230: 9bd1d20 = 228: 693adfe mingw: support long paths
231: 05d089b = 229: 3814765 win32(long path support): leave drive-less absolute paths intact
232: 35599b1 = 230: 5620b4b compat/fsmonitor/fsm-*-win32: support long paths
233: 19eb4f4 = 231: 2e0ffb8 clean: suggest using
core.longPathsif paths are too long to remove234: 303fad2 = 232: 45c5f8e mingw: Support
git_terminal_promptwith more terminals235: 4af78d7 = 233: 0bbfe6a compat/terminal.c: only use the Windows console if bash 'read -r' fails
236: 8ca05c7 = 234: 88e8393 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
237: ef0b988 = 235: fe8b967 Win32: symlink: move phantom symlink creation to a separate function
238: ae579ba = 236: 435c9e0 Introduce helper to create symlinks that knows about index_state
239: 928b2b3 = 237: 50318f5 mingw: allow to specify the symlink type in .gitattributes
240: 12065c4 = 238: 57936a3 Win32: symlink: add test for
symlinkattribute241: a92c529 = 239: 23ec6ba mingw: explicitly specify with which cmd to prefix the cmdline
242: 9624a63 = 240: 1f2213b mingw: when path_lookup() failed, try BusyBox
243: adc26b8 = 241: 7c2f9ee test-tool: learn to act as a drop-in replacement for
iconv253: a9b73ea = 242: c914d14 mingw: introduce code to detect whether we're inside a Windows container
244: 5fc171f = 243: 3082f4d tests(mingw): if
iconvis unavailable, usetest-helper --iconv255: a2fe0aa = 244: fd066ea mingw: when running in a Windows container, try to rename() harder
245: 8aa96f9 = 245: d2b2526 gitattributes: mark .png files as binary
257: f0d0e69 = 246: a3325aa mingw: move the file_attr_to_st_mode() function definition
246: d9341a6 = 247: 4056a70 tests: move test PNGs into t/lib-diff/
259: aaf9bb2 = 248: 7a381b9 mingw: Windows Docker volumes are not symbolic links
247: 2d5d2a0 = 249: 069e1a2 tests: only override sort & find if there are usable ones in /usr/bin/
261: 6f04250 = 250: 01f4654 mingw: work around rename() failing on a read-only file
248: 2d46a33 = 251: 6253524 tests: use the correct path separator with BusyBox
249: e3f2eaa = 252: 9bbabbf mingw: only use Bash-ism
builtin pwd -Wwhen available250: 5eecffe = 253: 04ed667 tests (mingw): remove Bash-specific pwd option
251: b1bdc8b = 254: b4d123b test-lib: add BUSYBOX prerequisite
252: ef6f59d = 255: 3b13de4 t5003: use binary file from t/lib-diff/
254: d3ff908 = 256: fd85063 t5532: workaround for BusyBox on Windows
256: ac9e6b4 = 257: bd9f0e7 t5605: special-case hardlink test for BusyBox-w32
258: fc2e9d5 = 258: 845002c t5813: allow for $PWD to be a Windows path
260: 845d2e0 = 259: 72d2e9c t9200: skip tests when $PWD contains a colon
266: aab722b = 260: bd6a682 Describe Git for Windows' architecture
268: 4c6a58e = 261: 0c8ff02 Modify the Code of Conduct for Git for Windows
270: b4a09db = 262: e50681d CONTRIBUTING.md: add guide for first-time contributors
272: 279df90 = 263: da833f5 README.md: Add a Windows-specific preamble
274: dc04eb3 = 264: 4924cec Add an issue template
262: d7abbe8 = 265: 94df55c mingw: kill child processes in a gentler way
276: 1af624c = 266: f27e63b Add a GitHub workflow to monitor component updates
277: b4d40fb = 267: e361757 Modify the GitHub Pull Request template (to reflect Git for Windows)
264: 6c0f458 = 268: 16bd53e Merge branch 'gitk-and-git-gui-patches'
263: 6a598fe ! 269: 718b30a mingw: optionally enable wsl compability file mode bits
278: 9babf8b = 270: 7f2586c mingw: really handle SIGINT
280: 0ff58f7 = 271: 66fe410 Partially un-revert "editor: save and reset terminal after calling EDITOR"
281: ff8b077 = 272: 8e26619 reset: reinstate support for the deprecated --stdin option
282: 453f1ca = 273: 1f85afd fsmonitor: reintroduce core.useBuiltinFSMonitor
283: fb4df1a = 274: f0131d4 dependabot: help keeping GitHub Actions versions up to date
284: 76b2cd0 = 275: e4f6476 SECURITY.md: document Git for Windows' policies
265: 9fceb92 = 276: bc34ff3 Merge branch 'long-paths'
267: 9160abd = 277: 9fdf255 Merge branch 'msys2'
269: dc86d66 = 278: cb0923e Merge 'docker-volumes-are-no-symlinks'
271: e7c0123 = 279: 9f6efe2 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
273: 490bdad = 280: f153e8d Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
275: 186946f = 281: d1798aa Merge branch 'busybox-w32'
279: 896d774 = 282: d222a2b Merge branch 'wsl-file-mode-bits'
285: 0c25c89 = 283: e83a92a Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
286: 7a3c1fc = 284: c5f0660 Merge branch 'un-revert-editor-save-and-reset'
287: 2416de8 = 285: 2e3262b Merge branch 'phase-out-reset-stdin'
288: 542d338 = 286: 6c22721 Merge branch 'deprecate-core.useBuiltinFSMonitor'
289: 159b10c = 287: a44071c Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
290: 1fe3ec2 = 288: f988dad Merge 'readme' into HEAD
291: 2d3ad26 = 289: f5622ce Add an AGENTS.md file to help with AI-assisted debugging/development
292: d2cbe86 = 290: 1ea52f9 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
293: 88781d8 = 291: 00529da fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
294: 040bf84 = 292: 33a971e fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
295: b7f7ad5 = 293: 25f8cf4 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
296: 91dca4b = 294: 0185dd1 fixup! Add an AGENTS.md file to help with AI-assisted debugging/development
297: b8b902b = 295: 6d1dabc Add an AGENTS.md file to help with AI-assisted debugging/development (Add an AGENTS.md file to help with AI-assisted debugging/development git#6198)
298: 1cc54c7 = 296: a9a025e fixup! ci: work around a problem with HTTP/2 vs libcurl v8.10.0
299: f8de3fb = 297: 8f303ea fixup! revision: create mark_trees_uninteresting_dense()
300: 9ba8872 = 298: e4febcd Drop obsolete downstream patches (Drop obsolete downstream patches git#6208)
301: 9c23c9b = 299: 9211255 Merge branch 'pr-2097'
302: 11fe707 = 300: 6d1c05a fixup! Add a GitHub workflow to verify that Git/Scalar work in Nano Server
303: d29c7aa = 301: 3c89ffd Update GitHub Actions versions used in the GitHub workflows (Update GitHub Actions versions used in the GitHub workflows git#6220)
304: 8e3b568 = 302: b63cb86 build: tolerate use of _Generic from glibc 2.43 with Clang
305: a99c60c = 303: dbce1c7 build: tolerate use of _Generic from glibc 2.43 with Clang (build: tolerate use of _Generic from glibc 2.43 with Clang git#6233)