Rebase shears/main: 4 conflict(s) (0 skipped, 4 resolved) (#23879956000)#81
Open
gitforwindowshelper[bot] wants to merge 287 commits intobase/shears/main-23879956000from
Open
Rebase shears/main: 4 conflict(s) (0 skipped, 4 resolved) (#23879956000)#81gitforwindowshelper[bot] wants to merge 287 commits intobase/shears/main-23879956000from
gitforwindowshelper[bot] wants to merge 287 commits intobase/shears/main-23879956000from
Conversation
For some reason, this test case was indented with 4 spaces instead of 1 horizontal tab. The other test cases in the same test script are fine. Signed-off-by: Jens Glathe <jens.glathe@oldschoolsolutions.biz> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
As of Git v2.28.0, the diff for files staged via `git add -N` marks them as new files. Git GUI was ill-prepared for that, and this patch teaches Git GUI about them. Please note that this will not even fix things with v2.28.0, as the `rp/apply-cached-with-i-t-a` patches are required on Git's side, too. This fixes git-for-windows#2779 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
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>
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 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>
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>
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>
Continue walking the code path for the >4GB `hash-object --literally` test. The `hash_object_file_literally()` function internally uses both `hash_object_file()` and `write_object_file_prepare()`. Both function signatures use `unsigned long` rather than `size_t` for the mem buffer sizes. Use `size_t` instead, for LLP64 compatibility. While at it, convert those function's object's header buffer length to `size_t` for consistency. The value is already upcast to `uintmax_t` for print format compatibility. Note: The hash-object test still does not pass. A subsequent commit continues to walk the call tree's lower level hash functions to identify further fixes. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 already defines a couple of helpful environment variables, and we can use those to infer the installation location as well as the CPU. No need for hard-coding ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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 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>
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>
MSYS2 defines some helpful environment variables, e.g. `MSYSTEM`. There is code in Git for Windows to ensure that that `MSYSTEM` variable is set, hard-coding a default. However, the existing solution jumps through hoops to reconstruct the proper default, and is even incomplete doing so, as we found out when we extended it to support CLANGARM64. This is absolutely unnecessary because there is already a perfectly valid `MSYSTEM` value we can use at build time. This is even true when building the MINGW32 variant on a MINGW64 system because `makepkg-mingw` will override the `MSYSTEM` value as per the `MINGW_ARCH` array. The same is equally true for the `/mingw64`, `/mingw32` and `/clangarm64` prefix: those values are already available via the `MINGW_PREFIX` environment variable, and we just need to pass that setting through. Only when `MINGW_PREFIX` is not set (as is the case in Git for Windows' minimal SDK, where only `MSYSTEM` is guaranteed to be set correctly), we use as fall-back the top-level directory whose name is the down-cased value of the `MSYSTEM` variable. Incidentally, this also broadens the support to all the configurations supported by the MSYS2 project, i.e. clang64 & ucrt64, too. Note: This keeps the same, hard-coded MSYSTEM platform support for CMake as before, but drops it for Meson (because it is unclear how Meson could do this in a more flexible manner). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A change between versions 2.4.1 and 2.6.0 of the MSYS2 runtime modified how Cygwin's runtime (and hence Git for Windows' MSYS2 runtime derivative) handles locales: d16a56306d (Consolidate wctomb/mbtowc calls for POSIX-1.2008, 2016-07-20). An unintended side-effect is that "cold-calling" into the POSIX emulation will start with a locale based on the current code page, something that Git for Windows is very ill-prepared for, as it expects to be able to pass a command-line containing non-ASCII characters to the shell without having those characters munged. One symptom of this behavior: when `git clone` or `git fetch` shell out to call `git-upload-pack` with a path that contains non-ASCII characters, the shell tried to interpret the entire command-line (including command-line parameters) as executable path, which obviously must fail. This fixes git-for-windows#1036 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
Special-casing even more configurations simply does not make sense. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows wants to add `git.exe` to the users' `PATH`, without cluttering the latter with unnecessary executables such as `wish.exe`. To that end, it invented the concept of its "Git wrapper", i.e. a tiny executable located in `C:\Program Files\Git\cmd\git.exe` (originally a CMD script) whose sole purpose is to set up a couple of environment variables and then spawn the _actual_ `git.exe` (which nowadays lives in `C:\Program Files\Git\mingw64\bin\git.exe` for 64-bit, and the obvious equivalent for 32-bit installations). Currently, the following environment variables are set unless already initialized: - `MSYSTEM`, to make sure that the MSYS2 Bash and the MSYS2 Perl interpreter behave as expected, and - `PLINK_PROTOCOL`, to force PuTTY's `plink.exe` to use the SSH protocol instead of Telnet, - `PATH`, to make sure that the `bin` folder in the user's home directory, as well as the `/mingw64/bin` and the `/usr/bin` directories are included. The trick here is that the `/mingw64/bin/` and `/usr/bin/` directories are relative to the top-level installation directory of Git for Windows (which the included Bash interprets as `/`, i.e. as the MSYS pseudo root directory). Using the absence of `MSYSTEM` as a tell-tale, we can detect in `git.exe` whether these environment variables have been initialized properly. Therefore we can call `C:\Program Files\Git\mingw64\bin\git` in-place after this change, without having to call Git through the Git wrapper. Obviously, above-mentioned directories must be _prepended_ to the `PATH` variable, otherwise we risk picking up executables from unrelated Git installations. We do that by constructing the new `PATH` value from scratch, appending `$HOME/bin` (if `HOME` is set), then the MSYS2 system directories, and then appending the original `PATH`. Side note: this modification of the `PATH` variable is independent of the modification necessary to reach the executables and scripts in `/mingw64/libexec/git-core/`, i.e. the `GIT_EXEC_PATH`. That modification is still performed by Git, elsewhere, long after making the changes described above. While we _still_ cannot simply hard-link `mingw64\bin\git.exe` to `cmd` (because the former depends on a couple of `.dll` files that are only in `mingw64\bin`, i.e. calling `...\cmd\git.exe` would fail to load due to missing dependencies), at least we can now avoid that extra process of running the Git wrapper (which then has to wait for the spawned `git.exe` to finish) by calling `...\mingw64\bin\git.exe` directly, via its absolute path. Testing this is in Git's test suite tricky: we set up a "new" MSYS pseudo-root and copy the `git.exe` file into the appropriate location, then verify that `MSYSTEM` is set properly, and also that the `PATH` is modified so that scripts can be found in `$HOME/bin`, `/mingw64/bin/` and `/usr/bin/`. This addresses git-for-windows#2283 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
Previously, we did not install any handler for Ctrl+C, but now we really want to because the MSYS2 runtime learned the trick to call the ConsoleCtrlHandler when Ctrl+C was pressed. With this, hitting Ctrl+C while `git log` is running will only terminate the Git process, but not the pager. This finally matches the behavior on Linux and on macOS. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This patch introduces support to set special NTFS attributes that are interpreted by the Windows Subsystem for Linux as file mode bits, UID and GID. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Handle Ctrl+C in Git Bash nicely Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
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>
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>
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>
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>
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>
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>
…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>
This topic branch addresses the following vulnerability: - **CVE-2025-66413**: When a user clones a repository from an attacker-controlled server, Git may attempt NTLM authentication and disclose the user's NTLMv2 hash to the remote server. Since NTLM hashing is weak, the captured hash can potentially be brute-forced to recover the user's credentials. This is addressed by disabling NTLM authentication by default. (GHSA-hv9c-4jm9-jh3x) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In 816db62 (credential: advertise NTLM suppression and allow helpers to re-enable, 2026-02-09), Git learned to advertise that NTLM authentication was suppressed to credential helpers. It also introduced a way to allow credential helpers to opt-back-in to NTLM authentication via the `ntlm_allow=1` credential protocol flag. There is a bug in the logic of 816db62 that means we are responding to the `ntlm_allow=1` signal too late in the auth retry codepath; we've already made the second-attempt request! Move adding of NTLM as a valid auth method to `http_request_reauth` right after the credential helper is consulted following the first request, but (now) before we made the second request. Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com>
The `osx-clang` and `osx-reftable` CI jobs on macOS started failing
with:
compat/regcomp_enhanced.c:7:13: error: use of undeclared identifier
'REG_ENHANCED'
The failure coincides with the GitHub Actions `macos-14-arm64` runner
image being updated from `20260302.0147` to `20260317.0174`. The key
change in that image update is the Homebrew version bump from 5.0.15 to
5.1.0.
Homebrew 5.1.0 introduced automatic linking for versioned keg-only
formulae when the unversioned sibling is absent (see
Homebrew/brew#21676, announced at
https://brew.sh/2026/03/10/homebrew-5.1.0/). The runner image installs
`llvm@15` (keg-only) but not unversioned `llvm`. Under Homebrew 5.0.x
that formula stayed in its keg and its `clang` binary only lived at
`$(brew --prefix llvm@15)/bin/clang`. Under 5.1.0, because unversioned
`llvm` is absent, `llvm@15` is now auto-linked into
`/opt/homebrew/bin/`, which sits earlier in PATH than `/usr/bin`.
The net effect is that `CC=clang` in CI now silently resolves to
Homebrew's LLVM 15.0.7 clang instead of Apple's system clang (Apple
clang 15.0.0, bundled with Xcode 15.4). The runner image README
confirms this: the reported "Clang/LLVM" version flipped from 15.0.0 to
15.0.7 between image releases, matching the Homebrew LLVM version
exactly.
Homebrew's LLVM clang uses different include paths from Apple's clang.
In particular, the `regex.h` it sees does not define `REG_ENHANCED`,
which is an Apple-specific extension present in the macOS SDK headers
since at least macOS 10.12. The Makefile unconditionally sets
`USE_ENHANCED_BASIC_REGULAR_EXPRESSIONS` for all Darwin builds via
`config.mak.uname`, which pulls in `compat/regcomp_enhanced.c`, which
references `REG_ENHANCED`, hence the build failure.
The `osx-gcc` job (CC=gcc-13) is unaffected because Homebrew GCC is
configured to use Apple's SDK sysroot, so it still picks up Apple's
`regex.h` which defines `REG_ENHANCED`. The `osx-meson` job is
unaffected because Meson does a compile-time test for `REG_ENHANCED`
(via `compiler.get_define`) and simply skips the feature when it is
absent.
Work around this by setting `NO_REGEX` when `CC=clang` on Darwin, which
makes the build use Git's bundled regex implementation instead of the
system one. This sidesteps the missing `REG_ENHANCED` define entirely.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
As of git-for-windows/MINGW-packages#187, Git for Windows no longer includes `git svn` in its installers and portable Git editions. As a consequence, the deprecation note is no longer necessary. Even worse: Since the recommendation for users who want (or at least need) to continue using `git svn` is to use the MSYS2 package instead, and that MSYS2 package is built from Git for Windows' source code, they would now be bothered by a note that they do not need. So let's drop that deprecation note. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In 816db62 (credential: advertise NTLM suppression and allow helpers to re-enable, 2026-02-09), Git learned to advertise that NTLM authentication was suppressed to credential helpers. It also introduced a way to allow credential helpers to opt-back-in to NTLM authentication via the `ntlm_allow=1` credential protocol flag. There is a bug in the logic of 816db62 that means we are responding to the `ntlm_allow=1` signal too late in the auth retry codepath; we've already made the second-attempt request! Move adding of NTLM as a valid auth method to `http_request_reauth` right after the credential helper is consulted following the first request, but (now) before we made the second request.
… Git for Windows, anyway) (git-for-windows#6142) As of git-for-windows/MINGW-packages#187, Git for Windows no longer includes `git svn` in its installers and portable Git editions. As a consequence, the deprecation note is no longer necessary. Even worse: Since the recommendation for users who want (or at least need) to continue using `git svn` is to use the MSYS2 package instead, and that MSYS2 package is built from Git for Windows' source code, they would now be bothered by a note that they do not need. So let's drop that deprecation note.
Currently, Git for Windows is built off of the MINGW64 tool chain. But this will have to change because [the MSYS2 project deprecated this tool chain in favor of UCRT64](https://www.msys2.org/news/#2026-03-15-deprecating-the-mingw64-environment). Of course, that's only possible because they dropped support for Windows 8.1, which Git for Windows will probably have to do relatively soon. The best time to do that is probably [the Git 3.0 inflection point](git-for-windows#6018) when we already promised to drop support for older Windows versions. To prepare for such a huge change, I investigated what needs to be changed in Git for Windows' source code. And the good news is there's actually not very much. This here patch seems to be the only change that's necessary, and not even _strictly_ necessary: the `mingw_strftime()` wrapper would still do the right thing. It would just uselessly load the same function that's already loaded, dynamically, again. - The `strerror()` override [is guarded by an `#ifndef _UCRT`](https://github.com/git-for-windows/git/blob/v2.53.0.windows.2/compat/mingw-posix.h#L294-L296), - `PRIuMAX` resolves to standard `"llu"` [via `<inttypes.h>`](https://github.com/git-for-windows/git/blob/v2.53.0.windows.2/compat/mingw-posix.h#L449-L454) (note that `__MINGW64_VERSION_MAJOR` is defined both in MINGW64 and UCRT64, by virtue of using the `mingw-w64-headers`), - [`__USE_MINGW_ANSI_STDIO=0`](https://github.com/git-for-windows/git/blob/v2.53.0.windows.2/config.mak.uname#L751C19-L751C33) is irrelevant because [`_UCRT` short-circuits it](https://github.com/git-for-windows/git-sdk-64/blob/08933e673c79b5db48419917a2b02746b390afc4/mingw64/include/inttypes.h#L33), and - `SNPRINTF_RETURNS_BOGUS` hasn't been set for Git for Windows' builds since ec47a33, i.e. for a _really_ long time.
It was already decided in ef22148 (clean: do not traverse mount points, 2018-12-07) that we shouldn't traverse NTFS junctions/bind mounts when using `git clean`, partly because they're sometimes used in worktrees. But the same check wasn't applied to `remove_dir_recurse()` in `dir.c`, which `git worktree remove` uses. So removing a worktree suffers the same problem we had previously with `git clean`. Let's add the same guard from ef22148. Signed-off-by: Maks Kuznia <makskuznia244@gmail.com>
…s#6151) `remove_dir_recurse()` in `dir.c` doesn't check for mount points, even though this check was already added for `git clean` in git-for-windows#2268. So `git worktree remove` (or anything else that calls it) will traverse NTFS junctions and delete whatever is there. Similar to git-for-windows#607. This extends the same check from git-for-windows#2268 but for anything that calls `remove_dir_recurse()`.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: main
From: 4fe64dbc74 (Don't traverse mount points in
remove_dir_recurse()(git-for-windows#6151), 2026-03-31) (b4cd1d3aef..4fe64dbc74)Resolved: a3c8829 (http: use new "best effort" strategy for Secure Channel revoke checking, 2020-03-04)
replaced http_schannel_check_revoke with http_schannel_check_revoke_mode (best-effort Secure Channel revoke checking) while preserving upstream's new HTTP retry variables
Range-diff
1: a3c8829 ! 1: 45ce214 http: use new "best effort" strategy for Secure Channel revoke checking
Resolved: 9f34f45 (http: optionally send SSL client certificate, 2021-06-23)
kept both CURLINFO_RETRY_AFTER and CURLSSLOPT_AUTO_CLIENT_CERT defines in date order
Range-diff
1: 9f34f45 ! 1: ae83585 http: optionally send SSL client certificate
Resolved: f491146 (Merge branch 'disallow-ntlm-auth-by-default', 2026-02-12)
kept both upstream HTTP 429 retry additions and downstream NTLM auth additions in http.c and t/lib-httpd.sh
Range-diff
1: f491146 ! 1: 72f281a Merge branch 'disallow-ntlm-auth-by-default'
@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> - ## Documentation/config/http.adoc ## -@@ Documentation/config/http.adoc: http.sslKeyType:: - See also libcurl `CURLOPT_SSLKEYTYPE`. Can be overridden by the - `GIT_SSL_KEY_TYPE` environment variable. - -+http.allowNTLMAuth:: -+ Whether or not to allow NTLM authentication. While very convenient to set -+ up, and therefore still used in many on-prem scenarios, NTLM is a weak -+ authentication method and therefore deprecated. Defaults to "false". -+ - http.schannelCheckRevoke:: - Used to enforce or disable certificate revocation checks in cURL - when http.sslBackend is set to "schannel" via "true" and "false", - - ## credential.c ## -@@ credential.c: int credential_read(struct credential *c, FILE *fp, - credential_set_capability(&c->capa_authtype, op_type); - else if (!strcmp(value, "state")) - credential_set_capability(&c->capa_state, op_type); -+ } else if (!strcmp(key, "ntlm")) { -+ if (!strcmp(value, "allow")) -+ c->ntlm_allow = 1; - } else if (!strcmp(key, "continue")) { - c->multistage = !!git_config_bool("continue", value); - } else if (!strcmp(key, "password_expiry_utc")) { -@@ credential.c: void credential_write(const struct credential *c, FILE *fp, - if (c->ephemeral) - credential_write_item(c, fp, "ephemeral", "1", 0); - } -+ if (c->ntlm_suppressed) -+ credential_write_item(c, fp, "ntlm", "suppressed", 0); - credential_write_item(c, fp, "protocol", c->protocol, 1); - credential_write_item(c, fp, "host", c->host, 1); - credential_write_item(c, fp, "path", c->path, 0); - - ## credential.h ## -@@ credential.h: struct credential { - struct credential_capability capa_authtype; - struct credential_capability capa_state; - -+ unsigned ntlm_suppressed:1, -+ ntlm_allow:1; -+ - char *username; - char *password; - char *credential; - ## http.c ## -@@ http.c: enum http_follow_config http_follow_config = HTTP_FOLLOW_INITIAL; - - static struct credential cert_auth = CREDENTIAL_INIT; - static int ssl_cert_password_required; --static unsigned long http_auth_methods = CURLAUTH_ANY; -+static unsigned long http_auth_any = CURLAUTH_ANY & ~CURLAUTH_NTLM; -+static unsigned long http_auth_methods; - static int http_auth_methods_restricted; - /* Modes for which empty_auth cannot actually help us. */ - static unsigned long empty_auth_useless = -@@ http.c: static int http_options(const char *var, const char *value, - return 0; - } - -+ if (!strcmp("http.allowntlmauth", var)) { -+ if (git_config_bool(var, value)) { -+ http_auth_any |= CURLAUTH_NTLM; -+ } else { -+ http_auth_any &= ~CURLAUTH_NTLM; -+ } -+ return 0; -+ } -+ - if (!strcmp("http.schannelcheckrevoke", var)) { - if (value && !strcmp(value, "best-effort")) { - http_schannel_check_revoke_mode = -@@ http.c: static void init_curl_http_auth(CURL *result) - - credential_fill(the_repository, &http_auth, 1); - -+ if (http_auth.ntlm_allow && !(http_auth_methods & CURLAUTH_NTLM)) { -+ http_auth_methods |= CURLAUTH_NTLM; -+ curl_easy_setopt(result, CURLOPT_HTTPAUTH, http_auth_methods); -+ } -+ - if (http_auth.password) { - if (always_auth_proactively()) { - /* -@@ http.c: static void init_curl_proxy_auth(CURL *result) - if (i == ARRAY_SIZE(proxy_authmethods)) { - warning("unsupported proxy authentication method %s: using anyauth", - http_proxy_authmethod); -- curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY); -+ curl_easy_setopt(result, CURLOPT_PROXYAUTH, http_auth_any); - } - } - else -- curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY); -+ curl_easy_setopt(result, CURLOPT_PROXYAUTH, http_auth_any); - } - - static int has_cert_password(void) -@@ http.c: static CURL *get_curl_handle(void) - } - - curl_easy_setopt(result, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); -- curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY); -+ curl_easy_setopt(result, CURLOPT_HTTPAUTH, http_auth_any); - - #ifdef CURLGSSAPI_DELEGATION_FLAG - if (curl_deleg) { + remerge CONFLICT (content): Merge conflict in http.c + index 1ab7e20d41..d568abd13b 100644 + --- http.c + +++ http.c @@ http.c: void http_init(struct remote *remote, const char *url, int proactive_auth) set_long_from_env(&curl_tcp_keepintvl, "GIT_TCP_KEEPINTVL"); set_long_from_env(&curl_tcp_keepcnt, "GIT_TCP_KEEPCNT"); -+ http_auth_methods = http_auth_any; +-<<<<<<< cfdc713289 (Merge 'readme' into HEAD) + set_long_from_env(&http_retry_after, "GIT_HTTP_RETRY_AFTER"); + set_long_from_env(&http_max_retries, "GIT_HTTP_MAX_RETRIES"); + set_long_from_env(&http_max_retry_time, "GIT_HTTP_MAX_RETRY_TIME"); +-======= + + http_auth_methods = http_auth_any; +->>>>>>> 816db62d10 (credential: advertise NTLM suppression and allow helpers to re-enable) + curl_default = get_curl_handle(); } - -@@ http.c: static int handle_curl_result(struct slot_results *results) - } else if (missing_target(results)) - return HTTP_MISSING_TARGET; - else if (results->http_code == 401) { -+ http_auth.ntlm_suppressed = (results->auth_avail & CURLAUTH_NTLM) && -+ !(http_auth_any & CURLAUTH_NTLM); -+ if (http_auth.ntlm_suppressed && http_auth.ntlm_allow) { -+ http_auth_methods |= CURLAUTH_NTLM; -+ return HTTP_REAUTH; -+ } - if ((http_auth.username && http_auth.password) ||\ - (http_auth.authtype && http_auth.credential)) { - if (http_auth.multistage) { -@@ http.c: static int handle_curl_result(struct slot_results *results) - credential_reject(the_repository, &http_auth); - if (always_auth_proactively()) - http_proactive_auth = PROACTIVE_AUTH_NONE; -+ if (http_auth.ntlm_suppressed) { -+ warning(_("Due to its cryptographic weaknesses, " -+ "NTLM authentication has been\n" -+ "disabled in Git by default. You can " -+ "re-enable it for trusted servers\n" -+ "by running:\n\n" -+ "git config set " -+ "http.%s://%s.allowNTLMAuth true"), -+ http_auth.protocol, http_auth.host); -+ } - return HTTP_NOAUTH; - } else { - http_auth_methods &= ~CURLAUTH_GSSNEGOTIATE; ## t/lib-httpd.sh ## + remerge CONFLICT (content): Merge conflict in t/lib-httpd.sh + index 5e304f2eba..7150a2a2f2 100644 + --- t/lib-httpd.sh + +++ t/lib-httpd.sh @@ t/lib-httpd.sh: prepare_httpd() { install_script error.sh install_script apply-one-time-script.sh install_script nph-custom-auth.sh -+ install_script ntlm-handshake.sh +-<<<<<<< cfdc713289 (Merge 'readme' into HEAD) + install_script http-429.sh +-======= + install_script ntlm-handshake.sh +->>>>>>> 816db62d10 (credential: advertise NTLM suppression and allow helpers to re-enable) ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules" - - ## t/lib-httpd/apache.conf ## -@@ t/lib-httpd/apache.conf: SetEnv PERL_PATH ${PERL_PATH} - CGIPassAuth on - </IfDefine> - </LocationMatch> -+<LocationMatch /ntlm_auth/> -+ SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} -+ SetEnv GIT_HTTP_EXPORT_ALL -+ <IfDefine USE_CGIPASSAUTH> -+ CGIPassAuth on -+ </IfDefine> -+</LocationMatch> - ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/ - ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/ - ScriptAlias /smart/no_report/git-receive-pack error-no-report.sh/ -@@ t/lib-httpd/apache.conf: ScriptAlias /error_smart/ error-smart-http.sh/ - ScriptAlias /error/ error.sh/ - ScriptAliasMatch /one_time_script/(.*) apply-one-time-script.sh/$1 - ScriptAliasMatch /custom_auth/(.*) nph-custom-auth.sh/$1 -+ScriptAliasMatch /ntlm_auth/(.*) ntlm-handshake.sh/$1 - <Directory ${GIT_EXEC_PATH}> - Options FollowSymlinks - </Directory> - - ## t/lib-httpd/ntlm-handshake.sh (new) ## -@@ -+#!/bin/sh -+ -+case "$HTTP_AUTHORIZATION" in -+'') -+ # No Authorization header -> send NTLM challenge -+ echo "Status: 401 Unauthorized" -+ echo "WWW-Authenticate: NTLM" -+ echo -+ ;; -+"NTLM TlRMTVNTUAAB"*) -+ # Type 1 -> respond with Type 2 challenge (hardcoded) -+ echo "Status: 401 Unauthorized" -+ # Base64-encoded version of the Type 2 challenge: -+ # signature: 'NTLMSSP\0' -+ # message_type: 2 -+ # target_name: 'NTLM-GIT-SERVER' -+ # flags: 0xa2898205 = -+ # NEGOTIATE_UNICODE, REQUEST_TARGET, NEGOTIATE_NT_ONLY, -+ # TARGET_TYPE_SERVER, TARGET_TYPE_SHARE, REQUEST_NON_NT_SESSION_KEY, -+ # NEGOTIATE_VERSION, NEGOTIATE_128, NEGOTIATE_56 -+ # challenge: 0xfa3dec518896295b -+ # context: '0000000000000000' -+ # target_info_present: true -+ # target_info_len: 128 -+ # version: '10.0 (build 19041)' -+ echo "WWW-Authenticate: NTLM TlRMTVNTUAACAAAAHgAeADgAAAAFgomi+j3sUYiWKVsAAAAAAAAAAIAAgABWAAAACgBhSgAAAA9OAFQATABNAC0ARwBJAFQALQBTAEUAUgBWAEUAUgACABIAVwBPAFIASwBHAFIATwBVAFAAAQAeAE4AVABMAE0ALQBHAEkAVAAtAFMARQBSAFYARQBSAAQAEgBXAE8AUgBLAEcAUgBPAFUAUAADAB4ATgBUAEwATQAtAEcASQBUAC0AUwBFAFIAVgBFAFIABwAIAACfOcZKYNwBAAAAAA==" -+ echo -+ ;; -+"NTLM TlRMTVNTUAAD"*) -+ # Type 3 -> accept without validation -+ exec "$GIT_EXEC_PATH"/git-http-backend -+ ;; -+*) -+ echo "Status: 500 Unrecognized" -+ echo -+ echo "Unhandled auth: '$HTTP_AUTHORIZATION'" -+ ;; -+esac - - ## t/t5563-simple-http-auth.sh ## -@@ t/t5563-simple-http-auth.sh: test_expect_success 'access using three-legged auth' ' - EOF - ' - -+test_lazy_prereq NTLM 'curl --version | grep -q NTLM' -+ -+test_expect_success NTLM 'access using NTLM auth' ' -+ test_when_finished "per_test_cleanup" && -+ -+ set_credential_reply get <<-EOF && -+ username=user -+ password=pwd -+ EOF -+ -+ test_config_global credential.helper test-helper && -+ test_must_fail env GIT_TRACE_CURL=1 git \ -+ ls-remote "$HTTPD_URL/ntlm_auth/repo.git" 2>err && -+ test_grep "allowNTLMAuth" err && -+ -+ # Can be enabled via config -+ GIT_TRACE_CURL=1 git -c http.$HTTPD_URL.allowNTLMAuth=true \ -+ ls-remote "$HTTPD_URL/ntlm_auth/repo.git" && -+ -+ # Or via credential helper responding with ntlm=allow -+ set_credential_reply get <<-EOF && -+ username=user -+ password=pwd -+ ntlm=allow -+ EOF -+ -+ git ls-remote "$HTTPD_URL/ntlm_auth/repo.git" -+' -+ - test_doneResolved: ec87da9 (mingw: use strftime() directly in UCRT builds (git-for-windows#6130), 2026-03-25)
took HEAD's version for all 5 files since the topic branch does not modify any of them; conflicts were from upstream evolution only
Range-diff
1: ec87da9 ! 1: 53737c7 mingw: use strftime() directly in UCRT builds (mingw: use strftime() directly in UCRT builds git#6130)
@@ Commit message since ec47a33fd2c3b679c3d8cbd440752414adb56ce9, i.e. for a _really_ long time. - ## Documentation/git-svn.adoc ## -@@ Documentation/git-svn.adoc: SYNOPSIS - -------- - [verse] - 'git svn' <command> [<options>] [<arguments>] -+(UNSUPPORTED!) - - DESCRIPTION - ----------- + ## builtin/reset.c ## + remerge CONFLICT (content): Merge conflict in builtin/reset.c + index e7f85f51b6..1cd7e61fe4 100644 + --- builtin/reset.c + +++ builtin/reset.c +@@ builtin/reset.c: int cmd_reset(int argc, + struct object_id oid; + struct pathspec pathspec; + int intent_to_add = 0; +-<<<<<<< 973552e1b8 (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + struct interactive_options interactive_opts = INTERACTIVE_OPTIONS_INIT; +-======= +- struct add_p_opt add_p_opt = ADD_P_OPT_INIT; +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + int nul_term_line = 0, read_from_stdin = 0; + const struct option options[] = { + OPT__QUIET(&quiet, N_("be quiet, only report errors")), - ## compat/mingw.c ## -@@ compat/mingw.c: int mingw_utime (const char *file_name, const struct utimbuf *times) - size_t mingw_strftime(char *s, size_t max, - const char *format, const struct tm *tm) - { -+#ifdef _UCRT -+ size_t ret = strftime(s, max, format, tm); -+#else - /* a pointer to the original strftime in case we can't find the UCRT version */ - static size_t (*fallback)(char *, size_t, const char *, const struct tm *) = strftime; - size_t ret; -@@ compat/mingw.c: size_t mingw_strftime(char *s, size_t max, - ret = strftime(s, max, format, tm); - else - ret = fallback(s, max, format, tm); -+#endif + ## git-curl-compat.h ## + remerge CONFLICT (content): Merge conflict in git-curl-compat.h + index e3f97c4fe6..5c8ceb076a 100644 + --- git-curl-compat.h + +++ git-curl-compat.h +@@ + #endif - if (!ret && errno == EINVAL) - die("invalid strftime format: '%s'", format); - - ## git-svn.perl ## -@@ git-svn.perl: sub term_init { - : new Term::ReadLine 'git-svn'; - } + /** +-<<<<<<< 973552e1b8 (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + * CURLINFO_RETRY_AFTER was added in 7.66.0, released in September 2019. + * It allows curl to automatically parse Retry-After headers. + */ +@@ + #endif -+sub deprecated_warning { -+ my @lines = @_; -+ if (-t STDERR) { -+ @lines = map { "\e[33m$_\e[0m" } @lines; -+ } -+ warn join("\n", @lines), "\n"; -+} -+ -+deprecated_warning( -+ "WARNING: \`git svn\` is no longer supported by the Git for Windows project.", -+ "See https://github.com/git-for-windows/git/issues/5405 for details." -+); -+ - my $cmd; - for (my $i = 0; $i < @ARGV; $i++) { - if (defined $cmd{$ARGV[$i]}) { + /** +-======= +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + * CURLSSLOPT_AUTO_CLIENT_CERT was added in 7.77.0, released in May + * 2021. + */ - ## t/t9108-git-svn-glob.sh ## -@@ t/t9108-git-svn-glob.sh: test_expect_success 'test disallow multi-globs' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch three 2> stderr.three && -- test_cmp expect.three stderr.three -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean && -+ test_cmp expect.three stderr.three.clean - ' + ## http.c ## + remerge CONFLICT (content): Merge conflict in http.c + index 914b2eea0c..5bc2ad8b87 100644 + --- http.c + +++ http.c +@@ http.c: static long http_schannel_check_revoke_mode = + CURLSSLOPT_NO_REVOKE; + #endif - test_done - - ## t/t9109-git-svn-multi-glob.sh ## -@@ t/t9109-git-svn-multi-glob.sh: test_expect_success 'test disallow multiple globs' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch three 2> stderr.three && -- test_cmp expect.three stderr.three -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean && -+ test_cmp expect.three stderr.three.clean - ' +-<<<<<<< 973552e1b8 (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + static long http_retry_after = 0; + static long http_max_retries = 0; + static long http_max_retry_time = 300; - test_done +-======= +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + /* + * With the backend being set to `schannel`, setting sslCAinfo would override + * the Certificate Store in cURL v7.60.0 and later, which is not what we want - ## t/t9168-git-svn-partially-globbed-names.sh ## -@@ t/t9168-git-svn-partially-globbed-names.sh: test_expect_success 'test disallow prefixed multi-globs' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch four 2>stderr.four && -- test_cmp expect.four stderr.four && -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.four >stderr.four.clean && -+ test_cmp expect.four stderr.four.clean && - git config --unset svn-remote.four.branches && - git config --unset svn-remote.four.tags - ' -@@ t/t9168-git-svn-partially-globbed-names.sh: test_expect_success 'test disallow multiple asterisks in one word' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch six 2>stderr.six && -- test_cmp expect.six stderr.six -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.six >stderr.six.clean && -+ test_cmp expect.six stderr.six.clean - ' + ## refs/reftable-backend.c ## + remerge CONFLICT (content): Merge conflict in refs/reftable-backend.c + index cf837733b8..23b18837c8 100644 + --- refs/reftable-backend.c + +++ refs/reftable-backend.c +@@ refs/reftable-backend.c: static struct ref_store *reftable_be_init(struct repository *repo, + mask = umask(0); + umask(mask); - test_done +-<<<<<<< 973552e1b8 (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir, + &ref_common_dir); + + reftable_set_alloc(malloc, realloc, free); + base_ref_store_init(&refs->base, repo, refdir.buf, &refs_be_reftable); +-======= +- reftable_set_alloc(malloc, realloc, free); +- base_ref_store_init(&refs->base, repo, gitdir, &refs_be_reftable); +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + strmap_init(&refs->worktree_backends); + refs->store_flags = store_flags; + refs->log_all_ref_updates = repo_settings_get_log_all_ref_updates(repo); + + ## t/meson.build ## + remerge CONFLICT (content): Merge conflict in t/meson.build + index d7118cd1ab..81591f64bf 100644 + --- t/meson.build + +++ t/meson.build +@@ t/meson.build: integration_tests = [ + 't7422-submodule-output.sh', + 't7423-submodule-symlinks.sh', + 't7424-submodule-mixed-ref-formats.sh', +-<<<<<<< 973552e1b8 (`git svn`: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)) + 't7425-submodule-gitdir-path-extension.sh', + 't7426-submodule-get-default-remote.sh', +-======= +->>>>>>> 1253fdbf0c (mingw: use strftime() directly in UCRT builds) + 't7429-submodule-long-path.sh', + 't7450-bad-git-dotfiles.sh', + 't7500-commit-template-squash-signoff.sh',To: 8279c02a0f (Don't traverse mount points in
remove_dir_recurse()(git-for-windows#6151), 2026-03-31) (30ae3040ec..8279c02a0f)Statistics
Range-diff (click to expand)
1: 9394bde = 1: 4df7813 sideband: mask control characters
2: 99924f5 = 2: 643223b sideband: introduce an "escape hatch" to allow control characters
3: c842e04 = 3: 5191e76 sideband: do allow ANSI color sequences by default
4: 2cc5fce = 4: 35481d3 unix-socket: avoid leak when initialization fails
5: 1886408 = 5: e28c386 Merge branch 'disallow-control-characters-in-sideband-channel'
6: f6acc86 = 6: 6912f6c grep: prevent
^$false match at end of file7: 2571079 = 7: 09fa3dc Merge branch 'fixes-from-the-git-mailing-list'
8: 145ea07 = 8: 05305fc t9350: point out that refs are not updated correctly
26: fc1a260 = 9: 650d961 transport-helper: add trailing --
32: e03085d = 10: a256bd3 remote-helper: check helper status after import/export
42: 8222dca = 11: 9c89255 Always auto-gc after calling a fast-import transport
43: 2ce510a = 12: b8eaef7 mingw: prevent regressions with "drive-less" absolute paths
14: a247837 = 13: b8813f3 mingw: include the Python parts in the build
16: 9f8f22f = 14: 3d26099 win32/pthread: avoid name clashes with winpthread
19: 6e23f47 = 15: 9892398 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
22: 3f48358 = 16: 20f53f3 Import the source code of mimalloc v2.2.7
25: ea415f6 = 17: 0b93212 mimalloc: adjust for building inside Git
27: fb8cd1f = 18: 1c7438a mingw: demonstrate a
git addissue with NTFS junctions30: cdf5459 = 19: de727d4 mimalloc: offer a build-time option to enable it
33: 2bb6dfc = 20: e6c13f7 clean: do not traverse mount points
34: 442e57b = 21: 3a06dcc strbuf_realpath(): use platform-dependent API if available
40: 3f90053 = 22: 7af6844 mingw: use mimalloc
44: d8226a4 = 23: 9a1e238 clean: remove mount points when possible
45: 054d995 = 24: 47d3fe5 transport: optionally disable side-band-64k
46: c6efc8f = 25: 9a1d5b7 mingw: fix fatal error working on mapped network drives on Windows
47: 2368693 = 26: 68b6bc3 clink.pl: fix MSVC compile script to handle libcurl-d.lib
48: e4f8a95 = 27: 6de9a58 mingw: implement a platform-specific
strbuf_realpath()9: cc877f4 = 28: d9d69b0 vcpkg_install: detect lack of Git
10: 5770e9f = 29: e1881cd vcpkg_install: add comment regarding slow network connections
11: 30e24e9 = 30: 83adec3 vcbuild: install ARM64 dependencies when building ARM64 binaries
12: 9d7c4ed = 31: f16a561 vcbuild: add an option to install individual 'features'
13: 210a7d4 = 32: 9639d1d cmake: allow building for Windows/ARM64
15: 8aef04e = 33: 2905579 ci(vs-build) also build Windows/ARM64 artifacts
17: 1acf55d = 34: 31660a4 Add schannel to curl installation
31: 5ef4ea1 = 35: 8bfbac6 t5505/t5516: allow running without
.git/branches/in the templates20: 4b8dc94 = 36: e3da4eb cmake(): allow setting HOST_CPU for cross-compilation
35: a3c8829 ! 37: 45ce214 http: use new "best effort" strategy for Secure Channel revoke checking
41: 3afcddc = 38: ad8aee4 t5505/t5516: fix white-space around redirectors
49: 157b795 = 39: e05e9c8 t3701: verify that we can add lots of files interactively
50: f39f083 = 40: de9505d commit: accept "scissors" with CR/LF line endings
51: b33082b = 41: ccc251e t0014: fix indentation
52: 7790302 = 42: dffbc0c git-gui: accommodate for intent-to-add files
53: 07307a8 = 43: b2c6a76 mingw: allow for longer paths in
parse_interpreter()54: 5b7842a = 44: ef18515 compat/vcbuild: document preferred way to build in Visual Studio
62: bf4fa8c = 45: ee20269 windows: skip linking
git-<command>for built-ins63: ccb33fc = 46: acf54ff mingw: stop hard-coding
CC = gcc64: deebb40 = 47: 047a47f mingw: drop the -D_USE_32BIT_TIME_T option
65: b5b791e = 48: 1531076 mingw: only use -Wl,--large-address-aware for 32-bit builds
66: 414f812 = 49: 420730f mingw: avoid over-specifying
--pic-executable67: cf54e1f = 50: ae2f1ce mingw: set the prefix and HOST_CPU as per MSYS2's settings
68: 0a366bd = 51: 83433e9 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
69: 7b3c002 = 52: 3436439 mingw: rely on MSYS2's metadata instead of hard-coding it
18: d17b006 = 53: c82e935 hash-object: demonstrate a >4GB/LLP64 problem
70: 124e19f = 54: 2d51790 mingw: always define
ETC_*for MSYS2 environments21: d98fc56 = 55: 899f9d6 object-file.c: use size_t for header lengths
71: 5d34f7b = 56: f60a692 max_tree_depth: lower it for clang builds in general on Windows
23: 4c1a2f2 = 57: 26de923 CMake: default Visual Studio generator has changed
24: ffd5653 = 58: 0571cfd hash algorithms: use size_t for section lengths
72: 89b8d6b = 59: 9dde989 mingw: ensure valid CTYPE
28: 966d6ee = 60: a20a9f7 .gitignore: add Visual Studio CMakeSetting.json file
29: 57dc083 = 61: 64703af hash-object --stdin: verify that it works with >4GB/LLP64
74: bcad6c4 = 62: 7f9c76e mingw: allow
git.exeto be used instead of the "Git wrapper"36: 7988111 = 63: ebcb1d0 subtree: update
contrib/subtreetesttarget37: 074db55 = 64: c226356 CMakeLists: add default "x64-windows" arch for Visual Studio
38: 28cae37 = 65: c223726 hash-object: add another >4GB/LLP64 test case
39: 7d56ee6 = 66: 9c75830 setup: properly use "%(prefix)/" when in WSL
98: d918292 = 67: 99f22d8 Add config option
windows.appendAtomically76: 4d4277e = 68: 5433864 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
87: a1324a2 = 69: 3e31b6e MinGW: link as terminal server aware
55: 9f34f45 ! 70: ae83585 http: optionally send SSL client certificate
56: c0ab42a = 71: 44158f5 ci: run
contrib/subtreetests in CI builds57: e67dfd7 = 72: 8d51b08 CMake: show Win32 and Generator_platform build-option values
58: 3a2da75 = 73: 8daa700 hash-object: add a >4GB/LLP64 test case using filtered input
59: 27a08ba = 74: 2903f0f compat/mingw.c: do not warn when failing to get owner
60: 1151794 = 75: 16daa17 mingw: $env:TERM="xterm-256color" for newer OSes
61: fbf0851 = 76: e05f6b6 winansi: check result and Buffer before using Name
103: 86b9aba = 77: 85162a1 mingw: change core.fsyncObjectFiles = 1 by default
104: f945573 = 78: 66c705a Fix Windows version resources
105: 317ba12 = 79: 62adc10 status: fix for old-style submodules with commondir
73: 96a95bd = 80: a839f6a ci: work around a problem with HTTP/2 vs libcurl v8.10.0
75: 95d10b4 = 81: 50296f7 revision: create mark_trees_uninteresting_dense()
77: fefdcc6 = 82: 0cabb06 survey: stub in new experimental 'git-survey' command
119: 90fb59a = 83: 31c41be Merge 'remote-hg-prerequisites' into HEAD
78: da5a7a7 = 84: 78e29ec Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
79: 75bab44 = 85: 7e579e7 survey: add command line opts to select references
120: e54899d = 86: 1df9a0a Merge branch 'drive-prefix'
80: 6308659 = 87: 25d6a54 clink.pl: fix libexpatd.lib link error when using MSVC
81: bd4c3f2 = 88: fc69d51 survey: start pretty printing data in table form
121: 0f42129 = 89: 6eba6c3 Merge branch 'dont-clean-junctions'
82: 56249ba = 90: a9617c7 Makefile: clean up .ilk files when MSVC=1
83: 457be1c = 91: d97fc43 survey: add object count summary
122: ac73991 = 92: 32c5de2 Merge branch 'msys2-python'
84: cb0fd3b = 93: 0ddf082 vcbuild: add support for compiling Windows resource files
85: 72b664f = 94: 684eb3a survey: summarize total sizes by object type
123: f7a5570 = 95: b5f5fc0 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
86: bba825c = 96: 224278d config.mak.uname: add git.rc to MSVC builds
88: 20e4201 = 97: f6706b9 survey: show progress during object walk
89: 14911d6 = 98: d944b7a mingw: make sure
errnois set correctly when socket operations fail124: cf81b9e = 99: 44c060a Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
90: 04824a1 = 100: bc20f68 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
91: 27f49ed = 101: 60b0475 http: optionally load libcurl lazily
92: 902b62f = 102: 55344cc survey: add ability to track prioritized lists
93: 089a20b = 103: f0ee0dd compat/mingw: handle WSA errors in strerror
125: 21ae07b = 104: d0a11b9 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
94: 98f5c3c = 105: 48e2877 clink.pl: move default linker options for MSVC=1 builds
95: 5365a8b = 106: bbe4daa http: support lazy-loading libcurl also on Windows
96: 4552d8f = 107: 4dcd725 survey: add report of "largest" paths
97: 9a59e67 = 108: 7300fc2 compat/mingw: drop outdated comment
126: 41a03e0 = 109: 938f5e3 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
99: d0077cb = 110: cbdd617 cmake: install headless-git.
100: b225eca = 111: 1f288b8 http: when loading libcurl lazily, allow for multiple SSL backends
101: a972b7d = 112: 7dd0b24 survey: add --top= option and config
102: f414593 = 113: 3fc7f4b t0301: actually test credential-cache on Windows
127: 85ffe52 = 114: 80643ae Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction106: 42e7a48 = 115: 32ba2e1 git.rc: include winuser.h
107: bfe4d58 = 116: 70516df mingw: do load libcurl dynamically by default
108: cf1367a = 117: 7b33200 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
109: 0968b72 = 118: 06669e3 mingw: suggest
windows.appendAtomicallyin more cases110: f5292f4 = 119: c047c41 win32: use native ANSI sequence processing, if possible
111: 1ed8469 = 120: e84dac8 common-main.c: fflush stdout buffer upon exit
112: 4468ba1 = 121: f38e9cd t5601/t7406(mingw): do run tests with symlink support
113: 1d8d0d8 = 122: 630680b win32: ensure that
localtime_r()is declared even in i686 builds114: 56a266e = 123: 8617eee Fallback to AppData if XDG_CONFIG_HOME is unset
115: a6dfb8b = 124: 59dd026 run-command: be helpful with Git LFS fails on Windows 7
116: 79b70a5 = 125: 18c5cac survey: clearly note the experimental nature in the output
117: 0ef1fa2 = 126: d3bfec7 credential-cache: handle ECONNREFUSED gracefully
118: 0f3d2eb = 127: 722e0af reftable: do make sure to use custom allocators
152: f87e998 = 128: 4d905d6 check-whitespace: avoid alerts about upstream commits
153: e4e6daa = 129: 3defbf4 t/t5571-prep-push-hook.sh: Add test with writing to stderr
128: 69f4c13 = 130: c3cbfa2 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
129: 2fac3ba = 131: 730dd6a Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
130: ad98356 = 132: 72a1fef Merge 'add-p-many-files'
131: 353325a = 133: 680314c Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
132: a3bbd34 = 134: 2235182 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
133: 47eab39 = 135: be2c53c Merge 'git-gui/js/intent-to-add'
134: 7e27706 = 136: 29cceca Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
135: 0f8584e = 137: 0a6c5a9 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
136: e59c746 = 138: 9f13220 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
137: 637cc5f = 139: 91716c7 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path138: 6699587 = 140: eaef64f Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
139: 1f3b4b2 = 141: d66a051 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
140: 34f137b = 142: 1ad3527 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests141: 2ad2f96 = 143: a691d3a Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
142: aad94c2 = 144: 541c595 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t143: cb73514 = 145: 032bfd6 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory144: 4de53c3 = 146: f20e360 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
145: e3265ce = 147: a65e6cc Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
146: 3e6bbf2 = 148: b3aa4cf Merge branch 'optionally-dont-append-atomically-on-windows'
147: c44024a = 149: fb8ae10 Merge branch 'fsync-object-files-always'
148: 48b485c = 150: 9afc948 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
149: c3695bc = 151: 09c8241 Fix Windows version resources (Fix Windows version resources git#4092)
150: 72d20ef = 152: c390fef Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
151: a5c6b44 = 153: 6225c60 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)154: 71574db = 154: 17c2bce Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)155: 58641f3 = 155: b6757af Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283156: 02e9349 = 156: 3f31d12 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
157: b73d7e4 = 157: b695747 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
158: 3e862b4 = 158: a9e9485 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
159: 79bf585 = 159: 70160df Merge branch 'nano-server'
160: ea72dd9 = 160: fabd190 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
161: b304aa8 = 161: 55542cd win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
162: 313b35d = 162: 5271e4c common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
163: e656df6 = 163: 2bc9ce2 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
164: e3d96cb = 164: 11723f0 Merge branch 'Fix-i686-build-with-GCC-v14'
165: 31b4944 = 165: b8f3466 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
166: 0606a99 = 166: b749132 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
167: b22d3cd = 167: 75fda9e pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
168: 18a552c = 168: a7ab9cd Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
169: 48925dd = 169: 843c85c Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
170: 70934a1 = 170: a999e2f credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
171: fa748ca = 171: ad08373 Merge branch 'reftable-vs-custom-allocators'
172: 5fbc735 = 172: 6b39840 Merge branch 'check-whitespace-only-downstream'
173: 233dd10 = 173: 6016ae8 t/t5571-prep-push-hook.sh: Add test with writing to stderr (t/t5571-prep-push-hook.sh: Add test with writing to stderr git#6063)
174: 35ea522 = 174: 0677846 Merge branch 'ready-for-upstream'
175: 6ac280f = 175: c1ea1f1 git-svn: mark it as unsupported by the Git for Windows project
176: d252557 = 176: 24f56b5 ci(macos): skip the
git p4tests177: faf533d = 177: 32ae80e git-svn: mark it as unsupported by the Git for Windows project (git-svn: mark it as unsupported by the Git for Windows project git#5923)
178: df3e9e3 = 178: e4468f0 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)179: 461c296 = 179: 0dc4fc1 Win32: make FILETIME conversion functions public
180: 813abb5 = 180: 79271c8 Win32: dirent.c: Move opendir down
182: 7a0fb1d = 181: 4a4e5da mingw: make the dirent implementation pluggable
184: 476e1f4 = 182: 0cd6278 Win32: make the lstat implementation pluggable
186: 6d2892e = 183: 2f1470e mingw: add infrastructure for read-only file system level caches
187: adba883 = 184: 8aaf417 mingw: add a cache below mingw's lstat and dirent implementations
188: d3ab4fc = 185: 762e205 fscache: load directories only once
189: fa57c68 = 186: 6a21019 fscache: add key for GIT_TRACE_FSCACHE
190: 4bef39b = 187: ba1f659 fscache: remember not-found directories
191: 03e64db = 188: 8d4c4b8 fscache: add a test for the dir-not-found optimization
192: cfbb982 = 189: 28576b1 add: use preload-index and fscache for performance
193: 62b5e86 = 190: 8b865e7 dir.c: make add_excludes aware of fscache during status
194: 0e3d1ed = 191: bd8c47b fscache: make fscache_enabled() public
195: 2fb1eb3 = 192: eb1085d dir.c: regression fix for add_excludes with fscache
196: efc971b = 193: 0e8eace fetch-pack.c: enable fscache for stats under .git/objects
197: 4be3336 = 194: 7ce18f0 checkout.c: enable fscache for checkout again
198: 3651f68 = 195: d492c46 Enable the filesystem cache (fscache) in refresh_index().
199: a5a74bd = 196: 6f7d37b fscache: use FindFirstFileExW to avoid retrieving the short name
200: 2c76d14 = 197: 1cdc5c6 fscache: add GIT_TEST_FSCACHE support
201: ffaf885 = 198: 1a6b7d8 fscache: add fscache hit statistics
181: f5e4293 = 199: 1fc58ae git-gui--askyesno: fix funny text wrapping
202: e40b6b7 = 200: ca04e13 unpack-trees: enable fscache for sparse-checkout
183: 9d42b6d = 201: 5c59a8c git-gui--askyesno (mingw): use Git for Windows' icon, if available
203: 92e796b = 202: 7cc5cee status: disable and free fscache at the end of the status command
185: 80e2092 = 203: 7a4a287 Merge branch 'git-gui-askyesno'
204: 61fcc8d = 204: 49d2e49 mem_pool: add GIT_TRACE_MEMPOOL support
205: 797979f = 205: 0758e55 fscache: fscache takes an initial size
206: 0bbed32 = 206: 48c54ac fscache: update fscache to be thread specific instead of global
207: 9ea4beb = 207: 78b55e2 fscache: teach fscache to use mempool
208: 778db5d = 208: 3c391a2 fscache: make fscache_enable() thread safe
209: 3ac73f4 = 209: c9950f4 fscache: teach fscache to use NtQueryDirectoryFile
210: fb047a9 = 210: 82b2aa0 fscache: remember the reparse tag for each entry
211: 4315aa4 = 211: d2205bd Merge branch 'fscache'
212: b95579e = 212: 2da6c79 fscache: implement an FSCache-aware is_mount_point()
213: 7d89a8f = 213: 6a9cc7f Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
214: 441da28 = 214: 14dd191 clean: make use of FSCache
215: c7510bc = 215: 3003071 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
216: 5e9f05f = 216: 154c3a4 Merge branch 'dont-clean-junctions-fscache'
217: c705693 = 217: 6d9829b pack-objects (mingw): demonstrate a segmentation fault with large deltas
218: b1e20ee = 218: 06388ff mingw: support long paths
219: 39f8a53 = 219: a85ce6d win32(long path support): leave drive-less absolute paths intact
220: 11663f6 = 220: aa3bd9c compat/fsmonitor/fsm-*-win32: support long paths
221: 6ab9d55 = 221: 4b5baf4 clean: suggest using
core.longPathsif paths are too long to remove222: 1dbbb7f = 222: 8a76add mingw: Support
git_terminal_promptwith more terminals223: 42d7900 = 223: cc40de8 compat/terminal.c: only use the Windows console if bash 'read -r' fails
224: ac46000 = 224: 418d374 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
225: 1f2faa6 = 225: 584ff29 Win32: symlink: move phantom symlink creation to a separate function
226: c7c1910 = 226: 7b09fda Introduce helper to create symlinks that knows about index_state
227: 0f8f5a4 = 227: e14c1c0 mingw: allow to specify the symlink type in .gitattributes
228: df188a7 = 228: 8bbbaf1 Win32: symlink: add test for
symlinkattribute229: 68f588d = 229: 8ba7f77 mingw: explicitly specify with which cmd to prefix the cmdline
230: 737f06b = 230: c38a0fb mingw: when path_lookup() failed, try BusyBox
231: aca31ee = 231: 34224b3 test-tool: learn to act as a drop-in replacement for
iconv232: 8b45c65 = 232: cd88360 tests(mingw): if
iconvis unavailable, usetest-helper --iconv233: 6376ec4 = 233: 01de596 gitattributes: mark .png files as binary
234: 88bcef5 = 234: cd00396 tests: move test PNGs into t/lib-diff/
236: 2b1dc89 = 235: b61edd2 tests: only override sort & find if there are usable ones in /usr/bin/
238: b4ff32a = 236: 0059657 tests: use the correct path separator with BusyBox
240: 8b5bf3b = 237: 7e947fc mingw: only use Bash-ism
builtin pwd -Wwhen available242: 404d498 = 238: d3405e1 tests (mingw): remove Bash-specific pwd option
244: edccf9f = 239: 4f552c8 test-lib: add BUSYBOX prerequisite
246: 9f79eb9 = 240: f4b86a7 t5003: use binary file from t/lib-diff/
235: 43a8d68 = 241: ffb7f02 mingw: introduce code to detect whether we're inside a Windows container
248: 3d02a5b = 242: d9c6dbb t5532: workaround for BusyBox on Windows
237: 1ec9eae = 243: b3e7b11 mingw: when running in a Windows container, try to rename() harder
250: 0e36a7a = 244: a9d52c6 t5605: special-case hardlink test for BusyBox-w32
239: 03d43c3 = 245: 1dda4c2 mingw: move the file_attr_to_st_mode() function definition
252: 1fa7c2a = 246: b2a5fca t5813: allow for $PWD to be a Windows path
241: f2e7024 = 247: f3b2049 mingw: Windows Docker volumes are not symbolic links
254: c62d79c = 248: d2354f0 t9200: skip tests when $PWD contains a colon
243: 4f35a20 = 249: fdbfde7 mingw: work around rename() failing on a read-only file
257: 330550e = 250: 9e164de mingw: kill child processes in a gentler way
258: c696484 = 251: 27d34c3 mingw: optionally enable wsl compability file mode bits
245: 75aa851 = 252: f69ddac Merge branch 'gitk-and-git-gui-patches'
247: 74c46cb = 253: f7faeea Merge branch 'long-paths'
249: d7d768e = 254: c65d223 Merge branch 'msys2'
251: 5effb0a = 255: 2531965 Merge 'docker-volumes-are-no-symlinks'
253: ec6c73f = 256: 0c6b525 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
255: 9ebada8 = 257: 6e73d79 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
256: 086264a = 258: a81d827 Describe Git for Windows' architecture [no ci]
259: 00d225e = 259: 10e0f13 Merge branch 'busybox-w32'
260: befb940 = 260: 26d41ee Modify the Code of Conduct for Git for Windows
261: 8db87dd = 261: e383ea6 mingw: really handle SIGINT
262: 3d2c293 = 262: cf3f116 Merge branch 'wsl-file-mode-bits'
263: 1aa0151 = 263: db839f4 CONTRIBUTING.md: add guide for first-time contributors
264: c24c613 = 264: e21cde5 Partially un-revert "editor: save and reset terminal after calling EDITOR"
265: 0f80d89 = 265: 6f2fbe9 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
266: 7e58d1d = 266: 31bf452 README.md: Add a Windows-specific preamble
267: 28b2796 = 267: a0428c8 reset: reinstate support for the deprecated --stdin option
268: 12cfc1f = 268: 6c3cc8c Merge branch 'un-revert-editor-save-and-reset'
269: d0cd629 = 269: 1862ddb Add an issue template
270: bf2de17 = 270: 1b168ab Add a GitHub workflow to monitor component updates
271: c6ae1dc = 271: db909d8 fsmonitor: reintroduce core.useBuiltinFSMonitor
272: 7b0096c = 272: bddc774 Merge branch 'phase-out-reset-stdin'
273: 41277ee = 273: cc1b5bf Modify the GitHub Pull Request template (to reflect Git for Windows)
274: 16508b6 = 274: f5a8891 dependabot: help keeping GitHub Actions versions up to date
275: 6c182c6 = 275: 36bfc3b Merge branch 'deprecate-core.useBuiltinFSMonitor'
276: 8cddbbb = 276: 710ef1a SECURITY.md: document Git for Windows' policies
277: 5ffd65e = 277: d434e98 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
278: 277ef25 = 278: cfdc713 Merge 'readme' into HEAD
279: f491146 ! 279: 72f281a Merge branch 'disallow-ntlm-auth-by-default'
@@ http.c: static CURL *get_curl_handle(void) #ifdef CURLGSSAPI_DELEGATION_FLAG if (curl_deleg) { @@ http.c: void http_init(struct remote *remote, const char *url, int proactive_auth) - set_long_from_env(&curl_tcp_keepintvl, "GIT_TCP_KEEPINTVL"); - set_long_from_env(&curl_tcp_keepcnt, "GIT_TCP_KEEPCNT"); + set_long_from_env(&http_max_retries, "GIT_HTTP_MAX_RETRIES"); + set_long_from_env(&http_max_retry_time, "GIT_HTTP_MAX_RETRY_TIME"); + http_auth_methods = http_auth_any; + @@ http.c: static int handle_curl_result(struct slot_results *results) ## t/lib-httpd.sh ## @@ t/lib-httpd.sh: prepare_httpd() { - install_script error.sh install_script apply-one-time-script.sh install_script nph-custom-auth.sh + install_script http-429.sh + install_script ntlm-handshake.sh ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules" @@ t/lib-httpd/apache.conf: SetEnv PERL_PATH ${PERL_PATH} ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/ ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/ ScriptAlias /smart/no_report/git-receive-pack error-no-report.sh/ -@@ t/lib-httpd/apache.conf: ScriptAlias /error_smart/ error-smart-http.sh/ - ScriptAlias /error/ error.sh/ +@@ t/lib-httpd/apache.conf: ScriptAlias /error/ error.sh/ ScriptAliasMatch /one_time_script/(.*) apply-one-time-script.sh/$1 + ScriptAliasMatch /http_429/(.*) http-429.sh/$1 ScriptAliasMatch /custom_auth/(.*) nph-custom-auth.sh/$1 +ScriptAliasMatch /ntlm_auth/(.*) ntlm-handshake.sh/$1 <Directory ${GIT_EXEC_PATH}>280: 560fc67 = 280: 4dea3d5 osx-clang: work around Homebrew's clang lacking REG_ENHANCED
281: 47d8902 ! 281: 2f6e61a http: fix bug in ntlm_allow=1 handling
@@ http.c: static int handle_curl_result(struct slot_results *results) if ((http_auth.username && http_auth.password) ||\ (http_auth.authtype && http_auth.credential)) { if (http_auth.multistage) { -@@ http.c: static int http_request_reauth(const char *url, - - credential_fill(the_repository, &http_auth, 1); +@@ http.c: static int http_request_recoverable(const char *url, + credential_fill(the_repository, &http_auth, 1); + } + /* + * Re-enable NTLM auth if the helper allows it and we would @@ http.c: static int http_request_reauth(const char *url, + ret = http_request(url, result, target, options); } - return ret; + if (ret == HTTP_RATE_LIMITED) {282: a25e3ca = 282: 9d7773b http: fix bug in ntlm_allow=1 handling (http: fix bug in ntlm_allow=1 handling git#6136)
283: cf0d519 = 283: be7a575 fixup! git-svn: mark it as unsupported by the Git for Windows project
284: 67948d5 = 284: 973552e
git svn: remove deprecation note (since it is no longer included in Git for Windows, anyway) (git svn: remove deprecation note (since it is no longer included in Git for Windows, anyway) git#6142)285: ec87da9 = 285: 53737c7 mingw: use strftime() directly in UCRT builds (mingw: use strftime() directly in UCRT builds git#6130)
-: ---------- > 286: 3b6235f dir: do not traverse mount points
-: ---------- > 287: 8279c02 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)