Rebase shears/seen: 4 conflict(s) (0 skipped, 4 resolved) (#25595792246)#150
Open
gitforwindowshelper[bot] wants to merge 287 commits into
Open
Rebase shears/seen: 4 conflict(s) (0 skipped, 4 resolved) (#25595792246)#150gitforwindowshelper[bot] wants to merge 287 commits into
gitforwindowshelper[bot] wants to merge 287 commits into
Conversation
This change enhances `git commit --cleanup=scissors` by detecting scissors lines ending in either LF (UNIX-style) or CR/LF (DOS-style). Regression tests are included to specifically test for trailing comments after a CR/LF-terminated scissors line. Signed-off-by: Luke Bonanomi <lbonanomi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
This is no longer true in general, not with supporting Clang out of the box. 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>
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>
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>
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>
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>
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>
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 already defines a couple of helpful environment variables, and we can use those to infer the installation location as well as the CPU. No need for hard-coding ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The 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>
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>
As reported in newren/git-filter-repo#225, it looks like 99 bytes is not really sufficient to represent e.g. the full path to Python when installed via Windows Store (and this path is used in the hasb bang line when installing scripts via `pip`). Let's increase it to what is probably the maximum sensible path size: MAX_PATH. This makes `parse_interpreter()` in line with what `lookup_prog()` handles. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Vilius Šumskas <vilius@sumskas.eu>
We used to have that `make vcxproj` hack, but a hack it is. In the meantime, we have a much cleaner solution: using CMake, either explicitly, or even more conveniently via Visual Studio's built-in CMake support (simply open Git's top-level directory via File>Open>Folder...). Let's let the `README` reflect this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This adds support for a new http.sslAutoClientCert config value. In cURL 7.77 or later the schannel backend does not automatically send client certificates from the Windows Certificate Store anymore. This config value is only used if http.sslBackend is set to "schannel", and can be used to opt in to the old behavior and force cURL to send client certificates. This fixes git-for-windows#3292 Signed-off-by: Pascal Muller <pascalmuller@gmail.com>
Because `git subtree` (unlike most other `contrib` modules) is included as part of the standard release of Git for Windows, its stability should be verified as consistently as it is for the rest of git. By including the `git subtree` tests in the CI workflow, these tests are as much of a gate to merging and indicator of stability as the standard test suite. Signed-off-by: Victoria Dye <vdye@github.com>
Ensure key CMake option values are part of the CMake output to facilitate user support when tool updates impact the wider CMake actions, particularly ongoing 'improvements' in Visual Studio. These CMake displays perform the same function as the build-options.txt provided in the main Git for Windows. CMake is already chatty. The setting of CMAKE_EXPORT_COMPILE_COMMANDS is also reported. Include the environment's CMAKE_EXPORT_COMPILE_COMMANDS value which may have been propogated to CMake's internal value. Testing the CMAKE_EXPORT_COMPILE_COMMANDS processing can be difficult in the Visual Studio environment, as it may be cached in many places. The 'environment' may include the OS, the user shell, CMake's own environment, along with the Visual Studio presets and caches. See previous commit for arefacts that need removing for a clean test. Signed-off-by: Philip Oakley <philipoakley@iee.email>
To verify that the `clean` side of the `clean`/`smudge` filter code is correct with regards to LLP64 (read: to ensure that `size_t` is used instead of `unsigned long`), here is a test case using a trivial filter, specifically _not_ writing anything to the object store to limit the scope of the test case. As in previous commits, the `big` file from previous test cases is reused if available, to save setup time, otherwise re-generated. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In the case of Git for Windows (say, in a Git Bash window) running in a Windows Subsystem for Linux (WSL) directory, the GetNamedSecurityInfoW() call in is_path_owned_By_current_side() returns an error code other than ERROR_SUCCESS. This is consistent behavior across this boundary. In these cases, the owner would always be different because the WSL owner is a different entity than the Windows user. The change here is to suppress the error message that looks like this: error: failed to get owner for '//wsl.localhost/...' (1) Before this change, this warning happens for every Git command, regardless of whether the directory is marked with safe.directory. Signed-off-by: Derrick Stolee <derrickstolee@github.com>
For Windows builds >= 15063 set $env:TERM to "xterm-256color" instead of "cygwin" because they have a more capable console system that supports this. Also set $env:COLORTERM="truecolor" if unset. $env:TERM is initialized so that ANSI colors in color.c work, see 29a3963 (Win32: patch Windows environment on startup, 2012-01-15). See git-for-windows#3629 regarding problems caused by always setting $env:TERM="cygwin". This is the same heuristic used by the Cygwin runtime. Signed-off-by: Rafael Kitover <rkitover@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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 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>
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>
…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>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
These are Git for Windows' Git GUI and gitk patches. We will have to decide at some point what to do about them, but that's a little lower priority (as Git GUI seems to be unmaintained for the time being, and the gitk maintainer keeps a very low profile on the Git mailing list, too). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This was pull request git-for-windows#1645 from ZCube/master Support windows container. 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>
Specify symlink type in .gitattributes
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>
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>
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>
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>
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>
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: 9b6e2cdd7b (build: tolerate use of _Generic from glibc 2.43 with Clang (git-for-windows#6233), 2026-05-08) (2b8012105c..9b6e2cdd7b)
Resolved: 2c4ad44 (mimalloc: offer a build-time option to enable it, 2019-06-24)
resolved by accepting mimalloc/nedmalloc additions in Makefile and combining upstream's gcc6-only filter with patch's USE_MIMALLOC guard in config.mak.dev
Range-diff
1: 2c4ad44 ! 1: 3633a61 mimalloc: offer a build-time option to enable it
Resolved: 46257cb (mingw: rely on MSYS2's metadata instead of hard-coding it, 2025-11-21)
combined upstream's USE_NED_ALLOCATOR removal with patch's platform-specific ENSURE_MSYSTEM_IS_SET/MINGW_PREFIX definitions
Range-diff
1: 46257cb ! 1: c585ab6 mingw: rely on MSYS2's metadata instead of hard-coding it
Resolved: 99a1cda (mingw: add a cache below mingw's lstat and dirent implementations, 2013-10-01)
added compat/win32/fscache.c to CMakeLists.txt without the nedmalloc line that was removed upstream
Range-diff
1: 99a1cda ! 1: df54b0b mingw: add a cache below mingw's lstat and dirent implementations
Resolved: 10af724 (mingw: optionally enable wsl compability file mode bits, 2023-06-07)
kept compat/win32/wsl.c, dropped nedmalloc.c which was removed upstream
Range-diff
1: 10af724 ! 1: 3e3b47a mingw: optionally enable wsl compability file mode bits
To: e8f8df2966 (??? t5563: add tests for http.emptyAuth with Negotiate, 2026-04-27) (c1e0c45443..e8f8df2966)
Statistics
Range-diff (click to expand)
1: 2f69992 = 1: d7cc324 ci(dockerized): reduce the PID limit for private repositories
2: e916647 = 2: 27d29ff mingw: skip symlink type auto-detection for network share targets
3: 65c4d67 = 3: ddf0241 Merge branch 'fix-ci'
4: 526aec6 = 4: d1cebce unix-socket: avoid leak when initialization fails
5: aa591b3 = 5: da64f27 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: 435d2e2 = 6: 69951d8 grep: prevent
^$false match at end of file7: 95763e2 = 7: 9fe9e5f Merge branch 'v2.53.0.windows.3'
8: 0794d73 = 8: 00f1d29 Merge branch 'fixes-from-the-git-mailing-list'
23: 3094211 = 9: 3d8f98b t9350: point out that refs are not updated correctly
27: ecf42cf = 10: 7496816 transport-helper: add trailing --
14: 070483c = 11: 1392368 mingw: include the Python parts in the build
16: 893ea78 = 12: 0c5e019 win32/pthread: avoid name clashes with winpthread
18: 8e1132f = 13: c283ee3 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
21: 2c88b04 = 14: 6d267d2 Import the source code of mimalloc v2.2.7
33: 16285ab = 15: f98e1ee remote-helper: check helper status after import/export
34: d5be272 = 16: 4bad01d clean: do not traverse mount points
25: 024964a = 17: fc8cc17 mimalloc: adjust for building inside Git
42: b4b2423 = 18: 85e17b4 Always auto-gc after calling a fast-import transport
43: ec0366f = 19: d609e9c mingw: prevent regressions with "drive-less" absolute paths
44: eb760f9 = 20: ee7812c clean: remove mount points when possible
9: ad3c99f = 21: d923cf3 vcpkg_install: detect lack of Git
10: f287760 = 22: 0ebd1cb vcpkg_install: add comment regarding slow network connections
11: ef51fe0 = 23: a23fafb vcbuild: install ARM64 dependencies when building ARM64 binaries
12: 961e8d7 = 24: d38de23 vcbuild: add an option to install individual 'features'
13: 781923c = 25: 4ddb7fd cmake: allow building for Windows/ARM64
15: 14fb7d1 = 26: 381cc1d ci(vs-build) also build Windows/ARM64 artifacts
28: efdbed7 = 27: d38e1e0 mingw: demonstrate a
git addissue with NTFS junctions30: 2c4ad44 ! 28: 3633a61 mimalloc: offer a build-time option to enable it
17: 8498ee0 = 29: 3a3b113 Add schannel to curl installation
31: 7c32e9a = 30: 48324b4 t5505/t5516: allow running without
.git/branches/in the templates35: 91d55ec = 31: 65005a2 strbuf_realpath(): use platform-dependent API if available
39: 56aeb98 = 32: c717008 mingw: use mimalloc
20: 9aa76d4 = 33: 19a6f3e cmake(): allow setting HOST_CPU for cross-compilation
36: 149dce5 = 34: 60d6350 http: use new "best effort" strategy for Secure Channel revoke checking
40: da2f0dd = 35: 9cc999f t5505/t5516: fix white-space around redirectors
45: fdf0e70 = 36: 5f6cc6d transport: optionally disable side-band-64k
46: 6d59afb = 37: cd3503e mingw: fix fatal error working on mapped network drives on Windows
47: 1ed83b9 = 38: 35b8da8 clink.pl: fix MSVC compile script to handle libcurl-d.lib
48: 8594291 = 39: 41dc871 mingw: implement a platform-specific
strbuf_realpath()49: 788f7ca = 40: 66cbe35 t3701: verify that we can add lots of files interactively
50: f524c27 = 41: ddf40c6 commit: accept "scissors" with CR/LF line endings
51: d170a4e = 42: d3745ed t0014: fix indentation
52: a87cf0d = 43: ca1edac git-gui: accommodate for intent-to-add files
58: 3caed16 = 44: 5f60913 windows: skip linking
git-<command>for built-ins59: 287a05b = 45: 2034a6c mingw: stop hard-coding
CC = gcc19: e568435 = 46: 8e35b5c hash-object: demonstrate a >4GB/LLP64 problem
60: d8d570a = 47: d425426 mingw: drop the -D_USE_32BIT_TIME_T option
22: 753e546 = 48: 408bc13 object-file.c: use size_t for header lengths
61: 2d8258d = 49: 83bc122 mingw: only use -Wl,--large-address-aware for 32-bit builds
24: fe38e33 = 50: fd7567e CMake: default Visual Studio generator has changed
26: bb4cd96 = 51: 2452713 hash algorithms: use size_t for section lengths
62: 82c4195 = 52: 22a373d mingw: avoid over-specifying
--pic-executable29: c0ff03f = 53: bca5607 .gitignore: add Visual Studio CMakeSetting.json file
32: c471953 = 54: a947908 hash-object --stdin: verify that it works with >4GB/LLP64
63: cfdb85e = 55: e942439 mingw: set the prefix and HOST_CPU as per MSYS2's settings
37: 76b0574 = 56: 6c489f6 subtree: update
contrib/subtreetesttarget38: 25f2dfb = 57: c75c664 CMakeLists: add default "x64-windows" arch for Visual Studio
41: 3f96acf = 58: a7a1563 hash-object: add another >4GB/LLP64 test case
88: 0197c73 = 59: 2aceed4 setup: properly use "%(prefix)/" when in WSL
89: c6c6535 = 60: 9cd6ab8 Add config option
windows.appendAtomically64: 2e6fb39 = 61: 5175767 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
80: 933c326 = 62: 235d487 MinGW: link as terminal server aware
53: 77b19d3 = 63: 6cb3669 mingw: allow for longer paths in
parse_interpreter()54: 7c641a4 = 64: 1bd1a0a compat/vcbuild: document preferred way to build in Visual Studio
55: 17c1138 = 65: c01f959 http: optionally send SSL client certificate
56: 9a39a86 = 66: 8b1175a ci: run
contrib/subtreetests in CI builds57: cd98b01 = 67: c65520d CMake: show Win32 and Generator_platform build-option values
93: 47c1114 = 68: 7f6f593 hash-object: add a >4GB/LLP64 test case using filtered input
94: d51b8fa = 69: ba47f32 compat/mingw.c: do not warn when failing to get owner
95: dbdfadf = 70: 06220d7 mingw: $env:TERM="xterm-256color" for newer OSes
96: fc3a801 = 71: 136c342 winansi: check result and Buffer before using Name
97: 1295377 = 72: 45784cb mingw: change core.fsyncObjectFiles = 1 by default
98: 0009791 = 73: b54c080 Fix Windows version resources
99: 28a2ec0 = 74: 3271820 status: fix for old-style submodules with commondir
65: 46257cb ! 75: c585ab6 mingw: rely on MSYS2's metadata instead of hard-coding it
66: 7544f3d = 76: c0e9091 mingw: always define
ETC_*for MSYS2 environments67: ff76844 = 77: 7ffefaa max_tree_depth: lower it for clang builds in general on Windows
68: c1e92ff = 78: f507b7e mingw: ensure valid CTYPE
69: 65f1533 = 79: bb051c2 mingw: allow
git.exeto be used instead of the "Git wrapper"70: 9014bcd = 80: 6b3b0ca mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
72: e60a88e = 81: 8e0664e survey: stub in new experimental 'git-survey' command
71: fd3d2e7 = 82: 79bbc12 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
74: 440b813 = 83: aa45416 survey: add command line opts to select references
73: 5026635 = 84: 938988c clink.pl: fix libexpatd.lib link error when using MSVC
76: 2730e27 = 85: 8205188 survey: start pretty printing data in table form
75: 0904874 = 86: c3d88bf Makefile: clean up .ilk files when MSVC=1
78: b4a2c69 = 87: 5466994 survey: add object count summary
77: 7fc61d6 = 88: 05991e6 vcbuild: add support for compiling Windows resource files
81: deb5087 = 89: 0537a52 survey: summarize total sizes by object type
79: 5ec88b7 = 90: 43ebb76 config.mak.uname: add git.rc to MSVC builds
84: fc5d14b = 91: 334f9c8 survey: show progress during object walk
82: 03b6be1 = 92: 6f5f43e clink.pl: ignore no-stack-protector arg on MSVC=1 builds
83: 06ee36b = 93: 97e6b37 http: optionally load libcurl lazily
87: 37e6ecb = 94: 7484444 survey: add ability to track prioritized lists
85: e18b3cc = 95: 5ad62cf clink.pl: move default linker options for MSVC=1 builds
86: 2f4e340 = 96: db40ab9 http: support lazy-loading libcurl also on Windows
92: 9de2eb1 = 97: 9af9eba survey: add report of "largest" paths
90: 0691977 = 98: cf89c6a cmake: install headless-git.
91: 3122c86 = 99: f3e0ac4 http: when loading libcurl lazily, allow for multiple SSL backends
135: d2ff60c = 100: 53d194a survey: add --top= option and config
100: 1dc814e = 101: eab03d5 git.rc: include winuser.h
101: 69a6442 = 102: 1a940a8 mingw: do load libcurl dynamically by default
102: 812345c = 103: b3e61cf Add a GitHub workflow to verify that Git/Scalar work in Nano Server
103: ad26618 = 104: 3a96826 mingw: suggest
windows.appendAtomicallyin more cases104: ab78e82 = 105: 64153c0 win32: use native ANSI sequence processing, if possible
105: 918292e = 106: 7232328 common-main.c: fflush stdout buffer upon exit
106: ab08bce = 107: 3a410a6 t5601/t7406(mingw): do run tests with symlink support
107: 26ea3cc = 108: fefb681 win32: ensure that
localtime_r()is declared even in i686 builds108: a5dc785 = 109: 8df364a Fallback to AppData if XDG_CONFIG_HOME is unset
109: ce2924e = 110: 0131662 run-command: be helpful with Git LFS fails on Windows 7
110: 107a7da = 111: 96a8c50 Merge 'remote-hg-prerequisites' into HEAD
111: 5e1b210 = 112: 0538462 Merge branch 'drive-prefix'
112: b7b6117 = 113: 3a510be Merge branch 'dont-clean-junctions'
113: ebea81a = 114: 5b9bfe0 Merge branch 'msys2-python'
114: 5e0eedb = 115: 97afe85 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
115: c8dc678 = 116: 59b4f0e Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
116: bbce47e = 117: 4337bfb Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
117: 4d76e80 = 118: e07c593 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
118: f8efd47 = 119: 381eb49 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction119: 30d2df5 = 120: a3d6bf4 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
120: b2d16a8 = 121: d20af1c Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
121: bff7613 = 122: 932bb7b Merge 'add-p-many-files'
122: 447119b = 123: 29c1c1e Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
123: d164fe9 = 124: 17b5ca3 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
124: ca25980 = 125: 782911c Merge 'git-gui/js/intent-to-add'
125: 05936c9 = 126: a1c8b5d Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
128: a4fd367 = 127: d1f8767 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
126: 90779d6 = 128: ed62d61 mingw: make sure
errnois set correctly when socket operations fail127: 5b38d21 = 129: 2591a39 t5563: verify that NTLM authentication works
131: 680babd = 130: 5a218a3 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
129: 3d58b81 = 131: 6c71f18 compat/mingw: handle WSA errors in strerror
130: b0a269f = 132: ace4673 http: disallow NTLM authentication by default
134: 87345ef = 133: 055af93 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path132: 36783e2 = 134: b9a57bd compat/mingw: drop outdated comment
133: 8830677 = 135: da5222e http: warn if might have failed because of NTLM
138: 5f5e676 = 136: 17e079e Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
136: 2255baa = 137: 03848e6 t0301: actually test credential-cache on Windows
137: fd42aaf = 138: 1b640dc credential: advertise NTLM suppression and allow helpers to re-enable
147: 3d25f3e = 139: dfb7553 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
139: 995d73a = 140: 975635b survey: clearly note the experimental nature in the output
140: 96b3d12 = 141: 7888ed4 credential-cache: handle ECONNREFUSED gracefully
141: 8ece1a9 = 142: 8903d9e reftable: do make sure to use custom allocators
142: b35ef83 = 143: b7132e2 check-whitespace: avoid alerts about upstream commits
143: bdf50c7 = 144: 8bf2e95 t/t5571-prep-push-hook.sh: Add test with writing to stderr
144: a824ff1 = 145: 48ada45 dir: do not traverse mount points
145: 64f53a7 = 146: 80d3ec4 win32: thread-utils: handle multi-socket systems
146: 5c2d8d0 = 147: e360946 t5563: add tests for http.emptyAuth with Negotiate
148: 9b94884 = 148: 846e6c1 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests149: 524cc0c = 149: 570d503 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
150: 012ad6a = 150: 639ced6 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t151: fe42680 = 151: 9ce55e1 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory152: b58c853 = 152: f9ed501 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
153: 9d60978 = 153: c496a59 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
154: a5d4959 = 154: c9bf320 Merge branch 'optionally-dont-append-atomically-on-windows'
155: 5b5521d = 155: 9c62bfe Merge branch 'fsync-object-files-always'
156: 7aa3dd5 = 156: fb97cf5 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
157: 4c9ba3f = 157: f74eb44 Fix Windows version resources (Fix Windows version resources git#4092)
158: f04c0bc = 158: 1f33a8c Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
159: 2eeecb0 = 159: a059b31 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)160: edd7eb5 = 160: e62c017 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)161: 20d5895 = 161: 5f30cfe Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283162: 745e63b = 162: 63b0f05 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
163: c8516cf = 163: 3de2369 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
164: 2186dc8 = 164: 907786b 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: c95795b = 165: e4ab0b6 Merge branch 'nano-server'
166: d21212c = 166: 6d67e34 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
167: 1c9a6c1 = 167: 6c94baa win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
168: 788120e = 168: 1cae4cb common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
169: 7c16e8c = 169: d2de9d8 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
170: ed269de = 170: e6ceeec Merge branch 'Fix-i686-build-with-GCC-v14'
171: b460e6c = 171: 8ba4447 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
172: 6460431 = 172: 0cd0186 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
173: 9f9d021 = 173: bcbd7b9 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
174: f810ed7 = 174: 0635b60 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
175: b509418 = 175: e5a5977 Merge branch 'reftable-vs-custom-allocators'
176: 5320713 = 176: b70eba3 Merge branch 'check-whitespace-only-downstream'
177: f2d974e = 177: bd8871f 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: 6f6209d = 178: 83c58fb Merge branch 'disallow-ntlm-auth-by-default'
179: e1d74bb = 179: 21e7775 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)180: 7f9cddb = 180: e0089b7 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
181: cc2003b = 181: 985fcb5 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
182: 2aeec21 = 182: 53b6973 Merge branch 'ready-for-upstream'
183: d5c5f75 = 183: 1e09aaf ci(macos): skip the
git p4tests184: 330d892 = 184: f88e19d ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)185: 660081b = 185: f8442a7 Win32: make FILETIME conversion functions public
186: a3fda5b = 186: e3f77b9 Win32: dirent.c: Move opendir down
187: 6e68fe8 = 187: df9a247 mingw: make the dirent implementation pluggable
227: 4cc345e = 188: 7661fe1 git-gui--askyesno: fix funny text wrapping
188: 0b6404e = 189: d3a814f Win32: make the lstat implementation pluggable
229: 2aee15c = 190: dc68155 git-gui--askyesno (mingw): use Git for Windows' icon, if available
189: 82aaa80 = 191: 8f6143c mingw: add infrastructure for read-only file system level caches
231: 6b294ee = 192: 9cd6176 Merge branch 'git-gui-askyesno'
190: 99a1cda ! 193: df54b0b mingw: add a cache below mingw's lstat and dirent implementations
191: 2f6147e = 194: b57d65f fscache: load directories only once
192: 5212b18 = 195: 3f2b520 fscache: add key for GIT_TRACE_FSCACHE
193: 74ac69a = 196: a04bdd2 fscache: remember not-found directories
194: 25263d3 = 197: e1297b2 fscache: add a test for the dir-not-found optimization
195: c5d11b2 = 198: b7774c4 add: use preload-index and fscache for performance
196: cffe574 = 199: 30c656f dir.c: make add_excludes aware of fscache during status
197: 1af5778 = 200: cfa5c5f fscache: make fscache_enabled() public
198: 64af01a = 201: 0827100 dir.c: regression fix for add_excludes with fscache
199: 7d4dd75 = 202: b13b849 fetch-pack.c: enable fscache for stats under .git/objects
200: fdff9bb = 203: 0fb1c40 checkout.c: enable fscache for checkout again
201: c3fb77d = 204: 0caca9d Enable the filesystem cache (fscache) in refresh_index().
202: 4d25c7f = 205: 17d3bb5 fscache: use FindFirstFileExW to avoid retrieving the short name
203: 02a834a = 206: 77ad0cc fscache: add GIT_TEST_FSCACHE support
204: d7b452d = 207: 5b67723 fscache: add fscache hit statistics
205: 86c8f3d = 208: 0d98494 unpack-trees: enable fscache for sparse-checkout
206: e50a3da = 209: a6dc994 status: disable and free fscache at the end of the status command
207: 0cafb4d = 210: 7039ce5 mem_pool: add GIT_TRACE_MEMPOOL support
208: 709db7c = 211: d024ade fscache: fscache takes an initial size
209: 32e7691 = 212: 3b4ada9 fscache: update fscache to be thread specific instead of global
210: 7481159 = 213: bc4115d fscache: teach fscache to use mempool
211: 903426a = 214: 0431472 fscache: make fscache_enable() thread safe
212: 3e7ea59 = 215: 59101b7 fscache: teach fscache to use NtQueryDirectoryFile
213: f21d6ac = 216: 24b8ca8 fscache: remember the reparse tag for each entry
214: 9c74e1d = 217: 101cea9 Merge branch 'fscache'
215: a4341bc = 218: 160f5d6 fscache: implement an FSCache-aware is_mount_point()
216: 80f6df0 = 219: 82381b7 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
217: 21eda39 = 220: cda8272 clean: make use of FSCache
218: 6f8cb8f = 221: 4abf4df Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
219: 002e3f6 = 222: 0e1aab8 Merge branch 'dont-clean-junctions-fscache'
220: 56d5dfd = 223: f41021b pack-objects (mingw): demonstrate a segmentation fault with large deltas
221: e7cbbf8 = 224: 9d55537 mingw: support long paths
222: 0641805 = 225: 6cd0993 win32(long path support): leave drive-less absolute paths intact
223: f47025b = 226: f2104e6 compat/fsmonitor/fsm-*-win32: support long paths
224: de62257 = 227: e6f5a5d clean: suggest using
core.longPathsif paths are too long to remove225: 06f6c15 = 228: d40c41c mingw: Support
git_terminal_promptwith more terminals226: 9f59ae1 = 229: b46a4cd compat/terminal.c: only use the Windows console if bash 'read -r' fails
228: c60bbf5 = 230: b619fd7 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
232: b32909e = 231: a91b8b9 Win32: symlink: move phantom symlink creation to a separate function
233: 2cc9582 = 232: a46888e Introduce helper to create symlinks that knows about index_state
234: 881e551 = 233: cc9cf4f mingw: allow to specify the symlink type in .gitattributes
235: 0b40629 = 234: 05c5c57 Win32: symlink: add test for
symlinkattribute236: 370331d = 235: 6fbca1f mingw: explicitly specify with which cmd to prefix the cmdline
237: 0d2f2ea = 236: 6d701cf mingw: when path_lookup() failed, try BusyBox
238: ca14937 = 237: 9d3b452 test-tool: learn to act as a drop-in replacement for
iconv239: b6a5dc6 = 238: 7281f23 tests(mingw): if
iconvis unavailable, usetest-helper --iconv240: 280a850 = 239: 075a0c9 gitattributes: mark .png files as binary
241: 30dabf1 = 240: 9030ae3 tests: move test PNGs into t/lib-diff/
242: 9c61007 = 241: e76ca1e tests: only override sort & find if there are usable ones in /usr/bin/
243: e293e2a = 242: 872885d tests: use the correct path separator with BusyBox
244: ee9b6fd = 243: 14c6444 mingw: only use Bash-ism
builtin pwd -Wwhen available245: 14d00d7 = 244: 2156ccf tests (mingw): remove Bash-specific pwd option
246: 726c4ce = 245: 605d036 test-lib: add BUSYBOX prerequisite
248: 4df8a01 = 246: 6bca1a0 t5003: use binary file from t/lib-diff/
230: 403262b = 247: 1a9daca mingw: introduce code to detect whether we're inside a Windows container
250: a5974e6 = 248: 1ca6be1 t5532: workaround for BusyBox on Windows
252: 8728c09 = 249: 60b4ef9 mingw: when running in a Windows container, try to rename() harder
254: a4c9093 = 250: 09f46e9 t5605: special-case hardlink test for BusyBox-w32
256: 7180c62 = 251: 6b4d3fa mingw: move the file_attr_to_st_mode() function definition
258: 7d821e5 = 252: 7f026af t5813: allow for $PWD to be a Windows path
260: bd7d2c4 = 253: 8820fdc mingw: Windows Docker volumes are not symbolic links
262: 4555602 = 254: ee25370 t9200: skip tests when $PWD contains a colon
266: a170a68 = 255: a9a10cb mingw: work around rename() failing on a read-only file
263: c93d436 = 256: 05ec81d mingw: kill child processes in a gentler way
264: f9dc51d = 257: 86ebcd0 Add a GitHub workflow to monitor component updates
247: ee4b957 = 258: 9f5f968 Describe Git for Windows' architecture
268: 10af724 ! 259: 3e3b47a mingw: optionally enable wsl compability file mode bits
269: e9b77b4 = 260: 9df2109 mingw: really handle SIGINT
270: edb728c = 261: 9f7f39c Partially un-revert "editor: save and reset terminal after calling EDITOR"
271: eea00ff = 262: 06cf59f reset: reinstate support for the deprecated --stdin option
272: d79f2c8 = 263: 3397de8 fsmonitor: reintroduce core.useBuiltinFSMonitor
273: 92500a6 = 264: aed44e4 dependabot: help keeping GitHub Actions versions up to date
253: 8ea65e7 = 265: 569c269 Merge branch 'gitk-and-git-gui-patches'
257: 9a93c3a = 266: f3462ab Merge branch 'long-paths'
261: 4d7e9df = 267: 3149adf Merge branch 'msys2'
267: 94c8788 = 268: 0a3371a Merge 'docker-volumes-are-no-symlinks'
275: d606ee1 = 269: b6b09ba mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
276: bd6a1f4 = 270: 7a3fa1d Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
277: ddc8e12 = 271: 20b6e07 Merge branch 'busybox-w32'
249: d69e176 = 272: 89f7a22 Modify the Code of Conduct for Git for Windows
278: 117d1f4 = 273: 006018b Merge branch 'wsl-file-mode-bits'
251: 84abdc1 = 274: 6a54419 CONTRIBUTING.md: add guide for first-time contributors
279: 330e41f = 275: e3ff188 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
255: 823b6a6 = 276: e7f46d2 README.md: Add a Windows-specific preamble
280: a308983 = 277: 9d1a614 Merge branch 'un-revert-editor-save-and-reset'
259: 14713c3 = 278: a28c725 Add an issue template
281: 8badc7c = 279: 1fcac62 Merge branch 'phase-out-reset-stdin'
265: 42aaefe = 280: 38f303a Modify the GitHub Pull Request template (to reflect Git for Windows)
282: f75f40b = 281: 79216e0 Merge branch 'deprecate-core.useBuiltinFSMonitor'
274: 9f483a6 = 282: 9b4e3a8 SECURITY.md: document Git for Windows' policies
283: 212896e = 283: 26b6d9f Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
284: 259851b = 284: 747f0a6 Merge 'readme' into HEAD
285: 419d395 = 285: 6560b67 Add an AGENTS.md file to help with AI-assisted debugging/development
286: d353aaf = 286: b5de752 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: 3dd5a4b = 287: e8f8df2 ??? t5563: add tests for http.emptyAuth with Negotiate