Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#25662111224)#155
Open
gitforwindowshelper[bot] wants to merge 287 commits into
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#25662111224)#155gitforwindowshelper[bot] wants to merge 287 commits into
gitforwindowshelper[bot] wants to merge 287 commits into
Conversation
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>
This is no longer true in general, not with supporting Clang out of the box. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib` rather than `libexpat.lib`. It appears that the `vcpkg` package for "libexpat" has changed and now creates `libexpatd.lib` for debug mode builds. Previously, both debug and release builds created a ".lib" with the same basename. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
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>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
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>
Create a wrapper for the Windows Resource Compiler (RC.EXE) for use by the MSVC=1 builds. This is similar to the CL.EXE and LIB.EXE wrappers used for the MSVC=1 builds. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
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>
Teach MSVC=1 builds to depend on the `git.rc` file so that the resulting executables have Windows-style resources and version number information within them. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This compile-time option allows to ask Git to load libcurl dynamically at runtime. Together with a follow-up patch that optionally overrides the file name depending on the `http.sslBackend` setting, this kicks open the door for installing multiple libcurl flavors side by side, and load the one corresponding to the (runtime-)configured SSL/TLS backend. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
MSYS2 defines some helpful environment variables, e.g. `MSYSTEM`. There is code in Git for Windows to ensure that that `MSYSTEM` variable is set, hard-coding a default. However, the existing solution jumps through hoops to reconstruct the proper default, and is even incomplete doing so, as we found out when we extended it to support CLANGARM64. This is absolutely unnecessary because there is already a perfectly valid `MSYSTEM` value we can use at build time. This is even true when building the MINGW32 variant on a MINGW64 system because `makepkg-mingw` will override the `MSYSTEM` value as per the `MINGW_ARCH` array. The same is equally true for the `/mingw64`, `/mingw32` and `/clangarm64` prefix: those values are already available via the `MINGW_PREFIX` environment variable, and we just need to pass that setting through. Only when `MINGW_PREFIX` is not set (as is the case in Git for Windows' minimal SDK, where only `MSYSTEM` is guaranteed to be set correctly), we use as fall-back the top-level directory whose name is the down-cased value of the `MSYSTEM` variable. Incidentally, this also broadens the support to all the configurations supported by the MSYS2 project, i.e. clang64 & ucrt64, too. Note: This keeps the same, hard-coded MSYSTEM platform support for CMake as before, but drops it for Meson (because it is unclear how Meson could do this in a more flexible manner). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A change between versions 2.4.1 and 2.6.0 of the MSYS2 runtime modified how Cygwin's runtime (and hence Git for Windows' MSYS2 runtime derivative) handles locales: d16a56306d (Consolidate wctomb/mbtowc calls for POSIX-1.2008, 2016-07-20). An unintended side-effect is that "cold-calling" into the POSIX emulation will start with a locale based on the current code page, something that Git for Windows is very ill-prepared for, as it expects to be able to pass a command-line containing non-ASCII characters to the shell without having those characters munged. One symptom of this behavior: when `git clone` or `git fetch` shell out to call `git-upload-pack` with a path that contains non-ASCII characters, the shell tried to interpret the entire command-line (including command-line parameters) as executable path, which obviously must fail. This fixes git-for-windows#1036 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Ignore the `-fno-stack-protector` compiler argument when building with MSVC. This will be used in a later commit that needs to build a Win32 GUI app. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This implements the Windows-specific support code, because everything is slightly different on Windows, even loading shared libraries. Note: I specifically do _not_ use the code from `compat/win32/lazyload.h` here because that code is optimized for loading individual functions from various system DLLs, while we specifically want to load _many_ functions from _one_ DLL here, and distinctly not a system DLL (we expect libcurl to be located outside `C:\Windows\system32`, something `INIT_PROC_ADDR` refuses to work with). Also, the `curl_easy_getinfo()`/`curl_easy_setopt()` functions are declared as vararg functions, which `lazyload.h` cannot handle. Finally, we are about to optionally override the exact file name that is to be loaded, which is a goal contrary to `lazyload.h`'s design. Signed-off-by: Johannes Schindelin <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>
Git for Windows uses MSYS2's Bash to run the test suite, which comes with benefits but also at a heavy price: on the plus side, MSYS2's POSIX emulation layer allows us to continue pretending that we are on a Unix system, e.g. use Unix paths instead of Windows ones, yet this is bought at a rather noticeable performance penalty. There *are* some more native ports of Unix shells out there, though, most notably BusyBox-w32's ash. These native ports do not use any POSIX emulation layer (or at most a *very* thin one, choosing to avoid features such as fork() that are expensive to emulate on Windows), and they use native Windows paths (usually with forward slashes instead of backslashes, which is perfectly legal in almost all use cases). And here comes the problem: with a $PWD looking like, say, C:/git-sdk-64/usr/src/git/t/trash directory.t5813-proto-disable-ssh Git's test scripts get quite a bit confused, as their assumptions have been shattered. Not only does this path contain a colon (oh no!), it also does not start with a slash. This is a problem e.g. when constructing a URL as t5813 does it: ssh://remote$PWD. Not only is it impossible to separate the "host" from the path with a $PWD as above, even prefixing $PWD by a slash won't work, as /C:/git-sdk-64/... is not a valid path. As a workaround, detect when $PWD does not start with a slash on Windows, and simply strip the drive prefix, using an obscure feature of Windows paths: if an absolute Windows path starts with a slash, it is implicitly prefixed by the drive prefix of the current directory. As we are talking about the current directory here, anyway, that strategy works. 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>
On Windows, the current working directory is pretty much guaranteed to contain a colon. If we feed that path to CVS, it mistakes it for a separator between host and port, though. This has not been a problem so far because Git for Windows uses MSYS2's Bash using a POSIX emulation layer that also pretends that the current directory is a Unix path (at least as long as we're in a shell script). However, that is rather limiting, as Git for Windows also explores other ports of other Unix shells. One of those is BusyBox-w32's ash, which is a native port (i.e. *not* using any POSIX emulation layer, and certainly not emulating Unix paths). So let's just detect if there is a colon in $PWD and punt in that case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Specify symlink type in .gitattributes
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>
The TerminateProcess() function does not actually leave the child processes any chance to perform any cleanup operations. This is bad insofar as Git itself expects its signal handlers to run. A symptom is e.g. a left-behind .lock file that would not be left behind if the same operation was run, say, on Linux. To remedy this situation, we use an obscure trick: we inject a thread into the process that needs to be killed and to let that thread run the ExitProcess() function with the desired exit status. Thanks J Wyman for describing this trick. The advantage is that the ExitProcess() function lets the atexit handlers run. While this is still different from what Git expects (i.e. running a signal handler), in practice Git sets up signal handlers and atexit handlers that call the same code to clean up after itself. In case that the gentle method to terminate the process failed, we still fall back to calling TerminateProcess(), but in that case we now also make sure that processes spawned by the spawned process are terminated; TerminateProcess() does not give the spawned process a chance to do so itself. Please note that this change only affects how Git for Windows tries to terminate processes spawned by Git's own executables. Third-party software that *calls* Git and wants to terminate it *still* need to make sure to imitate this gentle method, otherwise this patch will not have any effect. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The Windows Subsystem for Linux (WSL) version 2 allows to use `chmod` on NTFS volumes provided that they are mounted with metadata enabled (see https://devblogs.microsoft.com/commandline/chmod-chown-wsl-improvements/ for details), for example: $ chmod 0755 /mnt/d/test/a.sh In order to facilitate better collaboration between the Windows version of Git and the WSL version of Git, we can make the Windows version of Git also support reading and writing NTFS file modes in a manner compatible with WSL. Since this slightly slows down operations where lots of files are created (such as an initial checkout), this feature is only enabled when `core.WSLCompat` is set to true. Note that you also have to set `core.fileMode=true` in repositories that have been initialized without enabling WSL compatibility. There are several ways to enable metadata loading for NTFS volumes in WSL, one of which is to modify `/etc/wsl.conf` by adding: ``` [automount] enabled = true options = "metadata,umask=027,fmask=117" ``` And reboot WSL. It can also be enabled temporarily by this incantation: $ sudo umount /mnt/c && sudo mount -t drvfs C: /mnt/c -o metadata,uid=1000,gid=1000,umask=22,fmask=111 It's important to note that this modification is compatible with, but does not depend on WSL. The helper functions in this commit can operate independently and functions normally on devices where WSL is not installed or properly configured. Signed-off-by: xungeng li <xungeng@gmail.com> 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
In this time and age, AI is everywhere. However, it's sometimes not very easy to use. For green-field projects it works quite a bit better than for existing legacy projects. And Git's source code is _quite_ as legacy code as they come... 😁 Now, the only way how AI can be used efficiently with legacy code is by providing enough information by way of prompt context for the AI to have a chance to make any sense of the code. The structure and the architecture is, after all, not designed for AI, but rather the opposite: By virtue of having grown organically over two decades, there is no design that AI coding models would readily grasp. So here is a document that describes all kinds of aspects about this project. The idea is to help AI by providing information that it does not have ingrained in its weights. The idea is to provide information that a human prompter might take for granted, but no coding model will have been trained on specifically. Assisted-by: Claude Opus 4.5 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…it-for-windows#6198) AI-assisted contributions are a reality of open source in 2025 and beyond. Contributors will use AI tools, and that includes the maintainers themselves. Over recent months, I have found AI increasingly useful for the kind of menial, tedious work that does not require much creativity but is highly boring when done by hand: resolving merge conflicts during merging-rebases, chasing down CI failures across platforms, adapting downstream patches to upstream API changes. To that end, I would like to have an `AGENTS.md` file in the code base that helps any LLM to understand the context of the project. A secondary goal of this is to preemptively help outside contributors. The risk is not AI usage per se, but low-quality AI slop: contributions where the human hits "accept" without sufficient context being available to the model (and without proper review by the human, we've all been there), resulting in changes that miss conventions, break patterns, or misunderstand the project's architecture. Git's source code is about as legacy as they come, having grown organically over two decades with no design that AI coding models would readily grasp from a narrow code sample alone. This `AGENTS.md` is designed to raise the floor on AI-assisted contributions by providing enough context that even when a human contributor fails to steer carefully, the model has the information it needs to produce something reasonable. It documents the repository structure, build process, test conventions, the object model and ODB internals, debugging techniques (Trace2, instrumenting tests, bisecting failures), the merging-rebase workflow, conflict resolution patterns, coding conventions (ASCII only, 80 columns, tabs), commit message expectations, and the GitGitGadget contribution workflow. This is information that a human might take for granted, but no coding model will have been trained on specifically. Similar `AGENTS.md` files have recently been added to other repositories in the Git for Windows project: [MINGW-packages](git-for-windows/MINGW-packages#194), [git-for-windows.github.io](git-for-windows/git-for-windows.github.io#88) and [msys2-runtime](git-for-windows/msys2-runtime@1e0ff37).
The downstream NTLM topic (883674c, "t5563: verify that NTLM authentication works") and upstream commit 7e98eb8 ("t5563: add tests for http.emptyAuth with Negotiate") both added SPNEGO tests to the end of t5563. When both topics landed in shears/seen, the SPNEGO tests were duplicated: the first set appears before the NTLM tests (from upstream), the second set after (from the downstream topic). Since GIT_TRACE_CURL appends to the trace file rather than overwriting it, the second set of tests sees the 401 responses from both runs. Test 21 (auto mode) expects 3 lines in trace-auto but finds 6 (3 + 3), and test 22 (false mode) expects 1 but finds 2 (1 + 1), causing all four macOS CI jobs to fail. Remove the duplicate second set; the first (upstream) copy is sufficient. Assisted-by: Claude Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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: seen
From: 89cd61600f (??? t5563: add tests for http.emptyAuth with Negotiate, 2026-04-27) (7ef12aaccd..89cd61600f)
Resolved: d092d60 (mimalloc: offer a build-time option to enable it, 2019-06-24)
combined upstream's added clang7 condition with our USE_MIMALLOC guard around -std=gnu99
Range-diff
1: d092d60 ! 1: 00127a6 mimalloc: offer a build-time option to enable it
To: 407d6b629b (??? t5563: add tests for http.emptyAuth with Negotiate, 2026-04-27) (26c1b5d294..407d6b629b)
Statistics
Range-diff (click to expand)
1: b9d0c67 = 1: 3f78091 ci(dockerized): reduce the PID limit for private repositories
2: 9b53c25 = 2: 08e9904 mingw: skip symlink type auto-detection for network share targets
3: b4d6f02 = 3: da95015 Merge branch 'fix-ci'
4: 7413289 = 4: 1b79fae unix-socket: avoid leak when initialization fails
5: 51d4572 = 5: fc76c02 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: b1d49b2 = 6: 2ee251c grep: prevent
^$false match at end of file7: 218f012 = 7: 2e95ef6 Merge branch 'v2.53.0.windows.3'
8: 4a67b68 = 8: 58d63f0 Merge branch 'fixes-from-the-git-mailing-list'
20: 2e580b5 = 9: df703b9 t9350: point out that refs are not updated correctly
12: 76dc6b4 = 10: 5502c44 mingw: include the Python parts in the build
23: 8830677 = 11: 714c905 transport-helper: add trailing --
14: 8a262a5 = 12: 9638459 win32/pthread: avoid name clashes with winpthread
28: 62d0f65 = 13: 669a06b remote-helper: check helper status after import/export
29: 0a24057 = 14: 37623cc clean: do not traverse mount points
16: d8d2fa0 = 15: 4e2730a git-compat-util: avoid redeclaring _DEFAULT_SOURCE
36: 09191d6 = 16: 8715e24 Always auto-gc after calling a fast-import transport
37: 6668eb9 = 17: b52a877 mingw: prevent regressions with "drive-less" absolute paths
38: 4854caf = 18: a17ebab clean: remove mount points when possible
18: 3c8f01d = 19: da72644 Import the source code of mimalloc v2.2.7
21: ae3fceb = 20: 04c14da mimalloc: adjust for building inside Git
9: 3fee306 = 21: c9cb816 vcpkg_install: detect lack of Git
10: d5bd150 = 22: 3f476b3 vcpkg_install: add comment regarding slow network connections
24: 8648f26 = 23: 5c9dddc mingw: demonstrate a
git addissue with NTFS junctions25: d092d60 ! 24: 00127a6 mimalloc: offer a build-time option to enable it
26: 60f4139 = 25: fdb1405 t5505/t5516: allow running without
.git/branches/in the templates11: 9587e3c = 26: 2cf441c vcbuild: install ARM64 dependencies when building ARM64 binaries
30: 6617811 = 27: d74a837 strbuf_realpath(): use platform-dependent API if available
33: 052cd61 = 28: f65470f mingw: use mimalloc
34: 500fc57 = 29: 63eb1fc t5505/t5516: fix white-space around redirectors
13: 609c669 = 30: 06d9c71 vcbuild: add an option to install individual 'features'
31: 0886fd4 = 31: 56da31e http: use new "best effort" strategy for Secure Channel revoke checking
39: 8b45a97 = 32: 48703c8 transport: optionally disable side-band-64k
40: fe6564b = 33: 470cb5c mingw: fix fatal error working on mapped network drives on Windows
41: 7214ea7 = 34: 3107667 clink.pl: fix MSVC compile script to handle libcurl-d.lib
42: e9309e5 = 35: 4eae377 mingw: implement a platform-specific
strbuf_realpath()43: cdba0c5 = 36: c4175d8 t3701: verify that we can add lots of files interactively
44: e9d5b2a = 37: 9105825 commit: accept "scissors" with CR/LF line endings
45: 2143aa4 = 38: ef5e3e6 t0014: fix indentation
46: 6a15473 = 39: 0c13faf git-gui: accommodate for intent-to-add files
51: 0736313 = 40: 6d34e22 windows: skip linking
git-<command>for built-ins52: 49ebc03 = 41: 35ad50e mingw: stop hard-coding
CC = gcc53: 122fe04 = 42: f1502b8 mingw: drop the -D_USE_32BIT_TIME_T option
54: d7eeb68 = 43: beb055b mingw: only use -Wl,--large-address-aware for 32-bit builds
55: 1beac71 = 44: 57514cf mingw: avoid over-specifying
--pic-executable56: d097366 = 45: 7847474 mingw: set the prefix and HOST_CPU as per MSYS2's settings
57: 768eb82 = 46: 6003e98 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
58: 6378b05 = 47: 5b21af7 mingw: rely on MSYS2's metadata instead of hard-coding it
59: 1431174 = 48: 80764fb mingw: always define
ETC_*for MSYS2 environments60: 243b70e = 49: 60966af max_tree_depth: lower it for clang builds in general on Windows
61: ccaf794 = 50: 5ec88b4 mingw: ensure valid CTYPE
62: cb48126 = 51: 4d9d29e mingw: allow
git.exeto be used instead of the "Git wrapper"63: 41f4ff2 = 52: 1497d22 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
64: 955218b = 53: d4c5763 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
15: 21d0c98 = 54: 0405e4e cmake: allow building for Windows/ARM64
65: a9a8342 = 55: 0fe6b97 clink.pl: fix libexpatd.lib link error when using MSVC
17: 687d0bb = 56: 28b6da4 ci(vs-build) also build Windows/ARM64 artifacts
66: 3e04e2c = 57: d0cf1c2 Makefile: clean up .ilk files when MSVC=1
19: e615815 = 58: a7a7947 Add schannel to curl installation
67: 794c717 = 59: 4d6b078 hash-object: demonstrate a >4GB/LLP64 problem
68: ac44695 = 60: 0871e34 vcbuild: add support for compiling Windows resource files
22: 3b586a4 = 61: c112c78 cmake(): allow setting HOST_CPU for cross-compilation
69: 5a88326 = 62: 220e035 object-file.c: use size_t for header lengths
70: ed666ad = 63: e2a0558 config.mak.uname: add git.rc to MSVC builds
71: 439bece = 64: e2b438b MinGW: link as terminal server aware
27: f2c4b64 = 65: 5657c8d CMake: default Visual Studio generator has changed
72: d4119b5 = 66: 2b68a26 hash algorithms: use size_t for section lengths
73: 223e3fc = 67: f62d788 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
74: 6bf8e1a = 68: 909e6d3 http: optionally load libcurl lazily
35: 12ab844 = 69: dca957f .gitignore: add Visual Studio CMakeSetting.json file
75: 47f0e5e = 70: 09f873e hash-object --stdin: verify that it works with >4GB/LLP64
76: e4c0968 = 71: 7a8c650 clink.pl: move default linker options for MSVC=1 builds
77: 190b741 = 72: 9d31424 http: support lazy-loading libcurl also on Windows
32: 686ba6e = 73: 1872615 subtree: update
contrib/subtreetesttarget79: 8867692 = 74: 0026406 CMakeLists: add default "x64-windows" arch for Visual Studio
80: 6cc88c8 = 75: d4e1a91 hash-object: add another >4GB/LLP64 test case
81: cf52d41 = 76: 497c490 setup: properly use "%(prefix)/" when in WSL
82: 9709dd6 = 77: 6e61a5f Add config option
windows.appendAtomically83: 02819e4 = 78: 815e977 cmake: install headless-git.
84: 74bed2e = 79: 817929a http: when loading libcurl lazily, allow for multiple SSL backends
47: 9b4837d = 80: eed2cf8 mingw: allow for longer paths in
parse_interpreter()48: b4e4056 = 81: 6d798a1 compat/vcbuild: document preferred way to build in Visual Studio
49: 88802b8 = 82: 9e4d3e3 http: optionally send SSL client certificate
50: ce62ccb = 83: 9da5325 ci: run
contrib/subtreetests in CI builds86: 2a31254 = 84: 5a40e39 CMake: show Win32 and Generator_platform build-option values
87: 7630f47 = 85: 4cac3ac hash-object: add a >4GB/LLP64 test case using filtered input
88: 8a4cff1 = 86: c39c5ea compat/mingw.c: do not warn when failing to get owner
89: ce288e1 = 87: 884c42e mingw: $env:TERM="xterm-256color" for newer OSes
90: c177432 = 88: af764ac winansi: check result and Buffer before using Name
91: 1f2efd6 = 89: c9411d5 mingw: change core.fsyncObjectFiles = 1 by default
92: 005d1bc = 90: f584bbe Fix Windows version resources
93: 0e4e277 = 91: c6ab8f6 status: fix for old-style submodules with commondir
94: ce357f4 = 92: 47a13ae git.rc: include winuser.h
95: f270703 = 93: 5d31a90 mingw: do load libcurl dynamically by default
96: acd7600 = 94: 8c4bb51 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
97: 0156ef2 = 95: fdacaf8 mingw: suggest
windows.appendAtomicallyin more cases98: 54023f6 = 96: d8624ca win32: use native ANSI sequence processing, if possible
104: 31c76fa = 97: da8fc93 Merge 'remote-hg-prerequisites' into HEAD
105: 8a6b4f1 = 98: 335025b Merge branch 'drive-prefix'
106: f736f97 = 99: 4bf92b2 Merge branch 'dont-clean-junctions'
107: abd089d = 100: 78f85d3 Merge branch 'msys2-python'
108: df26a37 = 101: fb2ea91 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
109: e24e23b = 102: 139ce08 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
78: 78bef85 = 103: 2872d0a survey: stub in new experimental 'git-survey' command
110: 03a8734 = 104: 808dc7a Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
85: 7d3fc01 = 105: a4f79e2 survey: add command line opts to select references
111: 4f87dce = 106: 270c959 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
114: cdc4c65 = 107: 251907a survey: start pretty printing data in table form
112: 448ce3d = 108: 86851e3 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction116: c4e3ee0 = 109: 0c457bb survey: add object count summary
113: 226cb6c = 110: ae0b6cf Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
118: 0446a4d = 111: 085cab6 survey: summarize total sizes by object type
115: c15a733 = 112: ad11f53 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
120: 52fa36d = 113: 2810d4a survey: show progress during object walk
121: 0558944 = 114: 2f9a1c1 mingw: make sure
errnois set correctly when socket operations fail122: 2e94a50 = 115: f6d1b42 t5563: verify that NTLM authentication works
117: 104a995 = 116: 7a537a2 Merge 'add-p-many-files'
124: afd3416 = 117: 2e74c50 survey: add ability to track prioritized lists
125: 3c1b202 = 118: e460c8a compat/mingw: handle WSA errors in strerror
126: 7749338 = 119: 9dacf69 http: disallow NTLM authentication by default
119: 8546915 = 120: 51ccf0f Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
128: d8bb1e3 = 121: 774eac0 survey: add report of "largest" paths
129: 38c53e2 = 122: 2563aaf compat/mingw: drop outdated comment
130: 8da7a26 = 123: d7efdca http: warn if might have failed because of NTLM
123: 4bfb975 = 124: 8f50a26 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
132: 4741b24 = 125: 1a1c97f survey: add --top= option and config
133: 6d2bbbc = 126: 7e765d6 t0301: actually test credential-cache on Windows
134: 2dec90f = 127: 2003ae6 credential: advertise NTLM suppression and allow helpers to re-enable
127: 5864100 = 128: 12cca71 Merge 'git-gui/js/intent-to-add'
99: f1ed635 = 129: cb1b870 common-main.c: fflush stdout buffer upon exit
100: 6570b38 = 130: 516fc3c t5601/t7406(mingw): do run tests with symlink support
101: 9877eaa = 131: e4f453c win32: ensure that
localtime_r()is declared even in i686 builds102: 1bf803c = 132: fb575d9 Fallback to AppData if XDG_CONFIG_HOME is unset
103: 9bf7593 = 133: 4374cbd run-command: be helpful with Git LFS fails on Windows 7
136: 48cf605 = 134: 7add126 survey: clearly note the experimental nature in the output
137: 0d55fda = 135: 2dfd9fd credential-cache: handle ECONNREFUSED gracefully
138: 6841002 = 136: feed2b1 reftable: do make sure to use custom allocators
139: 599964c = 137: bdf9881 check-whitespace: avoid alerts about upstream commits
140: c51f221 = 138: 9d16057 t/t5571-prep-push-hook.sh: Add test with writing to stderr
141: c31a03e = 139: 68cc41d dir: do not traverse mount points
142: 3bda6c7 = 140: 018e602 win32: thread-utils: handle multi-socket systems
143: a79d90b = 141: c9540af t5563: add tests for http.emptyAuth with Negotiate
131: f136152 = 142: 8a6a1db Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
135: ae75c7d = 143: ff82206 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
144: 3c67c43 = 144: b079c6f Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
145: b906b98 = 145: 0a148e3 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path146: b91e518 = 146: 2fae096 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
147: ee63b51 = 147: 4492377 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
148: aa4b238 = 148: 38e795f Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests149: 65b4aff = 149: bf06682 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
150: 56365b3 = 150: 7c3b32e Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t151: 2e89015 = 151: 8ad7395 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory152: ce1b828 = 152: b131628 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
153: dbd02ea = 153: b1af1da Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
154: 518e265 = 154: bb092b9 Merge branch 'optionally-dont-append-atomically-on-windows'
155: c6c897b = 155: e13f44a Merge branch 'fsync-object-files-always'
156: 1a67c71 = 156: f20663b Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
157: 7d83c74 = 157: 85568cd Fix Windows version resources (Fix Windows version resources git#4092)
158: 559e318 = 158: 5126fd9 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
159: 1ec7c32 = 159: 5ababae Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)160: 551b01a = 160: bc38796 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)161: 3b59c67 = 161: 649755d Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283162: 2dd1454 = 162: 4fd62ea Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
163: 916da41 = 163: 99a01e5 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
164: d323920 = 164: 4def773 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
165: 2432d00 = 165: 889e59c Merge branch 'nano-server'
166: 9821209 = 166: 6f3b7bf Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
167: d77cc2a = 167: 8a08a54 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
168: ad6e744 = 168: 2a22f7f common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
169: 7fd5264 = 169: 7f7eae4 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
170: 0afcb35 = 170: f4606f5 Merge branch 'Fix-i686-build-with-GCC-v14'
171: 4a9d895 = 171: 961c564 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
172: ba2113c = 172: 0791480 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
173: 91b4462 = 173: c22d303 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
174: f86dcfe = 174: f31d732 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
175: 76dee8a = 175: ca65bd0 Merge branch 'reftable-vs-custom-allocators'
176: 86e3353 = 176: 9433d18 Merge branch 'check-whitespace-only-downstream'
177: 089792c = 177: 85fcf03 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)
178: 6f9aeaf = 178: c149cbc Merge branch 'disallow-ntlm-auth-by-default'
179: 95b5a78 = 179: 88e8b53 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)180: 352eb67 = 180: 56ce114 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
181: 1c591fe = 181: 6198979 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
182: a072559 = 182: 50c0eb2 Merge branch 'ready-for-upstream'
183: 53cbad1 = 183: 4b98951 ci(macos): skip the
git p4tests184: 3251e6a = 184: 10df127 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)185: 06975f3 = 185: a43299b Win32: make FILETIME conversion functions public
186: fd60e51 = 186: 9ce099a Win32: dirent.c: Move opendir down
187: 72e512d = 187: f679fbe mingw: make the dirent implementation pluggable
188: 721b707 = 188: 18800b1 Win32: make the lstat implementation pluggable
189: 4b40cc3 = 189: 5f802d7 mingw: add infrastructure for read-only file system level caches
190: a573b7b = 190: ee4f6ca mingw: add a cache below mingw's lstat and dirent implementations
191: b05c5f8 = 191: e7f70eb fscache: load directories only once
192: fd30550 = 192: d6f44c2 fscache: add key for GIT_TRACE_FSCACHE
193: 065531b = 193: d51533c fscache: remember not-found directories
194: 802f1d3 = 194: 84daad2 fscache: add a test for the dir-not-found optimization
195: 833149f = 195: c59d42d add: use preload-index and fscache for performance
196: 1a95abc = 196: 449068e dir.c: make add_excludes aware of fscache during status
197: d47393e = 197: 1e6c5eb fscache: make fscache_enabled() public
198: 343e6a6 = 198: a0b4fcc dir.c: regression fix for add_excludes with fscache
199: 0d0bffd = 199: 99fa299 fetch-pack.c: enable fscache for stats under .git/objects
200: 0238f04 = 200: afe6fea checkout.c: enable fscache for checkout again
201: 955500e = 201: bdcced2 Enable the filesystem cache (fscache) in refresh_index().
203: 1d5508c = 202: 2bb0a01 fscache: use FindFirstFileExW to avoid retrieving the short name
205: d806a91 = 203: 55f9ed1 fscache: add GIT_TEST_FSCACHE support
207: bad8fef = 204: fd13864 fscache: add fscache hit statistics
208: 616ac01 = 205: 3dbc95f unpack-trees: enable fscache for sparse-checkout
209: f303871 = 206: 7619035 status: disable and free fscache at the end of the status command
210: fafbeb7 = 207: 6abaef5 mem_pool: add GIT_TRACE_MEMPOOL support
211: 2c8e3fd = 208: 5ef57f7 fscache: fscache takes an initial size
212: 8c91caf = 209: 3d65644 fscache: update fscache to be thread specific instead of global
213: e68cbfb = 210: 9b14ea5 fscache: teach fscache to use mempool
214: 84de602 = 211: 63a1bb4 fscache: make fscache_enable() thread safe
215: 140baa0 = 212: 18beecb fscache: teach fscache to use NtQueryDirectoryFile
216: e05012c = 213: aa31b34 fscache: remember the reparse tag for each entry
217: ba18c97 = 214: 443f10a Merge branch 'fscache'
218: d88bcf5 = 215: f162843 fscache: implement an FSCache-aware is_mount_point()
219: 18888aa = 216: 1bc3179 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
220: 14453ef = 217: 6c6e145 clean: make use of FSCache
221: e0efabb = 218: cb139a1 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
222: ded8684 = 219: 2a4ab5c Merge branch 'dont-clean-junctions-fscache'
223: 9e0cf38 = 220: 3fb1338 pack-objects (mingw): demonstrate a segmentation fault with large deltas
224: 6ca7b96 = 221: 76520e2 mingw: support long paths
225: ec74a6d = 222: 6096c55 win32(long path support): leave drive-less absolute paths intact
226: 7e864e7 = 223: d5d1ac1 compat/fsmonitor/fsm-*-win32: support long paths
227: 2901f32 = 224: cfdd3f6 clean: suggest using
core.longPathsif paths are too long to remove228: d30d578 = 225: aa9d714 mingw: Support
git_terminal_promptwith more terminals229: 9962d06 = 226: 0befa70 compat/terminal.c: only use the Windows console if bash 'read -r' fails
230: c73e2fb = 227: bdd5463 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
231: 77f09a1 = 228: 84bcb99 Win32: symlink: move phantom symlink creation to a separate function
232: b90701c = 229: 48b6ee2 Introduce helper to create symlinks that knows about index_state
233: c3906b8 = 230: 7bdd805 mingw: allow to specify the symlink type in .gitattributes
234: 8386e58 = 231: ed9a9af Win32: symlink: add test for
symlinkattribute245: 28fa4b7 = 232: d5859a7 mingw: introduce code to detect whether we're inside a Windows container
235: 3806aae = 233: 25fd98d mingw: explicitly specify with which cmd to prefix the cmdline
247: f44dd9c = 234: db9bbdd mingw: when running in a Windows container, try to rename() harder
236: c5e8184 = 235: f5800d7 mingw: when path_lookup() failed, try BusyBox
202: 531f522 = 236: 2c91432 git-gui--askyesno: fix funny text wrapping
249: 2aab443 = 237: 740bdd0 mingw: move the file_attr_to_st_mode() function definition
237: 56ed4a6 = 238: 74ff2fb test-tool: learn to act as a drop-in replacement for
iconv204: 0c975c7 = 239: 6d66e8f git-gui--askyesno (mingw): use Git for Windows' icon, if available
251: d563051 = 240: 555631f mingw: Windows Docker volumes are not symbolic links
238: 40c3271 = 241: 716ba49 tests(mingw): if
iconvis unavailable, usetest-helper --iconv206: f83624f = 242: ce1581f Merge branch 'git-gui-askyesno'
253: ca0779a = 243: b7b1378 mingw: work around rename() failing on a read-only file
239: e62e90d = 244: c4d9480 gitattributes: mark .png files as binary
240: abb16f2 = 245: 0247a3a tests: move test PNGs into t/lib-diff/
241: 15a5fd9 = 246: a305f74 tests: only override sort & find if there are usable ones in /usr/bin/
242: a683c39 = 247: 0b098da tests: use the correct path separator with BusyBox
243: 900d04e = 248: 60bdcef mingw: only use Bash-ism
builtin pwd -Wwhen available244: 46ae57c = 249: ef7cd96 tests (mingw): remove Bash-specific pwd option
246: bea74be = 250: 51caab7 test-lib: add BUSYBOX prerequisite
255: 342c51b = 251: e3cd081 Merge branch 'gitk-and-git-gui-patches'
248: 20f0127 = 252: d182de9 t5003: use binary file from t/lib-diff/
256: 6808c59 = 253: 27384f4 Merge branch 'long-paths'
250: 3908671 = 254: c05a0d8 t5532: workaround for BusyBox on Windows
257: ad51c82 = 255: 41aa98a Merge branch 'msys2'
252: d332fc4 = 256: 36ae89d t5605: special-case hardlink test for BusyBox-w32
258: 7f3ad84 = 257: 50d1089 Merge 'docker-volumes-are-no-symlinks'
254: 7246570 = 258: aac116c t5813: allow for $PWD to be a Windows path
259: 2db170f = 259: 262d398 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
260: 6d52ee1 = 260: 1a38ec7 t9200: skip tests when $PWD contains a colon
261: 952e2be = 261: 53c25c1 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
262: ba200c9 = 262: 9a913ed Describe Git for Windows' architecture
263: e67ddb7 = 263: 0d66eb2 mingw: kill child processes in a gentler way
264: 54bc04f = 264: a903e65 mingw: optionally enable wsl compability file mode bits
265: 8b7b798 = 265: ed2215d Merge branch 'busybox-w32'
266: 8c224e1 = 266: 8f117ff Modify the Code of Conduct for Git for Windows
267: 5b67283 = 267: 2d6dbee mingw: really handle SIGINT
268: dce3074 = 268: baff3af Merge branch 'wsl-file-mode-bits'
269: 4adbae0 = 269: 50ac722 CONTRIBUTING.md: add guide for first-time contributors
270: ef18a07 = 270: ec0114e Partially un-revert "editor: save and reset terminal after calling EDITOR"
271: 09ee8fb = 271: ac936bf Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
272: 6e4c7fe = 272: 6a22ade README.md: Add a Windows-specific preamble
273: 60225cf = 273: 9652869 reset: reinstate support for the deprecated --stdin option
274: 56265b9 = 274: 597f263 Merge branch 'un-revert-editor-save-and-reset'
275: 96c8102 = 275: fd37c95 Add an issue template
276: 4b4ddbd = 276: 482f9e0 Add a GitHub workflow to monitor component updates
277: 1431afe = 277: 77361b0 fsmonitor: reintroduce core.useBuiltinFSMonitor
278: b044587 = 278: 1c02c7b Merge branch 'phase-out-reset-stdin'
279: 0bae7de = 279: 4044f47 Modify the GitHub Pull Request template (to reflect Git for Windows)
280: 2631910 = 280: df79243 dependabot: help keeping GitHub Actions versions up to date
281: 9ee1a6b = 281: 0fa6103 Merge branch 'deprecate-core.useBuiltinFSMonitor'
282: 2a7b91c = 282: b82f7cb SECURITY.md: document Git for Windows' policies
283: 9b4d649 = 283: 3772124 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
284: 7a30269 = 284: 4f13fae Merge 'readme' into HEAD
285: 51d6cdc = 285: 8636cf6 Add an AGENTS.md file to help with AI-assisted debugging/development
286: 96ea4a6 = 286: 0cbd001 Add an AGENTS.md file to help with AI-assisted debugging/development (Add an AGENTS.md file to help with AI-assisted debugging/development git#6198)
287: 89cd616 = 287: 407d6b6 ??? t5563: add tests for http.emptyAuth with Negotiate