Rebase to v2.54.0-rc0#6154
Merged
gitforwindowshelper[bot] merged 1083 commits intomainfrom Apr 3, 2026
Merged
Conversation
The vcpkg downloads may not succeed. Warn careful readers of the time out. A simple retry will usually resolve the issue. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In this context, a "feature" is a dependency combined with its own dependencies. Signed-off-by: Ian Bearman <ianb@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Correct some wording and inform users regarding the Visual Studio changes (from V16.6) to the default generator. Subsequent commits ensure that Git for Windows can be directly opened in modern Visual Studio without needing special configuration of the CMakeLists settings. It appeares that internally Visual Studio creates it's own version of the .sln file (etc.) for extension tools that expect them. The large number of references below document the shifting of Visual Studio default and CMake setting options. refs: https://docs.microsoft.com/en-us/search/?scope=C%2B%2B&view=msvc-150&terms=Ninja 1. https://docs.microsoft.com/en-us/cpp/linux/cmake-linux-configure?view=msvc-160 (note the linux bit) "In Visual Studio 2019 version 16.6 or later ***, Ninja is the default generator for configurations targeting a remote system or WSL. For more information, see this post on the C++ Team Blog [https://devblogs.microsoft.com/cppblog/linux-development-with-visual-studio-first-class-support-for-gdbserver-improved-build-times-with-ninja-and-updates-to-the-connection-manager/]. For more information about these settings, see CMakeSettings.json reference [https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-160]." 2. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160 "CMake supports two files that allow users to specify common configure, build, and test options and share them with others: CMakePresets.json and CMakeUserPresets.json." " Both files are supported in Visual Studio 2019 version 16.10 or later. ***" 3. https://devblogs.microsoft.com/cppblog/linux-development-with-visual-studio-first-class-support-for-gdbserver-improved-build-times-with-ninja-and-updates-to-the-connection-manager/ " Ninja has been the default generator (underlying build system) for CMake configurations targeting Windows for some time***, but in Visual Studio 2019 version 16.6 Preview 3*** we added support for Ninja on Linux." 4. https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-160 " `generator`: specifies CMake generator to use for this configuration. May be one of: Visual Studio 2019 only: Visual Studio 16 2019 Visual Studio 16 2019 Win64 Visual Studio 16 2019 ARM Visual Studio 2017 and later: Visual Studio 15 2017 Visual Studio 15 2017 Win64 Visual Studio 15 2017 ARM Visual Studio 14 2015 Visual Studio 14 2015 Win64 Visual Studio 14 2015 ARM Unix Makefiles Ninja Because Ninja is designed for fast build speeds instead of flexibility and function, it is set as the default. However, some CMake projects may be unable to correctly build using Ninja. If this occurs, you can instruct CMake to generate Visual Studio projects instead. To specify a Visual Studio generator in Visual Studio 2017, open the settings editor from the main menu by choosing CMake | Change CMake Settings. Delete "Ninja" and type "V". This activates IntelliSense, which enables you to choose the generator you want." "To specify a Visual Studio generator in Visual Studio 2019, right-click on the CMakeLists.txt file in Solution Explorer and choose CMake Settings for project > Show Advanced Settings > CMake Generator. When the active configuration specifies a Visual Studio generator, by default MSBuild.exe is invoked with` -m -v:minimal` arguments." 5. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#enable-cmakepresetsjson-integration-in-visual-studio-2019 "Enable CMakePresets.json integration in Visual Studio 2019 CMakePresets.json integration isn't enabled by default in Visual Studio 2019. You can enable it for all CMake projects in Tools > Options > CMake > General: (tick a box)" ... see more. 6. https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-140 (whichever v140 is..) "CMake projects are supported in Visual Studio 2017 and later." 7. https://docs.microsoft.com/en-us/cpp/overview/what-s-new-for-cpp-2017?view=msvc-150 "Support added for the CMake Ninja generator." 8. https://docs.microsoft.com/en-us/cpp/overview/what-s-new-for-cpp-2017?view=msvc-150#cmake-support-via-open-folder "CMake support via Open Folder Visual Studio 2017 introduces support for using CMake projects without converting to MSBuild project files (.vcxproj). For more information, see CMake projects in Visual Studio[https://docs.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=msvc-150]. Opening CMake projects with Open Folder automatically configures the environment for C++ editing, building, and debugging." ... +more! 9. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#supported-cmake-and-cmakepresetsjson-versions "Visual Studio reads and evaluates CMakePresets.json and CMakeUserPresets.json itself and doesn't invoke CMake directly with the --preset option. So, CMake version 3.20 or later isn't strictly required when you're building with CMakePresets.json inside Visual Studio. We recommend using CMake version 3.14 or later." 10. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#enable-cmakepresetsjson-integration-in-visual-studio-2019 "If you don't want to enable CMakePresets.json integration for all CMake projects, you can enable CMakePresets.json integration for a single CMake project by adding a CMakePresets.json file to the root of the open folder. You must close and reopen the folder in Visual Studio to activate the integration. 11. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#default-configure-presets ***(doesn't actually say which version..) "Default Configure Presets If no CMakePresets.json or CMakeUserPresets.json file exists, or if CMakePresets.json or CMakeUserPresets.json is invalid, Visual Studio will fall back*** on the following default Configure Presets: Windows example JSON { "name": "windows-default", "displayName": "Windows x64 Debug", "description": "Sets Ninja generator, compilers, x64 architecture, build and install directory, debug build type", "generator": "Ninja", "binaryDir": "${sourceDir}/out/build/${presetName}", "architecture": { "value": "x64", "strategy": "external" }, "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}" }, "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { "hostOS": [ "Windows" ] } } }, " Signed-off-by: Philip Oakley <philipoakley@iee.email>
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>
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>
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>
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>
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Git's regular Makefile mentions that HOST_CPU should be defined when cross-compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L438-L439 This is then used to set the GIT_HOST_CPU variable when compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L1337-L1341 Then, when the user runs `git version --build-options`, it returns that value: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/help.c#L658 This commit adds the same functionality to the CMake configuration. Users can now set -DHOST_CPU= to set the target architecture. Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
As reported in newren/git-filter-repo#225, it looks like 99 bytes is not really sufficient to represent e.g. the full path to Python when installed via Windows Store (and this path is used in the hasb bang line when installing scripts via `pip`). Let's increase it to what is probably the maximum sensible path size: MAX_PATH. This makes `parse_interpreter()` in line with what `lookup_prog()` handles. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Vilius Šumskas <vilius@sumskas.eu>
We used to have that `make vcxproj` hack, but a hack it is. In the meantime, we have a much cleaner solution: using CMake, either explicitly, or even more conveniently via Visual Studio's built-in CMake support (simply open Git's top-level directory via File>Open>Folder...). Let's let the `README` reflect this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This adds support for a new http.sslAutoClientCert config value. In cURL 7.77 or later the schannel backend does not automatically send client certificates from the Windows Certificate Store anymore. This config value is only used if http.sslBackend is set to "schannel", and can be used to opt in to the old behavior and force cURL to send client certificates. This fixes #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>
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>
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>
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>
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 #3629 regarding problems caused by always setting $env:TERM="cygwin". This is the same heuristic used by the Cygwin runtime. Signed-off-by: Rafael Kitover <rkitover@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NtQueryObject under Wine can return a success but fill out no name. In those situations, Wine will set Buffer to NULL, and set result to the sizeof(OBJECT_NAME_INFORMATION). Running a command such as echo "$(git.exe --version 2>/dev/null)" will crash due to a NULL pointer dereference when the code attempts to null terminate the buffer, although, weirdly, removing the subshell or redirecting stdout to a file will not trigger the crash. Code has been added to also check Buffer and Length to ensure the check is as robust as possible due to the current behavior being fragile at best, and could potentially change in the future This code is based on the behavior of NtQueryObject under wine and reactos. Signed-off-by: Christopher Degawa <ccom@randomderp.com>
Atomic append on windows is only supported on local disk files, and it may cause errors in other situations, e.g. network file system. If that is the case, this config option should be used to turn atomic append off. Co-Authored-By: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: 孙卓识 <sunzhuoshi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
From the documentation of said setting: This boolean will enable fsync() when writing object files. This is a total waste of time and effort on a filesystem that orders data writes properly, but can be useful for filesystems that do not use journalling (traditional UNIX filesystems) or that only journal metadata and not file contents (OS X’s HFS+, or Linux ext3 with "data=writeback"). The most common file system on Windows (NTFS) does not guarantee that order, therefore a sudden loss of power (or any other event causing an unclean shutdown) would cause corrupt files (i.e. files filled with NULs). Therefore we need to change the default. Note that the documentation makes it sound as if this causes really bad performance. In reality, writing loose objects is something that is done only rarely, and only a handful of files at a time. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Whith Windows 2000, Microsoft introduced a flag to the PE header to mark executables as "terminal server aware". Windows terminal servers provide a redirected Windows directory and redirected registry hives when launching legacy applications without this flag set. Since we do not use any INI files in the Windows directory and don't write to the registry, we don't need this additional preparation. Telling the OS that we don't need this should provide slightly improved startup times in terminal server environments. When building for supported Windows Versions with MSVC the /TSAWARE linker flag is automatically set, but MinGW requires us to set the --tsaware flag manually. This partially addresses #3935. Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Add FileVersion, which is a required field As not all required fields were present, none were being included Fixes #4090 Signed-off-by: Kiel Hurley <kielhurley@gmail.com>
In f9b7573 (repository: free fields before overwriting them, 2017-09-05), Git was taught to release memory before overwriting it, but 357a03e (repository.c: move env-related setup code back to environment.c, 2018-03-03) changed the code so that it would not _always_ be overwritten. As a consequence, the `commondir` attribute would point to already-free()d memory. This seems not to cause problems in core Git, but there are add-on patches in Git for Windows where the `commondir` attribute is subsequently used and causing invalid memory accesses e.g. in setups containing old-style submodules (i.e. the ones with a `.git` directory within theirs worktrees) that have `commondir` configured. This fixes #4083. Signed-off-by: Andrey Zabavnikov <zabavnikov@gmail.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>
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>
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>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This was pull request #1645 from ZCube/master Support windows container. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
This patch introduces support to set special NTFS attributes that are interpreted by the Windows Subsystem for Linux as file mode bits, UID and GID. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Handle Ctrl+C in Git Bash nicely Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is a companion patch of 3b9b2c2 (compat/posix: introduce writev(3p) wrapper, 2026-03-13) where support for using the `writev()` wrapper was introduced in the `Makefile` and the Meson-based build, but the CMake build still needs that treatment, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Member
Author
|
/git-artifacts The |
Validate the installer manuallyThe installer was built successfully; |
Member
Author
|
/release The |
|
@dscho, please Share on Bluesky and send the announcement email. |
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.
The usual thing. This time, I spent some time crafting a clean branch that is tree-same to the current
origin/main, namedclean-pre-2.54.0-rc0-rebase.Range-diff
1: 873fe23 = 1: cad0438 sideband: mask control characters
2: 268465a = 2: dea5198 sideband: introduce an "escape hatch" to allow control characters
3: e6a90de = 3: 04bbc33 sideband: do allow ANSI color sequences by default
4: 70565d9 = 4: 9109830 unix-socket: avoid leak when initialization fails
5: 7ca734f = 5: 4364f3b Merge branch 'disallow-control-characters-in-sideband-channel'
6: f1b0016 = 6: 6b71bc1 grep: prevent
^$false match at end of file7: d74db2d = 7: e597446 Merge branch 'fixes-from-the-git-mailing-list'
8: 1f061ca ! 8: 564e8c5 t9350: point out that refs are not updated correctly
@@ Commit message Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> ## t/t9350-fast-export.sh ## -@@ t/t9350-fast-export.sh: test_expect_success GPG 'export and import of doubly signed commit' ' +@@ t/t9350-fast-export.sh: test_expect_success GPG,RUST 'export and import of doubly signed commit' ' fi '9: b840ba6 = 9: 19e20cd transport-helper: add trailing --
10: 026b296 = 10: 225237b remote-helper: check helper status after import/export
11: 53c5243 = 11: 675a8cd Always auto-gc after calling a fast-import transport
18: 99a6552 = 12: 4b8b233 mingw: prevent regressions with "drive-less" absolute paths
12: 177a10f = 13: 72be1d2 mingw: include the Python parts in the build
13: 18d8514 = 14: 684e39f win32/pthread: avoid name clashes with winpthread
14: cff64d0 = 15: 14ea9a6 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
15: 2add928 = 16: 1503396 Import the source code of mimalloc v2.2.7
17: 5a27f1a = 17: 40a30f3 mimalloc: adjust for building inside Git
20: 32bd172 = 18: f60f855 mimalloc: offer a build-time option to enable it
16: a2d9554 = 19: 251bd74 clean: do not traverse mount points
22: 2ab1d46 = 20: 1f59b1c mingw: use mimalloc
19: 24c6749 = 21: b447e49 clean: remove mount points when possible
23: 72fa6d5 = 22: eea9edb transport: optionally disable side-band-64k
24: 56ad2e9 = 23: c2bf494 mingw: fix fatal error working on mapped network drives on Windows
25: a13c868 = 24: 259e3c4 clink.pl: fix MSVC compile script to handle libcurl-d.lib
32: e79df31 = 25: 80212b6 vcpkg_install: detect lack of Git
21: ca6c340 = 26: 1d9da7b mingw: demonstrate a
git addissue with NTFS junctions33: 81f3b95 = 27: 931338a vcpkg_install: add comment regarding slow network connections
26: 24aaf20 = 28: db6b111 t5505/t5516: allow running without
.git/branches/in the templates27: 349dbbd = 29: 7f6416a strbuf_realpath(): use platform-dependent API if available
34: 6893334 = 30: 2574164 vcbuild: install ARM64 dependencies when building ARM64 binaries
28: 0ab9505 ! 31: fe35be7 http: use new "best effort" strategy for Secure Channel revoke checking
29: e79815d = 32: 3ce58e9 t5505/t5516: fix white-space around redirectors
30: 01fbee7 = 33: 36e014a mingw: implement a platform-specific
strbuf_realpath()31: 1eaae85 = 34: e614af9 t3701: verify that we can add lots of files interactively
38: b066080 = 35: 2d84814 commit: accept "scissors" with CR/LF line endings
39: 3870ed7 = 36: 2f4b307 t0014: fix indentation
40: 9078dfd = 37: b19616b git-gui: accommodate for intent-to-add files
35: 9ab3f33 = 38: e6acdd1 vcbuild: add an option to install individual 'features'
36: 4c07fec = 39: 20de789 cmake: allow building for Windows/ARM64
37: 73186dd = 40: a44c79e ci(vs-build) also build Windows/ARM64 artifacts
41: 39d8a15 = 41: da208ad Add schannel to curl installation
42: 979a842 = 42: a0adc6f cmake(): allow setting HOST_CPU for cross-compilation
44: 2cf4567 = 43: 9fda288 CMake: default Visual Studio generator has changed
52: c980bcf = 44: 550b46c .gitignore: add Visual Studio CMakeSetting.json file
49: 67e7b94 = 45: d4e722e hash-object: demonstrate a >4GB/LLP64 problem
43: 7d91cd6 = 46: 45df834 subtree: update
contrib/subtreetesttarget54: ea977e7 = 47: 55e8c83 CMakeLists: add default "x64-windows" arch for Visual Studio
50: b756394 = 48: 8ff63d6 object-file.c: use size_t for header lengths
45: 7f53a0b = 49: bd3f9ea mingw: allow for longer paths in
parse_interpreter()46: 38ab1f0 = 50: 37283dd compat/vcbuild: document preferred way to build in Visual Studio
47: 278adc2 ! 51: 1fa945c http: optionally send SSL client certificate
48: 79b84ad = 52: 8f7d41a ci: run
contrib/subtreetests in CI builds57: 47c7ebc = 53: da65821 CMake: show Win32 and Generator_platform build-option values
51: 141c37b = 54: 7918e8f hash algorithms: use size_t for section lengths
53: ba32090 = 55: 07fa716 hash-object --stdin: verify that it works with >4GB/LLP64
55: 75438de = 56: 5821584 hash-object: add another >4GB/LLP64 test case
56: 2a1b51d = 57: 1f00fb3 setup: properly use "%(prefix)/" when in WSL
60: d3c2c74 = 58: 0e9db30 Add config option
windows.appendAtomically61: a218225 = 59: da26259 MinGW: link as terminal server aware
58: 12e8ed0 = 60: dc70a99 hash-object: add a >4GB/LLP64 test case using filtered input
59: d27654c = 61: 7e59f5f compat/mingw.c: do not warn when failing to get owner
62: 01fd0c6 = 62: 2c544d2 mingw: $env:TERM="xterm-256color" for newer OSes
63: 0150490 = 63: 3a40e80 winansi: check result and Buffer before using Name
64: e3bb377 = 64: 98f17d2 mingw: change core.fsyncObjectFiles = 1 by default
65: be3c3d7 = 65: 6db5111 Fix Windows version resources
66: be899fe = 66: eefca7d status: fix for old-style submodules with commondir
67: 505d490 = 67: 19dd456 windows: skip linking
git-<command>for built-ins68: 4e98b9b = 68: 7ad040c mingw: stop hard-coding
CC = gcc69: ee99a7c = 69: 7c99531 mingw: drop the -D_USE_32BIT_TIME_T option
70: 5dfb8d9 = 70: 9968a5a mingw: only use -Wl,--large-address-aware for 32-bit builds
71: 10bfa90 = 71: 8551b75 mingw: avoid over-specifying
--pic-executable72: 298ff81 = 72: e6ef60d mingw: set the prefix and HOST_CPU as per MSYS2's settings
73: 4bf9419 = 73: 2247b4a mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
74: 222947b = 74: 6603cd0 mingw: rely on MSYS2's metadata instead of hard-coding it
75: 58719bb = 75: 363d1e3 mingw: always define
ETC_*for MSYS2 environments76: 47d7ce7 = 76: 7e228a6 max_tree_depth: lower it for clang builds in general on Windows
77: 56d2302 = 77: bbece75 mingw: ensure valid CTYPE
78: d1d783f = 78: 8460b86 mingw: allow
git.exeto be used instead of the "Git wrapper"79: 4f767c3 = 79: 8dd949a mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
80: 634b978 = 80: ce9edb7 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
81: 3236403 = 81: 7662c98 clink.pl: fix libexpatd.lib link error when using MSVC
82: 2776758 = 82: 5031072 Makefile: clean up .ilk files when MSVC=1
83: 3c3cd2b ! 83: 5d0db36 vcbuild: add support for compiling Windows resource files
84: 2e2f698 = 84: 4653bf7 config.mak.uname: add git.rc to MSVC builds
85: 807ffc6 = 85: 1e50e83 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
86: e8fb572 = 86: 2b4827a http: optionally load libcurl lazily
87: 3d7685d = 87: ecc2110 clink.pl: move default linker options for MSVC=1 builds
88: 7f75726 = 88: ad919d0 http: support lazy-loading libcurl also on Windows
89: 8000293 = 89: 4f834cf cmake: install headless-git.
90: 6f319a4 = 90: 7f54b2f http: when loading libcurl lazily, allow for multiple SSL backends
91: edeb8fc = 91: 8d4e381 git.rc: include winuser.h
92: c17d3cb = 92: 5e7aecd mingw: do load libcurl dynamically by default
93: 8deeb1d = 93: 0aef3ce Add a GitHub workflow to verify that Git/Scalar work in Nano Server
94: d793256 = 94: 363890f mingw: suggest
windows.appendAtomicallyin more cases99: c8050f6 = 95: 639ba81 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
102: 6d45db5 = 96: 07d8e26 revision: create mark_trees_uninteresting_dense()
159: 97ea8cf = 97: b4898c4 survey: stub in new experimental 'git-survey' command
160: 0f40bf2 = 98: 1d719bf survey: add command line opts to select references
161: ca6dd9e = 99: f13ffd0 survey: start pretty printing data in table form
162: 6c7399a = 100: dd88cf8 survey: add object count summary
163: 237e477 = 101: 288ae6c survey: summarize total sizes by object type
164: dd4abbe = 102: c0e7b85 survey: show progress during object walk
95: 9868204 = 103: 39d3602 win32: use native ANSI sequence processing, if possible
96: 662e2b1 = 104: 726b538 common-main.c: fflush stdout buffer upon exit
97: 28220a9 = 105: 77f8f37 t5601/t7406(mingw): do run tests with symlink support
98: ebafe20 = 106: 105df30 win32: ensure that
localtime_r()is declared even in i686 builds100: 0ffc3fb = 107: 067395b Fallback to AppData if XDG_CONFIG_HOME is unset
101: 57dc6fe = 108: 17a1cfd run-command: be helpful with Git LFS fails on Windows 7
103: 7694f25 = 109: d462e00 mingw: make sure
errnois set correctly when socket operations fail165: bb562e9 = 110: 1930def survey: add ability to track prioritized lists
104: 6fe1792 ! 111: d623629 compat/mingw: handle WSA errors in strerror
@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> ## Makefile ## -@@ Makefile: CLAR_TEST_SUITES += u-example-decorate - CLAR_TEST_SUITES += u-hash +@@ Makefile: CLAR_TEST_SUITES += u-hash CLAR_TEST_SUITES += u-hashmap + CLAR_TEST_SUITES += u-list-objects-filter-options CLAR_TEST_SUITES += u-mem-pool +CLAR_TEST_SUITES += u-mingw CLAR_TEST_SUITES += u-oid-array @@ compat/mingw.c: static inline int winsock_return(int ret) ## t/meson.build ## @@ t/meson.build: clar_test_suites = [ - 'unit-tests/u-hash.c', 'unit-tests/u-hashmap.c', + 'unit-tests/u-list-objects-filter-options.c', 'unit-tests/u-mem-pool.c', + 'unit-tests/u-mingw.c', 'unit-tests/u-oid-array.c',174: dd91fa3 ! 112: 1c27023 t5563: verify that NTLM authentication works
@@ Commit message ## t/lib-httpd.sh ## @@ t/lib-httpd.sh: prepare_httpd() { - install_script error.sh install_script apply-one-time-script.sh install_script nph-custom-auth.sh + install_script http-429.sh + install_script ntlm-handshake.sh ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules" @@ t/lib-httpd/apache.conf: SetEnv PERL_PATH ${PERL_PATH} ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/ ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/ ScriptAlias /smart/no_report/git-receive-pack error-no-report.sh/ -@@ t/lib-httpd/apache.conf: ScriptAlias /error_smart/ error-smart-http.sh/ - ScriptAlias /error/ error.sh/ +@@ t/lib-httpd/apache.conf: ScriptAlias /error/ error.sh/ ScriptAliasMatch /one_time_script/(.*) apply-one-time-script.sh/$1 + ScriptAliasMatch /http_429/(.*) http-429.sh/$1 ScriptAliasMatch /custom_auth/(.*) nph-custom-auth.sh/$1 +ScriptAliasMatch /ntlm_auth/(.*) ntlm-handshake.sh/$1 <Directory ${GIT_EXEC_PATH}>166: 7e15d7b = 113: 795f5dc survey: add report of "largest" paths
105: 6c78e58 = 114: c82a9f4 compat/mingw: drop outdated comment
175: f554a9f ! 115: 9affb87 http: disallow NTLM authentication by default
@@ http.c: static CURL *get_curl_handle(void) #ifdef CURLGSSAPI_DELEGATION_FLAG if (curl_deleg) { @@ http.c: void http_init(struct remote *remote, const char *url, int proactive_auth) - set_long_from_env(&curl_tcp_keepintvl, "GIT_TCP_KEEPINTVL"); - set_long_from_env(&curl_tcp_keepcnt, "GIT_TCP_KEEPCNT"); + set_long_from_env(&http_max_retries, "GIT_HTTP_MAX_RETRIES"); + set_long_from_env(&http_max_retry_time, "GIT_HTTP_MAX_RETRY_TIME"); + http_auth_methods = http_auth_any; +167: 3b38873 = 116: f303c99 survey: add --top= option and config
106: 9bd8b6d = 117: 1d9c888 t0301: actually test credential-cache on Windows
176: a97c67a = 118: 5612c83 http: warn if might have failed because of NTLM
168: 5edc7c3 = 119: dec8ec7 survey: clearly note the experimental nature in the output
107: ff27f65 = 120: 3d8351f credential-cache: handle ECONNREFUSED gracefully
110: 75df29e ! 121: bf05a58 reftable: do make sure to use custom allocators
111: c5e1523 = 122: dfa6a7c check-whitespace: avoid alerts about upstream commits
112: d79dace = 123: a1bd514 t/t5571-prep-push-hook.sh: Add test with writing to stderr
108: 618c1a4 = 124: 13a251f Merge 'remote-hg-prerequisites' into HEAD
109: 61903c6 = 125: 4fe4716 Merge branch 'drive-prefix'
113: 4cd258c = 126: 0042443 Merge branch 'dont-clean-junctions'
114: a062e95 = 127: 21503ae Merge branch 'msys2-python'
177: bc4e669 ! 128: 75d09c7 credential: advertise NTLM suppression and allow helpers to re-enable
@@ http.c: static int handle_curl_result(struct slot_results *results) warning(_("Due to its cryptographic weaknesses, " "NTLM authentication has been\n" "disabled in Git by default. You can " -@@ http.c: static int http_request_reauth(const char *url, - - credential_fill(the_repository, &http_auth, 1); +@@ http.c: static int http_request_recoverable(const char *url, + credential_fill(the_repository, &http_auth, 1); + } + /* + * Re-enable NTLM auth if the helper allows it and we would @@ http.c: static int http_request_reauth(const char *url, + ret = http_request(url, result, target, options); } - return ret; + if (ret == HTTP_RATE_LIMITED) { ## t/t5563-simple-http-auth.sh ## @@ t/t5563-simple-http-auth.sh: test_expect_success NTLM 'access using NTLM auth' '178: 349fb48 = 129: a47dcfd mingw: use strftime() directly in UCRT builds
179: ea4fefa = 130: b93f3c7 dir: do not traverse mount points
115: 4adf5e3 = 131: 777fcc3 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 #6048)
116: 27c9cb2 = 132: 3e96f03 Merge pull request Config option to disable side-band-64k for transport #2375 from assarbad/reintroduce-sideband-config
117: 78a487b = 133: b7c8d81 Merge pull request mingw: fix fatal error working on mapped network drives on Windows #2488 from bmueller84/master
118: 2fe3221 = 134: 1754840 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib #2501 from jeffhostetler/clink-debug-curl
119: 5bfc13c = 135: 82f3452 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction #2504 from dscho/access-repo-via-junction120: 8143b15 = 136: a682fc6 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking #2535 from dscho/schannel-revoke-best-effort
121: 1e759ad = 137: a9d24b0 Merge pull request ci: avoid d/f conflict in vs/master #2618 from dscho/avoid-d/f-conflict-in-vs/master
122: dbaab26 = 138: 1047902 Merge 'add-p-many-files'
123: 6432774 = 139: a81b89d Merge pull request Rationalize line endings for scissors-cleanup #2714 from lbonanomi/crlf-scissors
124: 0ac7757 = 140: c024ff7 Merge pull request t/t0014: fix: eliminate additional lines from trace #2655 from jglathe/jg/t0014_trace_extra_info
125: 02cbe26 = 141: c464bb9 Merge 'git-gui/js/intent-to-add'
126: 726e592 = 142: 2060443 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs #2351 from PhilipOakley/vcpkg-tip
127: 6989044 = 143: 069db6e Merge pull request Windows arm64 support #2915 from dennisameling/windows-arm64-support
128: 1b9d977 = 144: 0c2086f Merge pull request cmake(): allow setting HOST_CPU for cross-compilation #3327 from dennisameling/fix-host-cpu
129: 5c0926b = 145: 1952236 Merge pull request mingw: allow for longer paths in
parse_interpreter()#3165 from dscho/increase-allowed-length-of-interpreter-path130: ff1ef3e = 146: de5eb58 Merge pull request Let the documentation reflect that there is no vs/master anymore #3220 from dscho/there-is-no-vs/master-anymore
131: ec8534c = 147: aebc25b Merge pull request http: Add support for enabling automatic sending of SSL client certificate #3293 from pascalmuller/http-support-automatically-sending-client-certificate
132: 110b167 = 148: ed52478 Merge pull request Add
contrib/subtreetest execution to CI builds #3349 from vdye/feature/ci-subtree-tests133: 2433cd4 = 149: 0e9cad2 Merge pull request Make Git for Windows start builds in modern Visual Studio #3306 from PhilipOakley/vs-sln
134: ee01a66 = 150: b417a00 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows #3533 from PhilipOakley/hashliteral_t135: 74f06ad = 151: 5eb2de3 Merge pull request Various fixes around
safe.directory#3791: Various fixes aroundsafe.directory136: 3efc561 = 152: fdac7d7 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes #3751 from rkitover/native-term
137: 49a54e1 = 153: 7f0d049 Merge pull request winansi: check result before using Name for pty #3875 from 1480c1/wine/detect_msys_tty
138: 44ce36c = 154: 9f3d526 Merge branch 'optionally-dont-append-atomically-on-windows'
139: 7a087e0 = 155: 670f832 Merge branch 'fsync-object-files-always'
140: 04eafd0 = 156: 3d6d8e4 Merge pull request MinGW: link as terminal server aware #3942 from rimrul/mingw-tsaware
141: 31bcf29 = 157: f845fda Fix Windows version resources (Fix Windows version resources #4092)
142: 235716d = 158: ef26220 Fix global repository field not being cleared (Fix global repository field not being cleared #4083)
143: 8adf966 = 159: c2d2e8b Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins #4252)144: 0ede355 = 160: 9bf457c Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support #5971)145: 65bffa2 = 161: e4e026e Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exe#2506 from dscho/issue-2283146: 96b5c58 = 162: 041ac64 Merge pull request Include Windows-specific maintenance and headless-git #2974 from derrickstolee/maintenance-and-headless
147: 8b753e2 = 163: 47b1c3c ARM64: Embed manifest properly (ARM64: Embed manifest properly #4718)
148: 5e7e72b = 164: af52e5b Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl #4410)
149: e223df5 = 165: 0ade1e8 Merge branch 'nano-server'
150: 26127c0 = 166: de5be60 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning #4528)
151: 0d77daa = 167: 8f0cdea win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible #4700)
152: 1495567 = 168: 95446c3 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit #4901)
153: 8b5fc78 = 169: 6619dae Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
154: 089407c = 170: ec0e312 Merge branch 'Fix-i686-build-with-GCC-v14'
155: e555cc0 = 171: 33dd150 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
156: da1d677 = 172: e8f27dc Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
157: b27729e = 173: 4e13bc3 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm #5157)
158: fe741e9 = 174: 13091e8 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' #5171)
169: 723bad1 = 175: 5c2f93c Add experimental 'git survey' builtin (Add experimental 'git survey' builtin #5174)
170: 9e52d47 = 176: 95a1839 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully #5329)
171: 1655f02 = 177: a353811 Merge branch 'reftable-vs-custom-allocators'
172: be1ee50 = 178: 3ca2f1b Merge branch 'check-whitespace-only-downstream'
173: 0da9809 = 179: dd513cb t/t5571-prep-push-hook.sh: Add test with writing to stderr (t/t5571-prep-push-hook.sh: Add test with writing to stderr #6063)
180: 87588cd = 180: 5f2c53b Merge branch 'disallow-ntlm-auth-by-default'
181: 359021c = 181: 6965864 mingw: use strftime() directly in UCRT builds (mingw: use strftime() directly in UCRT builds #6130)
182: ba2fd21 = 182: c9e5f71 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()#6151)183: 45397a0 = 183: ccb6ce4 Merge branch 'ready-for-upstream'
184: e330f98 = 184: 3b8f7fa ci(macos): skip the
git p4tests185: 8fcd611 = 185: 2f45fc8 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests #5954)186: e29b383 = 186: ff97fec Win32: make FILETIME conversion functions public
187: bac14ef = 187: 60aed93 Win32: dirent.c: Move opendir down
189: f80396b = 188: 67a5395 mingw: make the dirent implementation pluggable
191: d57a2ae = 189: 3f0d3c5 Win32: make the lstat implementation pluggable
193: 82276d8 = 190: 6144194 mingw: add infrastructure for read-only file system level caches
188: 66e315e ! 191: 9d0813f git-gui--askyesno: fix funny text wrapping
@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> - ## git-gui/git-gui--askyesno ## -@@ git-gui/git-gui--askyesno: if {$argc < 1} { + ## git-gui/git-gui--askyesno.sh ## +@@ git-gui/git-gui--askyesno.sh: if {$argc < 1} { } ${NS}::frame .t194: 67353e2 = 192: 580aee5 mingw: add a cache below mingw's lstat and dirent implementations
190: dd8c8eb ! 193: 2a8f933 git-gui--askyesno (mingw): use Git for Windows' icon, if available
@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> - ## git-gui/git-gui--askyesno ## -@@ git-gui/git-gui--askyesno: if {$::tcl_platform(platform) eq {windows}} { + ## git-gui/git-gui--askyesno.sh ## +@@ git-gui/git-gui--askyesno.sh: if {$::tcl_platform(platform) eq {windows}} { } }195: fb86eca = 194: 861d981 fscache: load directories only once
192: c5e5ce9 = 195: aef6415 Merge branch 'git-gui-askyesno'
196: cef00a6 = 196: 448749b fscache: add key for GIT_TRACE_FSCACHE
197: 2caa0d6 = 197: 82d09a9 fscache: remember not-found directories
198: 39d3605 = 198: 8b6c3cc fscache: add a test for the dir-not-found optimization
199: 5e91e30 = 199: 486873c add: use preload-index and fscache for performance
200: 164be8a = 200: 111ac06 dir.c: make add_excludes aware of fscache during status
201: 97259fb = 201: 6cfa7ae fscache: make fscache_enabled() public
202: ea76ab8 = 202: 5a24cbb dir.c: regression fix for add_excludes with fscache
203: cf18004 = 203: be7243c fetch-pack.c: enable fscache for stats under .git/objects
204: 99a2e9b = 204: c97953a checkout.c: enable fscache for checkout again
205: 94ccb4c = 205: ad44d84 Enable the filesystem cache (fscache) in refresh_index().
206: eface7d = 206: dfb3c53 fscache: use FindFirstFileExW to avoid retrieving the short name
207: 968cd1d = 207: 22b8267 fscache: add GIT_TEST_FSCACHE support
208: 8e984ea = 208: 9d416ef fscache: add fscache hit statistics
209: 97fade8 = 209: 90970d9 unpack-trees: enable fscache for sparse-checkout
210: 75a29b2 = 210: 6409d56 status: disable and free fscache at the end of the status command
211: a1eb57f = 211: 0bdb2cf mem_pool: add GIT_TRACE_MEMPOOL support
212: b5357a8 = 212: 621be54 fscache: fscache takes an initial size
213: 2e6bc07 = 213: 9e00f99 fscache: update fscache to be thread specific instead of global
214: dc5217a = 214: 4773626 fscache: teach fscache to use mempool
215: 9188344 = 215: 44df3c4 fscache: make fscache_enable() thread safe
216: fd020e9 = 216: e8cfdf1 fscache: teach fscache to use NtQueryDirectoryFile
217: 06634ae = 217: 1e93c8b fscache: remember the reparse tag for each entry
219: 82aeb0c = 218: 07b41f3 Merge branch 'fscache'
218: 0fc15af = 219: c9dd4fb fscache: implement an FSCache-aware is_mount_point()
220: e123636 = 220: 9dd9966 Merge pull request status: disable and free fscache at the end of the status command #1909 from benpeart/free-fscache-after-status-gfw
221: 2822707 = 221: 8bd9d50 clean: make use of FSCache
222: 7545c19 = 222: f2ad835 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
223: c1cdf06 = 223: 02821b0 Merge branch 'dont-clean-junctions-fscache'
224: 8dfb6df ! 224: adadbb5 pack-objects (mingw): demonstrate a segmentation fault with large deltas
225: bd9f8a0 = 225: 17d3187 mingw: support long paths
226: 0eaae59 = 226: faf8168 win32(long path support): leave drive-less absolute paths intact
227: fe87a8d = 227: 3763a6b compat/fsmonitor/fsm-*-win32: support long paths
228: 4bd5754 = 228: 598fe6b clean: suggest using
core.longPathsif paths are too long to remove229: 94f8bb4 = 229: ec67885 mingw: Support
git_terminal_promptwith more terminals230: c819b21 = 230: df7032d compat/terminal.c: only use the Windows console if bash 'read -r' fails
231: 14c98a5 = 231: beb26cd mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
232: bee8c8b = 232: eadec2d mingw: introduce code to detect whether we're inside a Windows container
233: 21c30f1 = 233: 9ba7444 mingw: when running in a Windows container, try to rename() harder
234: 3d29db1 = 234: fa9b834 mingw: move the file_attr_to_st_mode() function definition
235: e1ca700 = 235: f773ee6 mingw: Windows Docker volumes are not symbolic links
236: 1eabac2 = 236: 2a55a1b Win32: symlink: move phantom symlink creation to a separate function
237: 25fbc30 = 237: 11a294f Introduce helper to create symlinks that knows about index_state
238: 1f0e70e = 238: 83e41f0 mingw: allow to specify the symlink type in .gitattributes
239: fd322fe = 239: 3371f54 Win32: symlink: add test for
symlinkattribute240: 8895786 = 240: 98ef286 mingw: explicitly specify with which cmd to prefix the cmdline
241: e3e66cc = 241: 4542c7d mingw: when path_lookup() failed, try BusyBox
242: 380bdc8 = 242: c78b42d test-tool: learn to act as a drop-in replacement for
iconv243: 940599e = 243: 3f0d0b8 tests(mingw): if
iconvis unavailable, usetest-helper --iconv244: c0dbe0f = 244: 5429073 gitattributes: mark .png files as binary
245: 288a0cc = 245: eec1e68 tests: move test PNGs into t/lib-diff/
246: 6b2722b = 246: fc233c3 tests: only override sort & find if there are usable ones in /usr/bin/
248: 43aa153 = 247: 5d98c34 tests: use the correct path separator with BusyBox
249: b94276f = 248: 02882f8 mingw: only use Bash-ism
builtin pwd -Wwhen available247: 5f2a3f5 = 249: 81456c0 mingw: work around rename() failing on a read-only file
250: a021fb0 = 250: 9864990 tests (mingw): remove Bash-specific pwd option
251: 74a4ec4 = 251: 3b75e32 test-lib: add BUSYBOX prerequisite
252: f3d6a85 = 252: 472e2ad t5003: use binary file from t/lib-diff/
253: 939ab60 = 253: 4772e27 t5532: workaround for BusyBox on Windows
254: 41f2b0d = 254: f2c4668 t5605: special-case hardlink test for BusyBox-w32
255: 9dbb48d = 255: 566ab3c t5813: allow for $PWD to be a Windows path
256: bddf230 = 256: d748035 t9200: skip tests when $PWD contains a colon
258: 971a41a = 257: 0f22b67 mingw: kill child processes in a gentler way
257: 426dab4 = 258: d1e78a1 mingw: optionally enable wsl compability file mode bits
261: 79bc2c9 = 259: a5c2baa mingw: really handle SIGINT
262: 245dae4 = 260: 57557b4 Partially un-revert "editor: save and reset terminal after calling EDITOR"
260: 725de0e = 261: 26d2f52 Describe Git for Windows' architecture [no ci]
266: 959ab53 = 262: 14acb60 Modify the Code of Conduct for Git for Windows
267: 306b171 = 263: c060827 CONTRIBUTING.md: add guide for first-time contributors
268: 5c1264f = 264: 9d20a0f README.md: Add a Windows-specific preamble
270: 552494d = 265: bb67eb5 Add an issue template
259: 27023e1 = 266: 9da95d9 Add a GitHub workflow to monitor component updates
272: 416bf8b = 267: 471eb8e Modify the GitHub Pull Request template (to reflect Git for Windows)
269: 7c9103c = 268: 4281512 Merge branch 'gitk-and-git-gui-patches'
263: 52a2ed6 ! 269: 3e94fd6 reset: reinstate support for the deprecated --stdin option
@@ builtin/reset.c: static const char * const git_reset_usage[] = { @@ builtin/reset.c: int cmd_reset(int argc, struct pathspec pathspec; int intent_to_add = 0; - struct add_p_opt add_p_opt = ADD_P_OPT_INIT; + struct interactive_options interactive_opts = INTERACTIVE_OPTIONS_INIT; + int nul_term_line = 0, read_from_stdin = 0; const struct option options[] = { OPT__QUIET(&quiet, N_("be quiet, only report errors")),264: 5465815 = 270: 70f0dfc fsmonitor: reintroduce core.useBuiltinFSMonitor
265: e0437fa = 271: 9bbffaa dependabot: help keeping GitHub Actions versions up to date
274: 8692bc4 = 272: 42dd91b SECURITY.md: document Git for Windows' policies
271: 35584ec = 273: 4ff561f Merge branch 'long-paths'
273: c60b750 = 274: 2927d77 Merge branch 'msys2'
275: 5cb9c5e = 275: e401432 Merge 'docker-volumes-are-no-symlinks'
276: 3301b49 = 276: 44cc0ef mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails #4527)
277: 5b80fe7 = 277: 6402d72 Merge pull request Specify symlink type in .gitattributes #1897 from piscisaureus/symlink-attr
278: 5cb37de = 278: 6f5938b Merge branch 'busybox-w32'
279: 3edfee1 = 279: 96c87c2 Merge branch 'wsl-file-mode-bits'
280: c41e888 = 280: e9edd90 Merge pull request Handle Ctrl+C in Git Bash nicely #1170 from dscho/mingw-kill-process
281: 2868041 = 281: 086cd1a Merge branch 'un-revert-editor-save-and-reset'
282: ed291d2 = 282: 1dc36e5 Merge branch 'phase-out-reset-stdin'
283: f6e78bd = 283: 9601ac3 Merge branch 'deprecate-core.useBuiltinFSMonitor'
284: 44ff9d3 = 284: a2b6034 Merge pull request Start monitoring updates of Git for Windows' components in the open #2837 from dscho/monitor-component-updates
285: f919831 = 285: c753820 Merge 'readme' into HEAD
-: ----------- > 286: a2409ca cmake: use writev(3p) wrapper as needed