Rebase to v2.54.0-rc2#6178
Merged
gitforwindowshelper[bot] merged 371 commits intogit-for-windows:mainfrom Apr 14, 2026
Merged
Conversation
In this context, a "feature" is a dependency combined with its own dependencies. Signed-off-by: Ian Bearman <ianb@microsoft.com> 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>
Signed-off-by: Dennis Ameling <dennis@dennisameling.com> 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>
There are no Windows/ARM64 agents in GitHub Actions yet, therefore we just skip adjusting the `vs-test` job for now. Signed-off-by: Dennis Ameling <dennis@dennisameling.com> 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>
Signed-off-by: Dennis Ameling <dennis@dennisameling.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>
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>
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>
In bf2d5d8 (Don't let ld strip relocations, 2016-01-16) (picked from git-for-windows@6a237925bf10), Git for Windows introduced the `-Wl,-pic-executable` flag, specifying the exact entry point via `-e`. This required discerning between i686 and x86_64 code because the former required the symbol to be prefixed with an underscore, the latter did not. As per https://sourceware.org/bugzilla/show_bug.cgi?id=10865, the specified symbols are already the default, though. So let's drop the overly-specific definition. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 already defines a couple of helpful environment variables, and we can use those to infer the installation location as well as the CPU. No need for hard-coding ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The tell-tale is the presence of the `MSYSTEM` value while compiling, of course. In that case, we want to ensure that `MSYSTEM` is set when running `git.exe`, and also enable the magic MSYS2 tty detection. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 defines some helpful environment variables, e.g. `MSYSTEM`. There is code in Git for Windows to ensure that that `MSYSTEM` variable is set, hard-coding a default. However, the existing solution jumps through hoops to reconstruct the proper default, and is even incomplete doing so, as we found out when we extended it to support CLANGARM64. This is absolutely unnecessary because there is already a perfectly valid `MSYSTEM` value we can use at build time. This is even true when building the MINGW32 variant on a MINGW64 system because `makepkg-mingw` will override the `MSYSTEM` value as per the `MINGW_ARCH` array. The same is equally true for the `/mingw64`, `/mingw32` and `/clangarm64` prefix: those values are already available via the `MINGW_PREFIX` environment variable, and we just need to pass that setting through. Only when `MINGW_PREFIX` is not set (as is the case in Git for Windows' minimal SDK, where only `MSYSTEM` is guaranteed to be set correctly), we use as fall-back the top-level directory whose name is the down-cased value of the `MSYSTEM` variable. Incidentally, this also broadens the support to all the configurations supported by the MSYS2 project, i.e. clang64 & ucrt64, too. Note: This keeps the same, hard-coded MSYSTEM platform support for CMake as before, but drops it for Meson (because it is unclear how Meson could do this in a more flexible manner). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Special-casing even more configurations simply does not make sense. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
This was pull request git-for-windows#1645 from ZCube/master Support windows container. 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>
…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>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Specify symlink type in .gitattributes
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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. |
gitforwindowshelper
bot
merged commit 7d8b4ef
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.
This PR, as usual, rebases Git for Windows to v2.54.0-rc2. It also integrates the just-released Git for Windows v2.53.0(3).
Range-diff
-: ------------ > 1: dffcb8a ci(dockerized): reduce the PID limit for private repositories
-: ------------ > 2: 2d77dd8 mingw: skip symlink type auto-detection for network share targets
1: bec1102 = 3: 679b1fc sideband: mask control characters
2: 49625dc = 4: 7227785 sideband: introduce an "escape hatch" to allow control characters
3: ef329a4 = 5: eb92506 sideband: do allow ANSI color sequences by default
4: 4a69e00 = 6: 65fd39d unix-socket: avoid leak when initialization fails
5: c85d30f = 7: d2873d8 grep: prevent
^$false match at end of file123: 123c79c = 8: 6d3026f win32: thread-utils: handle multi-socket systems
207: eacac3c = 9: 9b082fb codeql: bump actions/cache from 4 to 5
10: c71f8c5 = 10: 7dc4cbf mingw: include the Python parts in the build
11: 1638a8f = 11: d948ca7 win32/pthread: avoid name clashes with winpthread
12: 685995a = 12: 8691207 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
13: cbe1d32 = 13: 0ebc336 Import the source code of mimalloc v2.2.7
6: 9195696 = 14: 6dd3835 t9350: point out that refs are not updated correctly
14: 58e94be = 15: e431e39 mimalloc: adjust for building inside Git
7: 672dc0d = 16: 87db365 transport-helper: add trailing --
16: bc89923 = 17: de913ea mimalloc: offer a build-time option to enable it
8: 5703180 = 18: 1304f84 remote-helper: check helper status after import/export
17: 14948cc = 19: e6f48b0 clean: do not traverse mount points
19: d768e7e = 20: 2f7519f mingw: use mimalloc
9: 6834379 = 21: 38b105c Always auto-gc after calling a fast-import transport
20: 5e137ed = 22: 1d51a8b mingw: prevent regressions with "drive-less" absolute paths
21: 03a984f = 23: c642fa2 clean: remove mount points when possible
22: a554805 = 24: 4689c6f transport: optionally disable side-band-64k
23: ea5475e = 25: f817a63 mingw: fix fatal error working on mapped network drives on Windows
25: 906fcfe = 26: 5658dd8 vcpkg_install: detect lack of Git
15: d874829 = 27: 2e78daf mingw: demonstrate a
git addissue with NTFS junctions26: 00725dd = 28: ee23175 vcpkg_install: add comment regarding slow network connections
31: 9fcb6e4 = 29: b860b58 t5505/t5516: allow running without
.git/branches/in the templates18: b6a4e57 = 30: 4f5b716 strbuf_realpath(): use platform-dependent API if available
27: cc7fd6f = 31: 5a3d465 vcbuild: install ARM64 dependencies when building ARM64 binaries
33: fc0d461 = 32: 081e084 http: use new "best effort" strategy for Secure Channel revoke checking
34: 191a257 = 33: 1c54468 t5505/t5516: fix white-space around redirectors
24: 16a5b5a = 34: 51a491f clink.pl: fix MSVC compile script to handle libcurl-d.lib
35: 4d62b84 = 35: 990f266 mingw: implement a platform-specific
strbuf_realpath()36: a469d35 = 36: 61b4d44 t3701: verify that we can add lots of files interactively
37: 4223c88 = 37: f0102dc commit: accept "scissors" with CR/LF line endings
38: 217b1f1 = 38: d482858 t0014: fix indentation
39: f5148e5 = 39: e904cb2 git-gui: accommodate for intent-to-add files
28: 25faced = 40: 3a6b431 vcbuild: add an option to install individual 'features'
29: 507d54b = 41: 08b4242 cmake: allow building for Windows/ARM64
30: 08d7fcc = 42: 2d49a13 ci(vs-build) also build Windows/ARM64 artifacts
32: d3e83cc = 43: c0e0ad2 Add schannel to curl installation
40: c61602d = 44: 717b668 hash-object: demonstrate a >4GB/LLP64 problem
41: dc56461 = 45: 6fff7d2 cmake(): allow setting HOST_CPU for cross-compilation
42: 0ccb957 ! 46: 6abef4f object-file.c: use size_t for header lengths
43: 8978e72 = 47: 2c21f55 CMake: default Visual Studio generator has changed
44: b80b5d6 = 48: d4ee460 hash algorithms: use size_t for section lengths
45: c4178f1 = 49: acba5ad .gitignore: add Visual Studio CMakeSetting.json file
46: 1bf4b76 = 50: b975baa hash-object --stdin: verify that it works with >4GB/LLP64
47: 7816c16 = 51: c76b635 subtree: update
contrib/subtreetesttarget48: 8ef3e27 = 52: a97b862 CMakeLists: add default "x64-windows" arch for Visual Studio
49: 4ef57bd = 53: 49e0dcc hash-object: add another >4GB/LLP64 test case
50: 23be593 = 54: 8ae7cc8 setup: properly use "%(prefix)/" when in WSL
51: a146f28 = 55: 6e5c08c mingw: allow for longer paths in
parse_interpreter()52: 9264379 = 56: 4aa6b67 compat/vcbuild: document preferred way to build in Visual Studio
53: 1865813 = 57: fa66fbb http: optionally send SSL client certificate
54: 2f94a31 = 58: 4d185c2 ci: run
contrib/subtreetests in CI builds55: 2263509 = 59: a8c73ed CMake: show Win32 and Generator_platform build-option values
56: 215755d = 60: 74450ee hash-object: add a >4GB/LLP64 test case using filtered input
67: f9020a0 = 61: 714e89d compat/mingw.c: do not warn when failing to get owner
57: d19431f = 62: 27e87a2 windows: skip linking
git-<command>for built-ins58: 336add8 = 63: c3898e5 mingw: stop hard-coding
CC = gcc59: 28aa68f = 64: 22dbb63 mingw: drop the -D_USE_32BIT_TIME_T option
60: 319e430 = 65: 3c4fb6c mingw: only use -Wl,--large-address-aware for 32-bit builds
61: 9a21881 = 66: 32ff658 mingw: avoid over-specifying
--pic-executable62: 7de4453 = 67: adfc036 mingw: set the prefix and HOST_CPU as per MSYS2's settings
63: bb54e4c = 68: ea4be89 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
65: e66b44b = 69: 679895f mingw: rely on MSYS2's metadata instead of hard-coding it
73: f17966c = 70: dcbee79 mingw: always define
ETC_*for MSYS2 environments64: cc31a60 = 71: be94918 Add config option
windows.appendAtomically74: 4bbfcaa = 72: 48267f8 max_tree_depth: lower it for clang builds in general on Windows
66: 0266f26 = 73: 0835368 MinGW: link as terminal server aware
68: 6df3465 = 74: 5d40235 mingw: $env:TERM="xterm-256color" for newer OSes
69: 88605cb = 75: 5acbcf8 winansi: check result and Buffer before using Name
70: 5f9348a = 76: db4e800 mingw: change core.fsyncObjectFiles = 1 by default
71: f7b50f5 = 77: 87fc4c1 Fix Windows version resources
72: bb3fe7c = 78: 446719b status: fix for old-style submodules with commondir
75: a212a91 = 79: 4b61a1d mingw: ensure valid CTYPE
76: 27bc190 = 80: d4ce1ca mingw: allow
git.exeto be used instead of the "Git wrapper"77: 2fffaf6 = 81: 61c9817 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
78: 13ad956 = 82: 6967d19 clink.pl: fix libexpatd.lib link error when using MSVC
79: b091534 = 83: 3b48b02 Makefile: clean up .ilk files when MSVC=1
80: 28a74a0 ! 84: 9252076 vcbuild: add support for compiling Windows resource files
81: 6c019fe = 85: 71675d3 config.mak.uname: add git.rc to MSVC builds
82: 73d2092 = 86: 9933031 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
85: 2d675f5 = 87: 5404964 http: optionally load libcurl lazily
83: dfb640e = 88: 8a47027 clink.pl: move default linker options for MSVC=1 builds
87: 5f3ac5d = 89: 88b02e6 http: support lazy-loading libcurl also on Windows
84: 486e910 = 90: 6895b1b cmake: install headless-git.
88: 6b1abf6 = 91: 5895aa1 http: when loading libcurl lazily, allow for multiple SSL backends
86: 0809bbe = 92: 123a985 git.rc: include winuser.h
89: a9bd866 = 93: 3e8a426 mingw: do load libcurl dynamically by default
98: 9345c86 = 94: 3f80d75 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
99: 19de67f = 95: f490cce revision: create mark_trees_uninteresting_dense()
100: 2363edc = 96: 469cb20 survey: stub in new experimental 'git-survey' command
101: b7fa10f = 97: fa334f5 survey: add command line opts to select references
90: 7739e04 = 98: 4ed3aa1 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
91: 46b73f6 = 99: e2bff58 mingw: suggest
windows.appendAtomicallyin more cases92: dd6288b = 100: 56a1414 win32: use native ANSI sequence processing, if possible
93: 33841a5 = 101: 512e83a common-main.c: fflush stdout buffer upon exit
94: 9463106 = 102: 9266536 t5601/t7406(mingw): do run tests with symlink support
95: 0cc6cd5 = 103: 99d1345 win32: ensure that
localtime_r()is declared even in i686 builds96: ac34878 = 104: 41cce16 Fallback to AppData if XDG_CONFIG_HOME is unset
97: 70bb34b = 105: 1d7c5f8 run-command: be helpful with Git LFS fails on Windows 7
102: 942bbfc = 106: 57371b9 survey: start pretty printing data in table form
103: b7c6c74 = 107: 2e7414b survey: add object count summary
104: 98f7436 = 108: d277b84 survey: summarize total sizes by object type
105: a8e9988 = 109: 6120507 survey: show progress during object walk
107: a015c59 = 110: 82cf270 mingw: make sure
errnois set correctly when socket operations fail106: 4335560 = 111: 9a83ce3 survey: add ability to track prioritized lists
109: c11404e = 112: 488bb15 compat/mingw: handle WSA errors in strerror
108: eade8c0 = 113: f467855 survey: add report of "largest" paths
111: 640d8a8 = 114: 22ff679 compat/mingw: drop outdated comment
110: ed3bbd3 = 115: 4be5959 survey: add --top= option and config
115: 70c92e7 = 116: 1848f15 t0301: actually test credential-cache on Windows
112: c5dee63 = 117: cac4d19 survey: clearly note the experimental nature in the output
117: 3f8e7c5 = 118: 19bb291 credential-cache: handle ECONNREFUSED gracefully
118: 0e2e179 = 119: 2cb0405 reftable: do make sure to use custom allocators
119: 7d3b7ff = 120: 01da21f check-whitespace: avoid alerts about upstream commits
120: 731b6d3 = 121: 945d1fa t/t5571-prep-push-hook.sh: Add test with writing to stderr
113: a38f86c = 122: c628593 t5563: verify that NTLM authentication works
114: 2ff1538 = 123: df97e72 http: disallow NTLM authentication by default
116: a554f9b = 124: 8ee7b2c http: warn if might have failed because of NTLM
121: 252d160 = 125: 55c4a0f credential: advertise NTLM suppression and allow helpers to re-enable
206: 0ceeb4f = 126: c13f015 http: extract http_reauth_prepare() from retry paths
208: 7c3dbdd = 127: 9f1081c http: attempt Negotiate auth in http.emptyAuth=auto mode
122: 0f29e91 = 128: 408d1ca dir: do not traverse mount points
209: dbe735c = 129: 1400471 t5563: add tests for http.emptyAuth with Negotiate
124: a77d57e = 130: 6e16b5b ci(macos): skip the
git p4tests133: 939fe2d = 131: 745af68 git-gui--askyesno: fix funny text wrapping
135: 260fa55 = 132: ed28bc4 git-gui--askyesno (mingw): use Git for Windows' icon, if available
125: bada4bc = 133: 99028c4 Win32: make FILETIME conversion functions public
126: 91fb7ff = 134: e9fbc02 Win32: dirent.c: Move opendir down
127: ca3a902 = 135: fd2be61 mingw: make the dirent implementation pluggable
128: d1c5be1 = 136: ff47b01 Win32: make the lstat implementation pluggable
129: 4764175 = 137: db93d60 mingw: add infrastructure for read-only file system level caches
130: 9a8a5fd = 138: 7e26d76 mingw: add a cache below mingw's lstat and dirent implementations
131: 06e6ac8 = 139: b13b6ef fscache: load directories only once
132: 0a87028 = 140: 710de04 fscache: add key for GIT_TRACE_FSCACHE
134: 5f8f9ed = 141: e74ac06 fscache: remember not-found directories
136: 00bb68a = 142: 238f8f5 fscache: add a test for the dir-not-found optimization
137: 334d051 = 143: 7acf76c add: use preload-index and fscache for performance
138: 1a018d0 = 144: dd5e929 dir.c: make add_excludes aware of fscache during status
139: fba04fe = 145: e1f4b6a fscache: make fscache_enabled() public
140: da03204 = 146: f2f691a dir.c: regression fix for add_excludes with fscache
141: c2f237d = 147: f023b12 fetch-pack.c: enable fscache for stats under .git/objects
142: c6fdd8f = 148: e7a98c0 checkout.c: enable fscache for checkout again
143: be117ca = 149: 4b2c882 Enable the filesystem cache (fscache) in refresh_index().
144: f571ee7 = 150: 325a988 fscache: use FindFirstFileExW to avoid retrieving the short name
145: 5fd4c12 = 151: 2c288b3 fscache: add GIT_TEST_FSCACHE support
146: 22de66a = 152: 28714d5 fscache: add fscache hit statistics
147: 7057bcc = 153: 7ed93b9 unpack-trees: enable fscache for sparse-checkout
148: 76621dc = 154: 07b286a status: disable and free fscache at the end of the status command
149: f288d1a = 155: 9b3d9fe mem_pool: add GIT_TRACE_MEMPOOL support
150: 5f82193 = 156: 9c5b992 fscache: fscache takes an initial size
151: b17c1ab = 157: c3fd24b fscache: update fscache to be thread specific instead of global
152: 46a799d = 158: 922750a fscache: teach fscache to use mempool
153: 9df1da2 = 159: 2996477 fscache: make fscache_enable() thread safe
154: 42fa270 = 160: a253aca fscache: teach fscache to use NtQueryDirectoryFile
155: d483f78 = 161: 694f9fd fscache: remember the reparse tag for each entry
156: 579d425 = 162: 312ab49 fscache: implement an FSCache-aware is_mount_point()
157: 740ba37 = 163: 321da45 clean: make use of FSCache
158: 6c80f38 = 164: 0c99949 pack-objects (mingw): demonstrate a segmentation fault with large deltas
159: b8a7891 ! 165: 656bbb1 mingw: support long paths
160: f07c648 = 166: 063ce36 win32(long path support): leave drive-less absolute paths intact
161: 8cf88c8 = 167: dac5b21 compat/fsmonitor/fsm-*-win32: support long paths
162: 560f57a = 168: 5e9cfc1 clean: suggest using
core.longPathsif paths are too long to remove163: 0b048a6 = 169: 646764a mingw: Support
git_terminal_promptwith more terminals164: 5913b03 = 170: b1a90f7 compat/terminal.c: only use the Windows console if bash 'read -r' fails
165: 566add0 = 171: 3b16ce1 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
166: bbb7777 = 172: 0800274 Win32: symlink: move phantom symlink creation to a separate function
167: 7b02b5f = 173: 9cbfe77 Introduce helper to create symlinks that knows about index_state
168: b8498b0 = 174: 5c9e8b5 mingw: allow to specify the symlink type in .gitattributes
169: 50c3456 = 175: 507bdb2 Win32: symlink: add test for
symlinkattribute170: e65b1e9 = 176: e5e6e9c mingw: explicitly specify with which cmd to prefix the cmdline
176: f1846f2 = 177: e6adbe3 mingw: introduce code to detect whether we're inside a Windows container
171: 0046c75 = 178: 0fb0397 mingw: when path_lookup() failed, try BusyBox
178: 50132a1 = 179: 425d896 mingw: when running in a Windows container, try to rename() harder
172: 063fa72 = 180: 9fba40b test-tool: learn to act as a drop-in replacement for
iconv180: 2941911 = 181: 020b3e6 mingw: move the file_attr_to_st_mode() function definition
173: 2f7aa93 = 182: 4cbf759 tests(mingw): if
iconvis unavailable, usetest-helper --iconv182: 321b1f8 = 183: a6bd75b mingw: Windows Docker volumes are not symbolic links
174: fd4393b = 184: 0b77c69 gitattributes: mark .png files as binary
184: e6bd949 = 185: 238369f mingw: work around rename() failing on a read-only file
175: d6023e4 = 186: d03e80c tests: move test PNGs into t/lib-diff/
177: 40d85fc = 187: 4f2ced7 tests: only override sort & find if there are usable ones in /usr/bin/
179: 68c5df3 = 188: 836b66c tests: use the correct path separator with BusyBox
181: 44a63d3 = 189: 88ee3db mingw: only use Bash-ism
builtin pwd -Wwhen available183: 9c4a3b6 = 190: 064cde7 tests (mingw): remove Bash-specific pwd option
185: b2cfbea = 191: 4535aa2 test-lib: add BUSYBOX prerequisite
186: fd8ff66 = 192: 0bc2b31 t5003: use binary file from t/lib-diff/
187: 3a94764 = 193: 498e063 t5532: workaround for BusyBox on Windows
188: dc17984 = 194: ef929cf t5605: special-case hardlink test for BusyBox-w32
189: 0361a2f = 195: 18f6b62 t5813: allow for $PWD to be a Windows path
190: 2259c00 = 196: a02f317 t9200: skip tests when $PWD contains a colon
191: 2b416f7 = 197: 0cc3d9d mingw: kill child processes in a gentler way
193: 5743ca1 = 198: e342052 mingw: optionally enable wsl compability file mode bits
194: 893a8e2 = 199: 66e76f0 mingw: really handle SIGINT
195: b128ba4 = 200: c0a926e Partially un-revert "editor: save and reset terminal after calling EDITOR"
199: f54641d = 201: a08268b Describe Git for Windows' architecture [no ci]
200: 8ec31e8 = 202: 80d5981 Modify the Code of Conduct for Git for Windows
201: 02208e5 = 203: 02dc4a3 CONTRIBUTING.md: add guide for first-time contributors
202: 7157f67 = 204: bf6ff77 README.md: Add a Windows-specific preamble
203: 52b8979 = 205: 08ebfcc Add an issue template
192: 709b80b = 206: dc37831 Add a GitHub workflow to monitor component updates
204: 27a8471 = 207: 6c162cc Modify the GitHub Pull Request template (to reflect Git for Windows)
196: fd86795 = 208: 7ec6e50 reset: reinstate support for the deprecated --stdin option
197: 27c9085 = 209: 8376c22 fsmonitor: reintroduce core.useBuiltinFSMonitor
198: 2d4fafd = 210: 6818c0a dependabot: help keeping GitHub Actions versions up to date
205: 47175e7 = 211: 7bb714a SECURITY.md: document Git for Windows' policies
This closes #6175.