Skip to content

Rebase to v2.51.0-rc1 #5761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 394 commits into from
Aug 7, 2025

Conversation

dscho
Copy link
Member

@dscho dscho commented Aug 7, 2025

As per usual.

PhilipOakley and others added 30 commits August 7, 2025 19:15
Correct some wording and inform users regarding the Visual Studio
changes (from V16.6) to the default generator.

Subsequent commits ensure that Git for Windows can be directly
opened in modern Visual Studio without needing special configuration
of the CMakeLists settings.

It appeares that internally Visual Studio creates it's own version of the
.sln file (etc.) for extension tools that expect them.

The large number of references below document the shifting of Visual Studio
default and CMake setting options.

refs: https://docs.microsoft.com/en-us/search/?scope=C%2B%2B&view=msvc-150&terms=Ninja

1. https://docs.microsoft.com/en-us/cpp/linux/cmake-linux-configure?view=msvc-160
(note the linux bit)
 "In Visual Studio 2019 version 16.6 or later ***, Ninja is the default
generator for configurations targeting a remote system or WSL. For more
information, see this post on the C++ Team Blog
[https://devblogs.microsoft.com/cppblog/linux-development-with-visual-studio-first-class-support-for-gdbserver-improved-build-times-with-ninja-and-updates-to-the-connection-manager/].

For more information about these settings, see CMakeSettings.json reference
[https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-160]."

2. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160
"CMake supports two files that allow users to specify common configure,
build, and test options and share them with others: CMakePresets.json
and CMakeUserPresets.json."

" Both files are supported in Visual Studio 2019 version 16.10 or later.
***"
3. https://devblogs.microsoft.com/cppblog/linux-development-with-visual-studio-first-class-support-for-gdbserver-improved-build-times-with-ninja-and-updates-to-the-connection-manager/
" Ninja has been the default generator (underlying build system) for
CMake configurations targeting Windows for some time***, but in Visual
Studio 2019 version 16.6 Preview 3*** we added support for Ninja on Linux."

4. https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-160
" `generator`: specifies CMake generator to use for this configuration.
May be one of:

    Visual Studio 2019 only:
        Visual Studio 16 2019
        Visual Studio 16 2019 Win64
        Visual Studio 16 2019 ARM

    Visual Studio 2017 and later:
        Visual Studio 15 2017
        Visual Studio 15 2017 Win64
        Visual Studio 15 2017 ARM
        Visual Studio 14 2015
        Visual Studio 14 2015 Win64
        Visual Studio 14 2015 ARM
        Unix Makefiles
        Ninja

Because Ninja is designed for fast build speeds instead of flexibility
and function, it is set as the default. However, some CMake projects may
be unable to correctly build using Ninja. If this occurs, you can
instruct CMake to generate Visual Studio projects instead.

To specify a Visual Studio generator in Visual Studio 2017, open the
settings editor from the main menu by choosing CMake | Change CMake
Settings. Delete "Ninja" and type "V". This activates IntelliSense,
which enables you to choose the generator you want."

"To specify a Visual Studio generator in Visual Studio 2019, right-click
on the CMakeLists.txt file in Solution Explorer and choose CMake
Settings for project > Show Advanced Settings > CMake Generator.

When the active configuration specifies a Visual Studio generator, by
default MSBuild.exe is invoked with` -m -v:minimal` arguments."

5. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#enable-cmakepresetsjson-integration-in-visual-studio-2019
"Enable CMakePresets.json integration in Visual Studio 2019

CMakePresets.json integration isn't enabled by default in Visual Studio
2019. You can enable it for all CMake projects in Tools > Options >
CMake > General: (tick a box)" ... see more.

6. https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-140
(whichever v140 is..)
"CMake projects are supported in Visual Studio 2017 and later."

7. https://docs.microsoft.com/en-us/cpp/overview/what-s-new-for-cpp-2017?view=msvc-150
"Support added for the CMake Ninja generator."

8. https://docs.microsoft.com/en-us/cpp/overview/what-s-new-for-cpp-2017?view=msvc-150#cmake-support-via-open-folder
"CMake support via Open Folder
Visual Studio 2017 introduces support for using CMake projects without
converting to MSBuild project files (.vcxproj). For more information,
see CMake projects in Visual
Studio[https://docs.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=msvc-150].
Opening CMake projects with Open Folder automatically configures the
environment for C++ editing, building, and debugging." ... +more!

9. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#supported-cmake-and-cmakepresetsjson-versions
"Visual Studio reads and evaluates CMakePresets.json and
CMakeUserPresets.json itself and doesn't invoke CMake directly with the
--preset option. So, CMake version 3.20 or later isn't strictly required
when you're building with CMakePresets.json inside Visual Studio. We
recommend using CMake version 3.14 or later."

10. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#enable-cmakepresetsjson-integration-in-visual-studio-2019
"If you don't want to enable CMakePresets.json integration for all CMake
projects, you can enable CMakePresets.json integration for a single
CMake project by adding a CMakePresets.json file to the root of the open
folder. You must close and reopen the folder in Visual Studio to
activate the integration.

11. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#default-configure-presets
***(doesn't actually say which version..)
"Default Configure Presets
If no CMakePresets.json or CMakeUserPresets.json file exists, or if
CMakePresets.json or CMakeUserPresets.json is invalid, Visual Studio
will fall back*** on the following default Configure Presets:

Windows example
JSON
{
  "name": "windows-default",
  "displayName": "Windows x64 Debug",
  "description": "Sets Ninja generator, compilers, x64 architecture,
build and install directory, debug build type",
  "generator": "Ninja",
  "binaryDir": "${sourceDir}/out/build/${presetName}",
  "architecture": {
    "value": "x64",
    "strategy": "external"
  },
  "cacheVariables": {
    "CMAKE_BUILD_TYPE": "Debug",
    "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
  },
  "vendor": {
    "microsoft.com/VisualStudioSettings/CMake/1.0": {
      "hostOS": [ "Windows" ]
    }
  }
},
"

Signed-off-by: Philip Oakley <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
The CMakeSettings.json file is tool generated. Developers may track it
should they provide additional settings.

Signed-off-by: Philip Oakley <[email protected]>
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 <[email protected]>
On LLP64 systems, such as Windows, the size of `long`, `int`, etc. is
only 32 bits (for backward compatibility). Git's use of `unsigned long`
for file memory sizes in many places, rather than size_t, limits the
handling of large files on LLP64 systems (commonly given as `>4GB`).

Provide a minimum test for handling a >4GB file. The `hash-object`
command, with the  `--literally` and without `-w` option avoids
writing the object, either loose or packed. This avoids the code paths
hitting the `bigFileThreshold` config test code, the zlib code, and the
pack code.

Subsequent patches will walk the test's call chain, converting types to
`size_t` (which is larger in LLP64 data models) where appropriate.

Signed-off-by: Philip Oakley <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
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 <[email protected]>
In Git for Windows, `has_symlinks` is set to 0 by default. Therefore, we
need to parse the config setting `core.symlinks` to know if it has been
set to `true`. In `git init`, we must do that before copying the
templates because they might contain symbolic links.

Even if the support for symbolic links on Windows has not made it to
upstream Git yet, we really should make sure that all the `core.*`
settings are parsed before proceeding, as they might very well change
the behavior of `git init` in a way the user intended.

This fixes git-for-windows#3414

Signed-off-by: Johannes Schindelin <[email protected]>
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 <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
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 <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
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 <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
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 <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
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 <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
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 <[email protected]>
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 <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
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 <[email protected]>
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 <[email protected]>
Signed-off-by: 孙卓识 <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
This will help with Git for Windows' maintenance going forward: It
allows Git for Windows to switch its primary libcurl to a variant
without the OpenSSL backend, while still loading an alternate when
setting `http.sslBackend = openssl`.

This is necessary to avoid maintenance headaches with upgrading OpenSSL:
its major version name is encoded in the shared library's file name and
hence major version updates (temporarily) break libraries that are
linked against the OpenSSL library.

Signed-off-by: Johannes Schindelin <[email protected]>
In Git for Windows v2.39.0, we fixed a regression where `git.exe` would
no longer work in Windows Nano Server (frequently used in Docker
containers).

This GitHub workflow can be used to verify manually that the Git/Scalar
executables work in Nano Server.

Signed-off-by: Johannes Schindelin <[email protected]>
When running Git for Windows on a remote APFS filesystem, it would
appear that the `mingw_open_append()`/`write()` combination would fail
almost exactly like on some CIFS-mounted shares as had been reported in
git-for-windows#2753, albeit with a
different `errno` value.

Let's handle that `errno` value just the same, by suggesting to set
`windows.appendAtomically=false`.

Signed-off-by: David Lomas <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
dscho and others added 18 commits August 7, 2025 19:28
These changes are necessary to support better Git for Windows' new
auto-update feature.

Signed-off-by: Johannes Schindelin <[email protected]>
These are Git for Windows' Git GUI and gitk patches. We will have to
decide at some point what to do about them, but that's a little lower
priority (as Git GUI seems to be unmaintained for the time being, and
the gitk maintainer keeps a very low profile on the Git mailing list,
too).

Signed-off-by: Johannes Schindelin <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
This was pull request git-for-windows#1645 from ZCube/master

Support windows container.

Signed-off-by: Johannes Schindelin <[email protected]>
…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 <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
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 <[email protected]>
Handle Ctrl+C in Git Bash nicely

Signed-off-by: Johannes Schindelin <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
…updates

Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho requested review from mjcheetham and rimrul August 7, 2025 17:31
@dscho dscho self-assigned this Aug 7, 2025
@dscho
Copy link
Member Author

dscho commented Aug 7, 2025

Range-diff relative to main
  • 1: 5945eaf = 1: c48c883 sideband: mask control characters

  • 2: 32c75c8 = 2: 0404d6a sideband: introduce an "escape hatch" to allow control characters

  • 3: 1d1e40d = 3: e468563 sideband: do allow ANSI color sequences by default

  • 4: 1a678ae = 4: 353a6d4 unix-socket: avoid leak when initialization fails

  • 5: 99ea985 = 5: 0d57dc3 grep: prevent ^$ false match at end of file

  • 7: 1da3a4a = 6: d9871a7 mingw: avoid relative #includes

  • 6: d5d8f78 = 7: 71ec63f t9350: point out that refs are not updated correctly

  • 9: 8a87aae = 8: f41f230 mingw: order #includes alphabetically

  • 10: 67ae737 = 9: aef4bbc cmake: accommodate for UNIT_TEST_SOURCES

  • 8: 534ee59 = 10: b8dd7d8 transport-helper: add trailing --

  • 11: 847aaaf = 11: 45f433c remote-helper: check helper status after import/export

  • 12: 86855db = 12: a004cbd mingw: demonstrate a problem with certain absolute paths

  • 13: 987a27d = 13: 4dc6dad clean: do not traverse mount points

  • 15: 7869630 = 14: f03d3a8 Always auto-gc after calling a fast-import transport

  • 16: 64cc037 = 15: a548c3f mingw: allow absolute paths without drive prefix

  • 17: 19c1253 = 16: 302966e clean: remove mount points when possible

  • 14: 6d0b77f = 17: 15f3185 mingw: include the Python parts in the build

  • 18: 2bd5a43 = 18: e648097 win32/pthread: avoid name clashes with winpthread

  • 19: 213e5e3 = 19: a4355d3 git-compat-util: avoid redeclaring _DEFAULT_SOURCE

  • 20: 5146b16 = 20: bfe1a9d Import the source code of mimalloc v2.2.4

  • 21: 9b39c1c = 21: dbdd426 mimalloc: adjust for building inside Git

  • 22: 5bcbd8e = 22: 7775181 mimalloc: offer a build-time option to enable it

  • 23: c301996 = 23: bbfe3d4 mingw: use mimalloc

  • 26: 48f1d96 = 24: aa35d4f transport: optionally disable side-band-64k

  • 27: 0d0dd21 = 25: 46daa00 mingw: do resolve symlinks in getcwd()

  • 28: 35ee17e = 26: 0436570 mingw: fix fatal error working on mapped network drives on Windows

  • 31: d725c92 = 27: 894b760 mingw: ensure valid CTYPE

  • 24: dda3212 = 28: 10358b4 mingw: demonstrate a git add issue with NTFS junctions

  • 32: 59b312d = 29: 77fd154 mingw: allow git.exe to be used instead of the "Git wrapper"

  • 25: 19fb539 = 30: dd4446b strbuf_realpath(): use platform-dependent API if available

  • 34: 60b83aa = 31: 88101a8 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory

  • 29: 3619843 = 32: 36d4ca0 clink.pl: fix MSVC compile script to handle libcurl-d.lib

  • 30: ae550ce = 33: 9914c06 mingw: implement a platform-specific strbuf_realpath()

  • 33: e2e7a67 = 34: b2b7239 t5505/t5516: allow running without .git/branches/ in the templates

  • 36: 6bbf26d = 35: 5edd509 t5505/t5516: fix white-space around redirectors

  • 35: c526115 = 36: 0b66b11 http: use new "best effort" strategy for Secure Channel revoke checking

  • 37: fe09f06 = 37: dbebec7 t3701: verify that we can add lots of files interactively

  • 38: 4d77abc = 38: 05a66da commit: accept "scissors" with CR/LF line endings

  • 41: 7b1d729 = 39: 9d38cfb clink.pl: fix libexpatd.lib link error when using MSVC

  • 42: 00f3334 = 40: 70081e1 Makefile: clean up .ilk files when MSVC=1

  • 39: ccd5317 = 41: 375766a t0014: fix indentation

  • 40: f370bb1 = 42: 2349940 git-gui: accommodate for intent-to-add files

  • 43: c92257e = 43: c4be7e8 vcbuild: add support for compiling Windows resource files

  • 44: 5960b5a = 44: edb4a11 config.mak.uname: add git.rc to MSVC builds

  • 45: d3241e7 = 45: bb3af34 clink.pl: ignore no-stack-protector arg on MSVC=1 builds

  • 48: 7b442ef = 46: ee427d5 vcpkg_install: detect lack of Git

  • 46: afd696b = 47: 65078ad clink.pl: move default linker options for MSVC=1 builds

  • 49: db5bf57 = 48: e49c318 vcpkg_install: add comment regarding slow network connections

  • 47: 4da19de = 49: d56f1c9 cmake: install headless-git.

  • 50: 60fee98 = 50: 6c8efbe vcbuild: install ARM64 dependencies when building ARM64 binaries

  • 51: b4468de = 51: a431e7a vcbuild: add an option to install individual 'features'

  • 52: a5a9e1a = 52: c0e0090 cmake: allow building for Windows/ARM64

  • 53: 0bafc71 = 53: 4f1a1d1 ci(vs-build) also build Windows/ARM64 artifacts

  • 54: 10e7b8d = 54: c997bb5 Add schannel to curl installation

  • 56: bb0fe50 = 55: d0f46ca cmake(): allow setting HOST_CPU for cross-compilation

  • 57: 14aabe3 = 56: 34d19b7 mingw: allow for longer paths in parse_interpreter()

  • 55: 609970b = 57: 22fa478 subtree: update contrib/subtree test target

  • 61: 203e1c8 = 58: b7038fd CMake: default Visual Studio generator has changed

  • 58: 28d5e8d = 59: 6bb7fdf compat/vcbuild: document preferred way to build in Visual Studio

  • 59: fb861d9 = 60: 993f1d9 http: optionally send SSL client certificate

  • 60: 9e98231 = 61: 361b470 ci: run contrib/subtree tests in CI builds

  • 62: 0b92a21 = 62: c3b7339 .gitignore: add Visual Studio CMakeSetting.json file

  • 64: e02da63 = 63: bbbfda9 CMakeLists: add default "x64-windows" arch for Visual Studio

  • 63: 805477a = 64: 7f4d9ee hash-object: demonstrate a >4GB/LLP64 problem

  • 66: ae6ea2a = 65: 3574ce8 CMake: show Win32 and Generator_platform build-option values

  • 67: d443765 = 66: b655773 init: do parse all core.* settings early

  • 65: 030d36f ! 67: 80d9a9f object-file.c: use size_t for header lengths

    @@ object-file.c: static void hash_object_body(const struct git_hash_algo *algo, st
      {
      	struct git_hash_ctx c;
      
    -@@ object-file.c: int finalize_object_file_flags(const char *tmpfile, const char *filename,
    +@@ object-file.c: int finalize_object_file_flags(struct repository *repo,
      }
      
      void hash_object_file(const struct git_hash_algo *algo, const void *buf,
    @@ object-file.c: int finalize_object_file_flags(const char *tmpfile, const char *f
      
      	write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen);
      }
    -@@ object-file.c: int stream_loose_object(struct input_stream *in_stream, size_t len,
    - 	return err;
    +@@ object-file.c: int stream_loose_object(struct odb_source *source,
      }
      
    --int write_object_file_flags(const void *buf, unsigned long len,
    -+int write_object_file_flags(const void *buf, size_t len,
    - 			    enum object_type type, struct object_id *oid,
    - 			    struct object_id *compat_oid_in, unsigned flags)
    + int write_object_file(struct odb_source *source,
    +-		      const void *buf, unsigned long len,
    ++		      const void *buf, size_t len,
    + 		      enum object_type type, struct object_id *oid,
    + 		      struct object_id *compat_oid_in, unsigned flags)
      {
    -@@ object-file.c: int write_object_file_flags(const void *buf, unsigned long len,
    - 	const struct git_hash_algo *compat = repo->compat_hash_algo;
    +@@ object-file.c: int write_object_file(struct odb_source *source,
    + 	const struct git_hash_algo *compat = source->odb->repo->compat_hash_algo;
      	struct object_id compat_oid;
      	char hdr[MAX_HEADER_LEN];
     -	int hdrlen = sizeof(hdr);
    @@ object-file.c: int write_object_file_flags(const void *buf, unsigned long len,
      	if (compat) {
     
      ## object-file.h ##
    -@@ object-file.h: enum {
    - 	WRITE_OBJECT_FILE_SILENT = (1 << 1),
    - };
    +@@ object-file.h: struct object_info;
    + int parse_loose_header(const char *hdr, struct object_info *oi);
      
    --int write_object_file_flags(const void *buf, unsigned long len,
    -+int write_object_file_flags(const void *buf, size_t len,
    - 			    enum object_type type, struct object_id *oid,
    - 			    struct object_id *compat_oid_in, unsigned flags);
    - static inline int write_object_file(const void *buf, unsigned long len,
    -@@ object-file.h: int finalize_object_file_flags(const char *tmpfile, const char *filename,
    + int write_object_file(struct odb_source *source,
    +-		      const void *buf, unsigned long len,
    ++		      const void *buf, size_t len,
    + 		      enum object_type type, struct object_id *oid,
    + 		      struct object_id *compat_oid_in, unsigned flags);
    + 
    +@@ object-file.h: int finalize_object_file_flags(struct repository *repo,
      			       enum finalize_object_file_flags flags);
      
      void hash_object_file(const struct git_hash_algo *algo, const void *buf,
  • 68: 620334e = 68: 30774b0 hash algorithms: use size_t for section lengths

  • 69: 29eab64 = 69: 46f0c25 hash-object --stdin: verify that it works with >4GB/LLP64

  • 70: e30097f = 70: e98dc20 hash-object: add another >4GB/LLP64 test case

  • 72: 9a99608 = 71: b8751fc hash-object: add a >4GB/LLP64 test case using filtered input

  • 71: 2346fd2 = 72: ed98746 setup: properly use "%(prefix)/" when in WSL

  • 75: bbf9cef = 73: 39ea249 Add config option windows.appendAtomically

  • 73: dca075d = 74: 4bac2ae compat/mingw.c: do not warn when failing to get owner

  • 74: 0ef69ea = 75: 05b6072 mingw: $env:TERM="xterm-256color" for newer OSes

  • 77: 9b6963f = 76: 597e0cf winansi: check result and Buffer before using Name

  • 78: 885961f = 77: 866079e mingw: change core.fsyncObjectFiles = 1 by default

  • 76: e50713f = 78: 1a852ee MinGW: link as terminal server aware

  • 80: 993df37 = 79: 96a09e1 http: optionally load libcurl lazily

  • 79: 1fe7b1e = 80: 94b21c5 Fix Windows version resources

  • 83: 92c5388 = 81: 8a4f8d7 status: fix for old-style submodules with commondir

  • 84: 7d5553a = 82: d6d22c9 windows: skip linking git-<command> for built-ins

  • 81: 490aad0 = 83: 3ac339d http: support lazy-loading libcurl also on Windows

  • 82: 8f6b813 = 84: 9396450 http: when loading libcurl lazily, allow for multiple SSL backends

  • 85: 9e3138e = 85: 3de9968 mingw: do load libcurl dynamically by default

  • 86: f0b2c68 = 86: f2e6e80 Add a GitHub workflow to verify that Git/Scalar work in Nano Server

  • 87: b364498 = 87: 1396cfe mingw: suggest windows.appendAtomically in more cases

  • 88: 8ab7f74 = 88: 0a54c86 win32: use native ANSI sequence processing, if possible

  • 89: a055f97 = 89: 8ffdd96 git.rc: include winuser.h

  • 91: 6eb8d9d = 90: 4a69a66 common-main.c: fflush stdout buffer upon exit

  • 92: 0597a34 = 91: 4b6988e t5601/t7406(mingw): do run tests with symlink support

  • 93: 6721adb = 92: c0241bb win32: ensure that localtime_r() is declared even in i686 builds

  • 94: 021ef4f = 93: d35a6a6 Fallback to AppData if XDG_CONFIG_HOME is unset

  • 95: a833e6c = 94: ff4bc65 run-command: be helpful with Git LFS fails on Windows 7

  • 90: 4dfa5bf = 95: 241efb8 ci: work around a problem with HTTP/2 vs libcurl v8.10.0

  • 96: 6aeb4e4 = 96: b628190 revision: create mark_trees_uninteresting_dense()

  • 97: 17633b6 = 97: 60ecdbe survey: stub in new experimental 'git-survey' command

  • 98: 6450ab8 = 98: c761c89 survey: add command line opts to select references

  • 99: bcaf0e9 = 99: 2feb55d survey: start pretty printing data in table form

  • 100: b514ed6 = 100: b89ad5d survey: add object count summary

  • 101: 298c2b9 = 101: c700afb survey: summarize total sizes by object type

  • 102: 488a23b = 102: c9c8600 survey: show progress during object walk

  • 103: 3008f23 = 103: 841504b survey: add ability to track prioritized lists

  • 105: 2667dd8 = 104: 9c6d22a mingw: make sure errno is set correctly when socket operations fail

  • 107: 8623f70 = 105: 7687e2b compat/mingw: handle WSA errors in strerror

  • 104: a0e3de1 = 106: 18d0713 survey: add report of "largest" paths

  • 109: c48e3aa = 107: 40b82da compat/mingw: drop outdated comment

  • 106: 7cbab3d = 108: 6d57e41 survey: add --top= option and config

  • 110: 2e0afaf = 109: 536c3fb t0301: actually test credential-cache on Windows

  • 108: 051189f = 110: dea4ec2 survey: clearly note the experimental nature in the output

  • 111: 5806284 = 111: d2c6814 credential-cache: handle ECONNREFUSED gracefully

  • 112: 5701a08 = 112: bc1a54f max_tree_depth: lower it for clangarm64 on Windows

  • 113: e167aed = 113: 5ebf831 reftable: do make sure to use custom allocators

  • 114: d600907 = 114: 8a23e89 check-whitespace: avoid alerts about upstream commits

  • 115: 1fe7e7b = 115: eb66b05 refs: forbid clang to complain about unreachable code

  • 116: bab9580 = 116: a81931a mingw: avoid the comma operator

  • 221: 4470b5a ! 117: 158550c git-gui: provide question helper for retry fallback on Windows

    @@ git-gui/git-gui--askyesno (new)
     +tk::PlaceWindow .
     
      ## git-gui/git-gui.sh ##
    -@@ git-gui/git-gui.sh: citool {
    +@@ git-gui/git-gui.sh: set argv0dir [file dirname [file normalize $::argv0]]
      if {![info exists env(SSH_ASKPASS)]} {
    - 	set env(SSH_ASKPASS) [file join [git --exec-path] git-gui--askpass]
    + 	set env(SSH_ASKPASS) [file join $argv0dir git-gui--askpass]
      }
     +if {![info exists env(GIT_ASK_YESNO)]} {
    -+	set env(GIT_ASK_YESNO) [file join [git --exec-path] git-gui--askyesno]
    ++	set env(GIT_ASK_YESNO) [file join $argv0dir git-gui--askyesno]
     +}
    + unset argv0dir
      
      ######################################################################
    - ##
  • 117: 32781f0 = 118: 769404b Win32: make FILETIME conversion functions public

  • 118: 658021a = 119: 6373b59 Win32: dirent.c: Move opendir down

  • 119: e2fb7cf = 120: 520fee2 mingw: make the dirent implementation pluggable

  • 120: 81fe5aa = 121: f9cc680 Win32: make the lstat implementation pluggable

  • 121: 9d84848 = 122: 1bd6d7d mingw: add infrastructure for read-only file system level caches

  • 122: 9e28632 = 123: cf9b5bd mingw: add a cache below mingw's lstat and dirent implementations

  • 123: 920ade8 = 124: e57e320 fscache: load directories only once

  • 124: d3ca2d0 = 125: c8c89f6 fscache: add key for GIT_TRACE_FSCACHE

  • 125: 34da809 = 126: f4d75f4 fscache: remember not-found directories

  • 126: 91814ed = 127: 7ba0368 fscache: add a test for the dir-not-found optimization

  • 127: 4f5e770 = 128: 1f568a3 add: use preload-index and fscache for performance

  • 128: 99c3cf7 = 129: 43edf37 dir.c: make add_excludes aware of fscache during status

  • 129: 0482c6c = 130: 7424e57 fscache: make fscache_enabled() public

  • 130: 3a7354d = 131: 90fe4ab dir.c: regression fix for add_excludes with fscache

  • 131: 91ae583 = 132: 0dd21e9 fetch-pack.c: enable fscache for stats under .git/objects

  • 132: 889a154 = 133: b208baa checkout.c: enable fscache for checkout again

  • 133: 6dbfccd = 134: 0d7af51 Enable the filesystem cache (fscache) in refresh_index().

  • 134: 1d0b3c2 = 135: 8126576 fscache: use FindFirstFileExW to avoid retrieving the short name

  • 135: e857619 = 136: 16a7fb5 fscache: add GIT_TEST_FSCACHE support

  • 136: f00c46f = 137: 143dbf0 fscache: add fscache hit statistics

  • 137: f57a68a = 138: 805d2de unpack-trees: enable fscache for sparse-checkout

  • 138: 53b6481 = 139: 0fd386c status: disable and free fscache at the end of the status command

  • 139: 9c00d44 = 140: fb9a86a mem_pool: add GIT_TRACE_MEMPOOL support

  • 140: cef44a1 = 141: 6562ddf fscache: fscache takes an initial size

  • 141: 79142b6 = 142: bb8bf03 fscache: update fscache to be thread specific instead of global

  • 142: 39bc97b = 143: e2670dd fscache: teach fscache to use mempool

  • 143: b778cbd = 144: 577a11e fscache: make fscache_enable() thread safe

  • 144: d98d36f = 145: 5153074 fscache: teach fscache to use NtQueryDirectoryFile

  • 145: 173791b = 146: d7e3bba fscache: remember the reparse tag for each entry

  • 146: 41d719e = 147: c14b39f fscache: implement an FSCache-aware is_mount_point()

  • 147: 4b61fbb = 148: 83400d6 clean: make use of FSCache

  • 148: 83d585b = 149: 5324012 pack-objects (mingw): demonstrate a segmentation fault with large deltas

  • 149: e8a97e1 = 150: c15de28 mingw: support long paths

  • 150: c268012 = 151: d2e93d8 Win32: fix 'lstat("dir/")' with long paths

  • 151: f3d8d9d = 152: cc0f6f2 win32(long path support): leave drive-less absolute paths intact

  • 152: ddd0140 = 153: 82bc028 compat/fsmonitor/fsm-*-win32: support long paths

  • 153: 5febed5 = 154: 2354e5d clean: suggest using core.longPaths if paths are too long to remove

  • 154: aca557b = 155: 2afc494 mingw: Support git_terminal_prompt with more terminals

  • 155: a0f2c10 = 156: 1b5a04e compat/terminal.c: only use the Windows console if bash 'read -r' fails

  • 156: e66d09d = 157: 8df2bf3 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method

  • 157: 4301ab9 = 158: 4c7dbf6 strbuf_readlink: don't call readlink twice if hint is the exact link size

  • 158: 8e6069d = 159: c10002f strbuf_readlink: support link targets that exceed PATH_MAX

  • 159: d34bdf5 = 160: 56c192f lockfile.c: use is_dir_sep() instead of hardcoded '/' checks

  • 160: 6902d9c = 161: 01f5684 Win32: don't call GetFileAttributes twice in mingw_lstat()

  • 161: 0f62b56 = 162: 1f84a66 Win32: implement stat() with symlink support

  • 162: c7c8406 = 163: 2753fc2 Win32: remove separate do_lstat() function

  • 163: e1c1cf9 = 164: 66d95c7 Win32: let mingw_lstat() error early upon problems with reparse points

  • 164: 0c95fce = 165: a2e2baf mingw: teach fscache and dirent about symlinks

  • 165: 36a1a08 = 166: 2d9dc83 Win32: lstat(): return adequate stat.st_size for symlinks

  • 166: 87e456e = 167: e0ef4bc Win32: factor out retry logic

  • 167: f6f6013 = 168: 68bedf0 Win32: change default of 'core.symlinks' to false

  • 168: e108226 = 169: 921c210 Win32: add symlink-specific error codes

  • 169: cc9d318 = 170: 23f48a2 Win32: mingw_unlink: support symlinks to directories

  • 170: 2b2052c = 171: eafa8dc Win32: mingw_rename: support renaming symlinks

  • 171: ecf35f7 = 172: f0e67ad Win32: mingw_chdir: change to symlink-resolved directory

  • 172: ab65cc1 = 173: 689c2aa Win32: implement readlink()

  • 173: ae05423 = 174: b3490db mingw: lstat: compute correct size for symlinks

  • 174: f65fe79 = 175: 3ad85c9 Win32: implement basic symlink() functionality (file symlinks only)

  • 175: f0a2df2 = 176: d57bb5e Win32: symlink: add support for symlinks to directories

  • 176: 7d5aa2c = 177: 830091d mingw: try to create symlinks without elevated permissions

  • 177: 4a5a4e6 = 178: 1bf11bf mingw: emulate stat() a little more faithfully

  • 178: 557de2c = 179: 2607df8 mingw: special-case index entries for symlinks with buggy size

  • 179: 9630aff = 180: 7df3104 mingw: introduce code to detect whether we're inside a Windows container

  • 180: 558e8d3 = 181: 79f277e mingw: when running in a Windows container, try to rename() harder

  • 181: 73eee36 = 182: f7ee462 mingw: move the file_attr_to_st_mode() function definition

  • 185: 71bd8db = 183: eded9cf mingw: Windows Docker volumes are not symbolic links

  • 187: f4b1593 = 184: 31d0a55 mingw: work around rename() failing on a read-only file

  • 182: b2195fe = 185: c8c85a9 Win32: symlink: move phantom symlink creation to a separate function

  • 183: 4c97a22 = 186: eba3a62 Introduce helper to create symlinks that knows about index_state

  • 184: 95a6b3e = 187: 6b31be9 mingw: allow to specify the symlink type in .gitattributes

  • 186: 0d561e2 = 188: 5050014 Win32: symlink: add test for symlink attribute

  • 188: 5b85b10 = 189: 9122d9a mingw: explicitly specify with which cmd to prefix the cmdline

  • 189: 8c2c1b2 = 190: 7f7a044 mingw: when path_lookup() failed, try BusyBox

  • 190: 14a3fac = 191: 15d5e67 test-tool: learn to act as a drop-in replacement for iconv

  • 191: a64ed92 = 192: 4bd09b1 tests(mingw): if iconv is unavailable, use test-helper --iconv

  • 192: 4ae899c = 193: c363feb gitattributes: mark .png files as binary

  • 193: 70f16f9 = 194: 5de63fe tests: move test PNGs into t/lib-diff/

  • 194: 40ca90c = 195: e6b362f tests: only override sort & find if there are usable ones in /usr/bin/

  • 195: 774fcce = 196: 01976e1 tests: use the correct path separator with BusyBox

  • 196: 996207a = 197: 46172d5 mingw: only use Bash-ism builtin pwd -W when available

  • 197: 2a0e67e = 198: cd9c244 tests (mingw): remove Bash-specific pwd option

  • 198: 7c288b0 = 199: 98aa60f test-lib: add BUSYBOX prerequisite

  • 199: 260c0ff = 200: f360cae t5003: use binary file from t/lib-diff/

  • 200: e113764 = 201: 0bfc796 t5532: workaround for BusyBox on Windows

  • 201: 0aa803e = 202: 886726b t5605: special-case hardlink test for BusyBox-w32

  • 202: 5140c21 = 203: f74d651 t5813: allow for $PWD to be a Windows path

  • 203: f7f00c8 = 204: ed8c80d t9200: skip tests when $PWD contains a colon

  • 204: a81f1ff = 205: 1a79464 mingw: add a Makefile target to copy test artifacts

  • 206: 41fa8d0 = 206: 292a3de mingw: optionally enable wsl compability file mode bits

  • 205: 67ff85f = 207: 232d1f9 mingw: kill child processes in a gentler way

  • 208: cedebf9 = 208: 750778e mingw: do not call xutftowcs_path in mingw_mktemp

  • 216: 05f29f4 = 209: 702063f Add a GitHub workflow to monitor component updates

  • 207: b4fd14a = 210: 19d06d0 mingw: really handle SIGINT

  • 209: 54c8833 = 211: c6cbe6a Partially un-revert "editor: save and reset terminal after calling EDITOR"

  • 210: 61f6d9a = 212: ccd5abf reset: reinstate support for the deprecated --stdin option

  • 218: 64cf5da = 213: 1a94733 fsmonitor: reintroduce core.useBuiltinFSMonitor

  • 219: de2e700 = 214: cfa222d dependabot: help keeping GitHub Actions versions up to date

  • 211: 18fa3df = 215: eeca726 Describe Git for Windows' architecture [no ci]

  • 212: 7aa1102 = 216: 2f531ac Modify the Code of Conduct for Git for Windows

  • 213: ea7e41b = 217: de7aa7f CONTRIBUTING.md: add guide for first-time contributors

  • 214: 3b88e18 = 218: d436478 README.md: Add a Windows-specific preamble

  • 215: b7e84e6 = 219: 576c111 Add an issue template

  • 217: bf333f2 = 220: c2c1617 Modify the GitHub Pull Request template (to reflect Git for Windows)

  • 220: 92da824 = 221: d109ffd SECURITY.md: document Git for Windows' policies

  • 222: ab11df9 ! 222: cee99b1 git gui: set GIT_ASKPASS=git-gui--askpass if not set yet

    @@ Commit message
         Signed-off-by: Johannes Schindelin <[email protected]>
     
      ## git-gui/git-gui.sh ##
    -@@ git-gui/git-gui.sh: citool {
    +@@ git-gui/git-gui.sh: set argv0dir [file dirname [file normalize $::argv0]]
      if {![info exists env(SSH_ASKPASS)]} {
    - 	set env(SSH_ASKPASS) [file join [git --exec-path] git-gui--askpass]
    + 	set env(SSH_ASKPASS) [file join $argv0dir git-gui--askpass]
      }
     +if {![info exists env(GIT_ASKPASS)]} {
    -+	set env(GIT_ASKPASS) [file join [git --exec-path] git-gui--askpass]
    ++	set env(GIT_ASKPASS) [file join $argv0dir git-gui--askpass]
     +}
      if {![info exists env(GIT_ASK_YESNO)]} {
    - 	set env(GIT_ASK_YESNO) [file join [git --exec-path] git-gui--askyesno]
    + 	set env(GIT_ASK_YESNO) [file join $argv0dir git-gui--askyesno]
      }
  • 223: ffe9ebd = 223: e93ed43 git-gui--askyesno: fix funny text wrapping

  • 224: 34b30e1 = 224: 06bb1c3 git-gui--askyesno: allow overriding the window title

  • 225: e5be966 = 225: 5be7898 git-gui--askyesno (mingw): use Git for Windows' icon, if available

@dscho
Copy link
Member Author

dscho commented Aug 7, 2025

/git-artifacts

The tag-git workflow run was started

Copy link

Validate the installer manually

The installer was built successfully;
Please download, install, and run through the pre-flight check-list.
@dscho ☝️

@dscho dscho added this to the Next release milestone Aug 7, 2025
@dscho dscho linked an issue Aug 7, 2025 that may be closed by this pull request
@dscho
Copy link
Member Author

dscho commented Aug 7, 2025

/release

The release-git workflow run was started

Copy link

@dscho, please Share on Bluesky and send the announcement email.

@gitforwindowshelper gitforwindowshelper bot merged commit 76d27a6 into git-for-windows:main Aug 7, 2025
83 checks passed
@dscho dscho deleted the rebase-to-v2.51.0-rc1 branch August 7, 2025 19:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[New git version] v2.51.0-rc1