Rebase to v2.54.0#6189
Merged
gitforwindowshelper[bot] merged 333 commits intogit-for-windows:mainfrom Apr 20, 2026
Merged
Conversation
The vcpkg downloads may not succeed. Warn careful readers of the time out. A simple retry will usually resolve the issue. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
On LLP64 systems, such as Windows, the size of `long`, `int`, etc. is only 32 bits (for backward compatibility). Git's use of `unsigned long` for file memory sizes in many places, rather than size_t, limits the handling of large files on LLP64 systems (commonly given as `>4GB`). Provide a minimum test for handling a >4GB file. The `hash-object` command, with the `--literally` and without `-w` option avoids writing the object, either loose or packed. This avoids the code paths hitting the `bigFileThreshold` config test code, the zlib code, and the pack code. Subsequent patches will walk the test's call chain, converting types to `size_t` (which is larger in LLP64 data models) where appropriate. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue walking the code path for the >4GB `hash-object --literally` test. The `hash_object_file_literally()` function internally uses both `hash_object_file()` and `write_object_file_prepare()`. Both function signatures use `unsigned long` rather than `size_t` for the mem buffer sizes. Use `size_t` instead, for LLP64 compatibility. While at it, convert those function's object's header buffer length to `size_t` for consistency. The value is already upcast to `uintmax_t` for print format compatibility. Note: The hash-object test still does not pass. A subsequent commit continues to walk the call tree's lower level hash functions to identify further fixes. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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 <philipoakley@iee.email>
Continue walking the code path for the >4GB `hash-object --literally`
test to the hash algorithm step for LLP64 systems.
This patch lets the SHA1DC code use `size_t`, making it compatible with
LLP64 data models (as used e.g. by Windows).
The interested reader of this patch will note that we adjust the
signature of the `git_SHA1DCUpdate()` function without updating _any_
call site. This certainly puzzled at least one reviewer already, so here
is an explanation:
This function is never called directly, but always via the macro
`platform_SHA1_Update`, which is usually called via the macro
`git_SHA1_Update`. However, we never call `git_SHA1_Update()` directly
in `struct git_hash_algo`. Instead, we call `git_hash_sha1_update()`,
which is defined thusly:
static void git_hash_sha1_update(git_hash_ctx *ctx,
const void *data, size_t len)
{
git_SHA1_Update(&ctx->sha1, data, len);
}
i.e. it contains an implicit downcast from `size_t` to `unsigned long`
(before this here patch). With this patch, there is no downcast anymore.
With this patch, finally, the t1007-hash-object.sh "files over 4GB hash
literally" test case is fixed.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The CMakeSettings.json file is tool generated. Developers may track it should they provide additional settings. Signed-off-by: Philip Oakley <philipoakley@iee.email>
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>
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>
Git's regular Makefile mentions that HOST_CPU should be defined when cross-compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L438-L439 This is then used to set the GIT_HOST_CPU variable when compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L1337-L1341 Then, when the user runs `git version --build-options`, it returns that value: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/help.c#L658 This commit adds the same functionality to the CMake configuration. Users can now set -DHOST_CPU= to set the target architecture. Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
As reported in newren/git-filter-repo#225, it looks like 99 bytes is not really sufficient to represent e.g. the full path to Python when installed via Windows Store (and this path is used in the hasb bang line when installing scripts via `pip`). Let's increase it to what is probably the maximum sensible path size: MAX_PATH. This makes `parse_interpreter()` in line with what `lookup_prog()` handles. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Vilius Šumskas <vilius@sumskas.eu>
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>
This is no longer true in general, not with supporting Clang out of the box. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The Git for Windows project has grown quite complex over the years, certainly much more complex than during the first years where the `msysgit.git` repository was abusing Git for package management purposes and the `git/git` fork was called `4msysgit.git`. Let's describe the status quo in a thorough way. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The Git project followed Git for Windows' lead and added their Code of Conduct, based on the Contributor Covenant v1.4, later updated to v2.0. We adapt it slightly to Git for Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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 <johannes.schindelin@gmx.de>
Getting started contributing to Git can be difficult on a Windows machine. CONTRIBUTING.md contains a guide to getting started, including detailed steps for setting up build tools, running tests, and submitting patches to upstream. [includes an example by Pratik Karki how to submit v2, v3, v4, etc.] Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and Philip Oakley. Helped-by: Clive Chan <cc@clive.io> Helped-by: Adric Norris <landstander668@gmail.com> Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com> Helped-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Brendan Forster <brendan@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This was pull request git-for-windows#1645 from ZCube/master Support windows container. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…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>
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>
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>
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>
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>
…updates Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
derrickstolee
approved these changes
Apr 20, 2026
Member
Author
|
/git-artifacts The |
Validate the installer manuallyThe installer was built successfully; |
Member
Author
|
/release The |
|
@dscho, please Share on Bluesky and send the announcement email. Please wait for the repository-updates job to finish, then open the MSYS2 sync PR. |
gitforwindowshelper
bot
merged commit 2b8a3ab
into
git-for-windows:main
141 of 142 checks passed
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.
Range-diff relative to v2.54.0-rc2
3: 679b1fc = 1: 3274ae3 sideband: mask control characters
4: 7227785 = 2: 0462ca5 sideband: introduce an "escape hatch" to allow control characters
1: dffcb8a = 3: f207802 ci(dockerized): reduce the PID limit for private repositories
5: eb92506 = 4: 8c8e102 sideband: do allow ANSI color sequences by default
2: 2d77dd8 ! 5: 00ede0d mingw: skip symlink type auto-detection for network share targets
6: 65fd39d = 6: 3415b43 unix-socket: avoid leak when initialization fails
7: d2873d8 = 7: 62adce4 grep: prevent
^$false match at end of file10: 7dc4cbf = 8: eb61d7a mingw: include the Python parts in the build
11: d948ca7 = 9: fe44ba7 win32/pthread: avoid name clashes with winpthread
12: 8691207 = 10: 3cdd671 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
13: 0ebc336 = 11: d67535b Import the source code of mimalloc v2.2.7
14: 6dd3835 = 12: e7c4434 t9350: point out that refs are not updated correctly
15: e431e39 = 13: 417747b mimalloc: adjust for building inside Git
16: 87db365 = 14: a21a7a2 transport-helper: add trailing --
17: de913ea = 15: fe5704a mimalloc: offer a build-time option to enable it
18: 1304f84 = 16: 991ee76 remote-helper: check helper status after import/export
19: e6f48b0 = 17: 85268e0 clean: do not traverse mount points
20: 2f7519f = 18: 6a29c2d mingw: use mimalloc
21: 38b105c = 19: 05d54b0 Always auto-gc after calling a fast-import transport
22: 1d51a8b = 20: 3ea5f7a mingw: prevent regressions with "drive-less" absolute paths
23: c642fa2 = 21: a5918a7 clean: remove mount points when possible
24: 4689c6f = 22: f44c173 transport: optionally disable side-band-64k
26: 5658dd8 = 23: f5b513d vcpkg_install: detect lack of Git
28: ee23175 = 24: 6d42a10 vcpkg_install: add comment regarding slow network connections
31: 5a3d465 = 25: 998daa7 vcbuild: install ARM64 dependencies when building ARM64 binaries
40: 3a6b431 = 26: 72e9d1e vcbuild: add an option to install individual 'features'
41: 08b4242 = 27: cd21147 cmake: allow building for Windows/ARM64
27: 2e78daf = 28: b3ca408 mingw: demonstrate a
git addissue with NTFS junctions42: 2d49a13 = 29: 0ec6c45 ci(vs-build) also build Windows/ARM64 artifacts
29: b860b58 = 30: 5ab3d0c t5505/t5516: allow running without
.git/branches/in the templates30: 4f5b716 = 31: 6055f9b strbuf_realpath(): use platform-dependent API if available
43: c0e0ad2 = 32: dad2636 Add schannel to curl installation
32: 081e084 = 33: c1f2d53 http: use new "best effort" strategy for Secure Channel revoke checking
33: 1c54468 = 34: a2cb1cd t5505/t5516: fix white-space around redirectors
25: f817a63 = 35: 63241cf mingw: fix fatal error working on mapped network drives on Windows
34: 51a491f = 36: b6464dc clink.pl: fix MSVC compile script to handle libcurl-d.lib
35: 990f266 = 37: ab2a1ba mingw: implement a platform-specific
strbuf_realpath()36: 61b4d44 = 38: b914a04 t3701: verify that we can add lots of files interactively
37: f0102dc = 39: 6b36218 commit: accept "scissors" with CR/LF line endings
38: d482858 = 40: 83ec9c2 t0014: fix indentation
39: e904cb2 = 41: ecc65b3 git-gui: accommodate for intent-to-add files
44: 717b668 = 42: 8f64f0b hash-object: demonstrate a >4GB/LLP64 problem
45: 6fff7d2 = 43: 56570fa cmake(): allow setting HOST_CPU for cross-compilation
46: 6abef4f = 44: ae5f782 object-file.c: use size_t for header lengths
47: 2c21f55 = 45: 6fe34e4 CMake: default Visual Studio generator has changed
48: d4ee460 = 46: d7810fc hash algorithms: use size_t for section lengths
49: acba5ad = 47: 3f54362 .gitignore: add Visual Studio CMakeSetting.json file
50: b975baa = 48: 39b6525 hash-object --stdin: verify that it works with >4GB/LLP64
51: c76b635 = 49: 430ee58 subtree: update
contrib/subtreetesttarget52: a97b862 = 50: 0df5aa0 CMakeLists: add default "x64-windows" arch for Visual Studio
53: 49e0dcc = 51: b289cb7 hash-object: add another >4GB/LLP64 test case
54: 8ae7cc8 = 52: 9afac8d setup: properly use "%(prefix)/" when in WSL
71: be94918 = 53: 236f7a9 Add config option
windows.appendAtomically73: 0835368 = 54: a86140e MinGW: link as terminal server aware
55: 6e5c08c = 55: dd172a9 mingw: allow for longer paths in
parse_interpreter()56: 4aa6b67 = 56: 38db771 compat/vcbuild: document preferred way to build in Visual Studio
57: fa66fbb = 57: c5edd54 http: optionally send SSL client certificate
58: 4d185c2 = 58: b988e69 ci: run
contrib/subtreetests in CI builds59: a8c73ed = 59: c0fedda CMake: show Win32 and Generator_platform build-option values
60: 74450ee = 60: 4238648 hash-object: add a >4GB/LLP64 test case using filtered input
61: 714e89d = 61: f0975a6 compat/mingw.c: do not warn when failing to get owner
74: 5d40235 = 62: 6d35a86 mingw: $env:TERM="xterm-256color" for newer OSes
75: 5acbcf8 = 63: 12506a8 winansi: check result and Buffer before using Name
76: db4e800 = 64: f058d3c mingw: change core.fsyncObjectFiles = 1 by default
77: 87fc4c1 = 65: 83c13c3 Fix Windows version resources
62: 27e87a2 = 66: 0818084 windows: skip linking
git-<command>for built-ins63: c3898e5 = 67: 0ee4c75 mingw: stop hard-coding
CC = gcc64: 22dbb63 = 68: 75bad99 mingw: drop the -D_USE_32BIT_TIME_T option
65: 3c4fb6c = 69: ca38850 mingw: only use -Wl,--large-address-aware for 32-bit builds
66: 32ff658 = 70: 074859b mingw: avoid over-specifying
--pic-executable67: adfc036 = 71: 218d179 mingw: set the prefix and HOST_CPU as per MSYS2's settings
68: ea4be89 = 72: 08222da mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
69: 679895f = 73: df9f03e mingw: rely on MSYS2's metadata instead of hard-coding it
70: dcbee79 = 74: f333f0f mingw: always define
ETC_*for MSYS2 environments72: 48267f8 = 75: a097f61 max_tree_depth: lower it for clang builds in general on Windows
79: 4b61a1d = 76: c1de0af mingw: ensure valid CTYPE
80: d4ce1ca = 77: cf124bd mingw: allow
git.exeto be used instead of the "Git wrapper"81: 61c9817 = 78: f1c351c mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
82: 6967d19 = 79: fd1088b clink.pl: fix libexpatd.lib link error when using MSVC
83: 3b48b02 = 80: a5686e4 Makefile: clean up .ilk files when MSVC=1
84: 9252076 = 81: 9ffd46f vcbuild: add support for compiling Windows resource files
85: 71675d3 = 82: c3eae2e config.mak.uname: add git.rc to MSVC builds
86: 9933031 = 83: a879ea5 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
88: 8a47027 = 84: 0bcdce9 clink.pl: move default linker options for MSVC=1 builds
90: 6895b1b = 85: a506d62 cmake: install headless-git.
78: 446719b = 86: 5f81752 status: fix for old-style submodules with commondir
94: 3f80d75 = 87: 5386412 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
95: f490cce = 88: 1e10377 revision: create mark_trees_uninteresting_dense()
96: 469cb20 = 89: 47653ef survey: stub in new experimental 'git-survey' command
97: fa334f5 = 90: 6b7f7b1 survey: add command line opts to select references
87: 5404964 = 91: 52c0536 http: optionally load libcurl lazily
106: 57371b9 = 92: cdf6081 survey: start pretty printing data in table form
89: 88b02e6 = 93: e291432 http: support lazy-loading libcurl also on Windows
107: 2e7414b = 94: 3f3a91b survey: add object count summary
91: 5895aa1 = 95: 8dbe31a http: when loading libcurl lazily, allow for multiple SSL backends
108: d277b84 = 96: 4096b83 survey: summarize total sizes by object type
92: 123a985 = 97: 08af2fc git.rc: include winuser.h
93: 3e8a426 = 98: 52d4116 mingw: do load libcurl dynamically by default
98: 4ed3aa1 = 99: ad471d0 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
99: e2bff58 = 100: b3c9707 mingw: suggest
windows.appendAtomicallyin more cases100: 56a1414 = 101: 1b7b146 win32: use native ANSI sequence processing, if possible
101: 512e83a = 102: 3e8b6f1 common-main.c: fflush stdout buffer upon exit
102: 9266536 = 103: b1955b4 t5601/t7406(mingw): do run tests with symlink support
103: 99d1345 = 104: 6c98ef7 win32: ensure that
localtime_r()is declared even in i686 builds104: 41cce16 = 105: 56a1deb Fallback to AppData if XDG_CONFIG_HOME is unset
105: 1d7c5f8 = 106: 7c656f3 run-command: be helpful with Git LFS fails on Windows 7
109: 6120507 = 107: 722177e survey: show progress during object walk
110: 82cf270 = 108: e00d893 mingw: make sure
errnois set correctly when socket operations fail122: c628593 = 109: 3203a5c t5563: verify that NTLM authentication works
111: 9a83ce3 = 110: f529c33 survey: add ability to track prioritized lists
112: 488bb15 = 111: 62db9f4 compat/mingw: handle WSA errors in strerror
123: df97e72 = 112: e3e0345 http: disallow NTLM authentication by default
113: f467855 = 113: b659b2a survey: add report of "largest" paths
114: 22ff679 = 114: 51d8c18 compat/mingw: drop outdated comment
124: 8ee7b2c = 115: 8f740e0 http: warn if might have failed because of NTLM
115: 4be5959 = 116: 1e942bb survey: add --top= option and config
116: 1848f15 = 117: fd325b2 t0301: actually test credential-cache on Windows
125: 55c4a0f = 118: fa2dbd0 credential: advertise NTLM suppression and allow helpers to re-enable
117: cac4d19 = 119: 65915bf survey: clearly note the experimental nature in the output
118: 19bb291 = 120: ffa5ab2 credential-cache: handle ECONNREFUSED gracefully
119: 2cb0405 = 121: 3ee0fd5 reftable: do make sure to use custom allocators
120: 01da21f = 122: 12b561d check-whitespace: avoid alerts about upstream commits
121: 945d1fa = 123: dbd653b t/t5571-prep-push-hook.sh: Add test with writing to stderr
128: 408d1ca = 124: 9cf6271 dir: do not traverse mount points
8: 6d3026f = 125: 9da0b5e win32: thread-utils: handle multi-socket systems
9: 9b082fb (upstream: f65aba1) < -: ------------ codeql: bump actions/cache from 4 to 5
126: c13f015 = 126: 7f0f061 http: extract http_reauth_prepare() from retry paths
127: 9f1081c = 127: 579159e http: attempt Negotiate auth in http.emptyAuth=auto mode
129: 1400471 = 128: e3c938b t5563: add tests for http.emptyAuth with Negotiate
130: 6e16b5b = 129: 4e992ed ci(macos): skip the
git p4tests133: 99028c4 = 130: fc27d53 Win32: make FILETIME conversion functions public
134: e9fbc02 = 131: 73c3fad Win32: dirent.c: Move opendir down
135: fd2be61 = 132: 68e5344 mingw: make the dirent implementation pluggable
136: ff47b01 = 133: bee2a75 Win32: make the lstat implementation pluggable
137: db93d60 = 134: 51736b2 mingw: add infrastructure for read-only file system level caches
138: 7e26d76 = 135: 3167997 mingw: add a cache below mingw's lstat and dirent implementations
139: b13b6ef = 136: 43ec30e fscache: load directories only once
140: 710de04 = 137: e7b3a2c fscache: add key for GIT_TRACE_FSCACHE
131: 745af68 = 138: 682cfd5 git-gui--askyesno: fix funny text wrapping
141: e74ac06 = 139: f865c7c fscache: remember not-found directories
132: ed28bc4 = 140: 33c3173 git-gui--askyesno (mingw): use Git for Windows' icon, if available
142: 238f8f5 = 141: 066afb5 fscache: add a test for the dir-not-found optimization
143: 7acf76c = 142: 6d30b7e add: use preload-index and fscache for performance
144: dd5e929 = 143: 6f1b0e8 dir.c: make add_excludes aware of fscache during status
145: e1f4b6a = 144: 0046bea fscache: make fscache_enabled() public
146: f2f691a = 145: aba3b3b dir.c: regression fix for add_excludes with fscache
147: f023b12 = 146: e4bc62d fetch-pack.c: enable fscache for stats under .git/objects
148: e7a98c0 = 147: 0b68195 checkout.c: enable fscache for checkout again
149: 4b2c882 = 148: 65c7726 Enable the filesystem cache (fscache) in refresh_index().
150: 325a988 = 149: 8756c0a fscache: use FindFirstFileExW to avoid retrieving the short name
151: 2c288b3 = 150: 2795619 fscache: add GIT_TEST_FSCACHE support
152: 28714d5 = 151: accc3b0 fscache: add fscache hit statistics
153: 7ed93b9 = 152: b2dbe31 unpack-trees: enable fscache for sparse-checkout
154: 07b286a = 153: 62cf57b status: disable and free fscache at the end of the status command
155: 9b3d9fe = 154: 32c5e52 mem_pool: add GIT_TRACE_MEMPOOL support
156: 9c5b992 = 155: 6378e39 fscache: fscache takes an initial size
157: c3fd24b = 156: 332003f fscache: update fscache to be thread specific instead of global
158: 922750a = 157: 952e433 fscache: teach fscache to use mempool
159: 2996477 = 158: 932d3b2 fscache: make fscache_enable() thread safe
160: a253aca = 159: bc199d2 fscache: teach fscache to use NtQueryDirectoryFile
161: 694f9fd = 160: 135b2cf fscache: remember the reparse tag for each entry
162: 312ab49 = 161: fcaf4cc fscache: implement an FSCache-aware is_mount_point()
163: 321da45 = 162: 7591eeb clean: make use of FSCache
164: 0c99949 = 163: 1163e1f pack-objects (mingw): demonstrate a segmentation fault with large deltas
165: 656bbb1 = 164: 994b318 mingw: support long paths
166: 063ce36 = 165: 23721ec win32(long path support): leave drive-less absolute paths intact
167: dac5b21 = 166: 7373203 compat/fsmonitor/fsm-*-win32: support long paths
168: 5e9cfc1 = 167: 7f13315 clean: suggest using
core.longPathsif paths are too long to remove169: 646764a = 168: 650c6e2 mingw: Support
git_terminal_promptwith more terminals170: b1a90f7 = 169: 56cc21f compat/terminal.c: only use the Windows console if bash 'read -r' fails
171: 3b16ce1 = 170: 48c7707 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
172: 0800274 = 171: 3f22655 Win32: symlink: move phantom symlink creation to a separate function
173: 9cbfe77 = 172: 3394e01 Introduce helper to create symlinks that knows about index_state
174: 5c9e8b5 = 173: 82cf690 mingw: allow to specify the symlink type in .gitattributes
175: 507bdb2 = 174: 24f1828 Win32: symlink: add test for
symlinkattribute176: e5e6e9c = 175: 21dab4c mingw: explicitly specify with which cmd to prefix the cmdline
178: 0fb0397 = 176: 7da099e mingw: when path_lookup() failed, try BusyBox
180: 9fba40b = 177: 5b2f2b8 test-tool: learn to act as a drop-in replacement for
iconv177: e6adbe3 = 178: fcdead2 mingw: introduce code to detect whether we're inside a Windows container
182: 4cbf759 = 179: b33b515 tests(mingw): if
iconvis unavailable, usetest-helper --iconv179: 425d896 = 180: f019e94 mingw: when running in a Windows container, try to rename() harder
184: 0b77c69 = 181: 06acf32 gitattributes: mark .png files as binary
181: 020b3e6 = 182: 948807d mingw: move the file_attr_to_st_mode() function definition
186: d03e80c = 183: 15d2203 tests: move test PNGs into t/lib-diff/
183: a6bd75b = 184: c6d8161 mingw: Windows Docker volumes are not symbolic links
187: 4f2ced7 = 185: b28a90d tests: only override sort & find if there are usable ones in /usr/bin/
185: 238369f = 186: 79b811d mingw: work around rename() failing on a read-only file
188: 836b66c = 187: 8699090 tests: use the correct path separator with BusyBox
189: 88ee3db = 188: 452cc00 mingw: only use Bash-ism
builtin pwd -Wwhen available190: 064cde7 = 189: bb2194f tests (mingw): remove Bash-specific pwd option
191: 4535aa2 = 190: 6e73f85 test-lib: add BUSYBOX prerequisite
192: 0bc2b31 = 191: d7ed9c9 t5003: use binary file from t/lib-diff/
193: 498e063 = 192: 89ede41 t5532: workaround for BusyBox on Windows
194: ef929cf = 193: 343213a t5605: special-case hardlink test for BusyBox-w32
195: 18f6b62 = 194: f9da0b5 t5813: allow for $PWD to be a Windows path
196: a02f317 = 195: e05631f t9200: skip tests when $PWD contains a colon
197: 0cc3d9d = 196: 41814b8 mingw: kill child processes in a gentler way
198: e342052 = 197: 40dcbcf mingw: optionally enable wsl compability file mode bits
199: 66e76f0 = 198: d8b4bb2 mingw: really handle SIGINT
200: c0a926e = 199: 0a0670a Partially un-revert "editor: save and reset terminal after calling EDITOR"
208: 7ec6e50 = 200: e527f47 reset: reinstate support for the deprecated --stdin option
209: 8376c22 = 201: 80096a9 fsmonitor: reintroduce core.useBuiltinFSMonitor
206: dc37831 = 202: 0110fc9 Add a GitHub workflow to monitor component updates
201: a08268b ! 203: beb773c Describe Git for Windows' architecture [no ci]
210: 6818c0a = 204: b3921c2 dependabot: help keeping GitHub Actions versions up to date
202: 80d5981 = 205: 8c0db9a Modify the Code of Conduct for Git for Windows
203: 02dc4a3 = 206: 1cbd77d CONTRIBUTING.md: add guide for first-time contributors
204: bf6ff77 = 207: 2a827be README.md: Add a Windows-specific preamble
205: 08ebfcc = 208: a959dd0 Add an issue template
207: 6c162cc = 209: d4cc54f Modify the GitHub Pull Request template (to reflect Git for Windows)
211: 7bb714a = 210: 53fa513 SECURITY.md: document Git for Windows' policies
This closes #6188