Rebase shears/next: 1 conflict(s) (0 skipped, 1 resolved) (#27423262167)#231
Open
gitforwindowshelper[bot] wants to merge 283 commits into
Open
Rebase shears/next: 1 conflict(s) (0 skipped, 1 resolved) (#27423262167)#231gitforwindowshelper[bot] wants to merge 283 commits into
gitforwindowshelper[bot] wants to merge 283 commits into
Conversation
In 1e64d18 (mingw: do resolve symlinks in `getcwd()`) a problem was introduced that causes git for Windows to stop working with certain mapped network drives (in particular, drives that are mapped to locations with long path names). Error message was "fatal: Unable to read current working directory: No such file or directory". Present change fixes this issue as discussed in git-for-windows#2480 Signed-off-by: Bjoern Mueller <bjoernm@gmx.de>
Update clink.pl to link with either libcurl.lib or libcurl-d.lib depending on whether DEBUG=1 is set. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
There is a Win32 API function to resolve symbolic links, and we can use that instead of resolving them manually. Even better, this function also resolves NTFS junction points (which are somewhat similar to bind mounts). This fixes git-for-windows#2481. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The native Windows HTTPS backend is based on Secure Channel which lets the caller decide how to handle revocation checking problems caused by missing information in the certificate or offline CRL distribution points. Unfortunately, cURL chose to handle these problems differently than OpenSSL by default: while OpenSSL happily ignores those problems (essentially saying "¯\_(ツ)_/¯"), the Secure Channel backend will error out instead. As a remedy, the "no revoke" mode was introduced, which turns off revocation checking altogether. This is a bit heavy-handed. We support this via the `http.schannelCheckRevoke` setting. In curl/curl#4981, we contributed an opt-in "best effort" strategy that emulates what OpenSSL seems to do. In Git for Windows, we actually want this to be the default. This patch makes it so, introducing it as a new value for the `http.schannelCheckRevoke" setting, which now becmes a tristate: it accepts the values "false", "true" or "best-effort" (defaulting to the last one). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The convention in Git project's shell scripts is to have white-space _before_, but not _after_ the `>` (or `<`). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
These fixes have been sent to the Git mailing list but have not been picked up by the Git project yet. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Start work on a new 'git survey' command to scan the repository for monorepo performance and scaling problems. The goal is to measure the various known "dimensions of scale" and serve as a foundation for adding additional measurements as we learn more about Git monorepo scaling problems. The initial goal is to complement the scanning and analysis performed by the GO-based 'git-sizer' (https://github.com/github/git-sizer) tool. It is hoped that by creating a builtin command, we may be able to take advantage of internal Git data structures and code that is not accessible from GO to gain further insight into potential scaling problems. Co-authored-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.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>
By default we will scan all references in "refs/heads/", "refs/tags/" and "refs/remotes/". Add command line opts let the use ask for all refs or a subset of them and to include a detached HEAD. Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When 'git survey' provides information to the user, this will be presented in one of two formats: plaintext and JSON. The JSON implementation will be delayed until the functionality is complete for the plaintext format. The most important parts of the plaintext format are headers specifying the different sections of the report and tables providing concreted data. Create a custom table data structure that allows specifying a list of strings for the row values. When printing the table, check each column for the maximum width so we can create a table of the correct size from the start. The table structure is designed to be flexible to the different kinds of output that will be implemented in future changes. Signed-off-by: Derrick Stolee <stolee@gmail.com>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When running with BusyBox, we will want to avoid calling executables on the PATH that are implemented in BusyBox itself. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, git repositories may have extra files which need cleaned (e.g., a build directory) that may be arbitrarily deep. Suggest using `core.longPaths` if such situations are encountered. Fixes: git-for-windows#2715 Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
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>
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>
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>
At some stage, t5003-archive-zip wants to add a file that is not ASCII. To that end, it uses /bin/sh. But that file may actually not exist (it is too easy to forget that not all the world is Unix/Linux...)! Besides, we already have perfectly fine binary files intended for use solely by the tests. So let's use one of them instead. 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>
While it may seem super convenient to some old Unix hands to simpy require Perl to be available when running the test suite, this is a major hassle on Windows, where we want to verify that Perl is not, actually, required in a NO_PERL build. As a super ugly workaround, we "install" a script into /usr/bin/perl reading like this: #!/bin/sh # We'd much rather avoid requiring Perl altogether when testing # an installed Git. Oh well, that's why we cannot have nice # things. exec c:/git-sdk-64/usr/bin/perl.exe "$@" The problem with that is that BusyBox assumes that the #! line in a script refers to an executable, not to a script. So when it encounters the line #!/usr/bin/perl in t5532's proxy-get-cmd, it barfs. Let's help this situation by simply executing the Perl script with the "interpreter" specified explicitly. 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>
When t5605 tries to verify that files are hardlinked (or that they are not), it uses the `-links` option of the `find` utility. BusyBox' implementation does not support that option, and BusyBox-w32's lstat() does not even report the number of hard links correctly (for performance reasons). So let's just switch to a different method that actually works on Windows. 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>
Git for Windows uses MSYS2's Bash to run the test suite, which comes with benefits but also at a heavy price: on the plus side, MSYS2's POSIX emulation layer allows us to continue pretending that we are on a Unix system, e.g. use Unix paths instead of Windows ones, yet this is bought at a rather noticeable performance penalty. There *are* some more native ports of Unix shells out there, though, most notably BusyBox-w32's ash. These native ports do not use any POSIX emulation layer (or at most a *very* thin one, choosing to avoid features such as fork() that are expensive to emulate on Windows), and they use native Windows paths (usually with forward slashes instead of backslashes, which is perfectly legal in almost all use cases). And here comes the problem: with a $PWD looking like, say, C:/git-sdk-64/usr/src/git/t/trash directory.t5813-proto-disable-ssh Git's test scripts get quite a bit confused, as their assumptions have been shattered. Not only does this path contain a colon (oh no!), it also does not start with a slash. This is a problem e.g. when constructing a URL as t5813 does it: ssh://remote$PWD. Not only is it impossible to separate the "host" from the path with a $PWD as above, even prefixing $PWD by a slash won't work, as /C:/git-sdk-64/... is not a valid path. As a workaround, detect when $PWD does not start with a slash on Windows, and simply strip the drive prefix, using an obscure feature of Windows paths: if an absolute Windows path starts with a slash, it is implicitly prefixed by the drive prefix of the current directory. As we are talking about the current directory here, anyway, that strategy works. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
On Windows, the current working directory is pretty much guaranteed to contain a colon. If we feed that path to CVS, it mistakes it for a separator between host and port, though. This has not been a problem so far because Git for Windows uses MSYS2's Bash using a POSIX emulation layer that also pretends that the current directory is a Unix path (at least as long as we're in a shell script). However, that is rather limiting, as Git for Windows also explores other ports of other Unix shells. One of those is BusyBox-w32's ash, which is a native port (i.e. *not* using any POSIX emulation layer, and certainly not emulating Unix paths). So let's just detect if there is a colon in $PWD and punt in that case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…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>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is hidden in v2.55.0-rc0's own CI because of an omission in 5ba8291 (ci: enable EXPENSIVE for contributor builds, 2026-05-11) which fails to enable EXPENSIVE tests for tags. Due to 7d78d5f (ci: skip GitHub workflow runs for already-tested commits/trees, 2020-10-08), the CI of `master` is now also mistakenly green because it reuses the tag's CI run to prove that it's solid. This is an evil merge by necessity because `survey.c` needs to adapt to the changed function signatures. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. 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: next
From: 7c13083021 (ci: only run the expensive tests in the Windows tests for now, 2026-06-12) (f93873a027..7c13083021)
Resolved: 916bb18 (Merge 'objects-larger-than-4gb-on-windows-pt2', 2026-06-12)
removed code that upstream already moved to odb/source-loose.c (read_object_info_from_path, odb_source_loose_new/free, streaming functions)
Range-diff
1: 916bb18 ! 1: 18b5e59 Merge 'objects-larger-than-4gb-on-windows-pt2'
@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> - ## builtin/survey.c ## -@@ builtin/survey.c: static void survey_phase_refs(struct survey_context *ctx) - - ctx->report.refs.refs_nr = ctx->ref_array.nr; - for (int i = 0; i < ctx->ref_array.nr; i++) { -- unsigned long size; -+ size_t size; - struct ref_array_item *item = ctx->ref_array.items[i]; - - switch (item->kind) { -@@ builtin/survey.c: static void increment_totals(struct survey_context *ctx, - for (size_t i = 0; i < oids->nr; i++) { - struct object_info oi = OBJECT_INFO_INIT; - unsigned oi_flags = OBJECT_INFO_FOR_PREFETCH; -- unsigned long object_length = 0; -+ size_t object_length = 0; - off_t disk_sizep = 0; - enum object_type type; - - ## object-file.c ## remerge CONFLICT (content): Merge conflict in object-file.c - index 43827d1237..afab23eda0 100644 + index 1f2e29d329..6453b1d6fa 100644 --- object-file.c +++ object-file.c @@ object-file.c: int parse_loose_header(const char *hdr, struct object_info *oi) return 0; } --<<<<<<< 08500dd7c4 (Merge 'readme' into HEAD) +-<<<<<<< 6b3cb761e1 (Merge 'readme' into HEAD) -======= -static int read_object_info_from_path(struct odb_source *source, - const char *path, @@ object-file.c: struct odb_transaction *odb_transaction_files_begin(struct odb_so return &transaction->base; } --<<<<<<< 08500dd7c4 (Merge 'readme' into HEAD) +-<<<<<<< 6b3cb761e1 (Merge 'readme' into HEAD) -======= - -struct odb_source_loose *odb_source_loose_new(struct odb_source *source) @@ object-file.c: struct odb_transaction *odb_transaction_files_begin(struct odb_so - return -1; -} ->>>>>>> f3aeae983a (odb: use size_t for object_info.sizep and the size APIs) - - ## odb/source-loose.c ## -@@ odb/source-loose.c: static int read_object_info_from_path(struct odb_source_loose *loose, - void *map = NULL; - git_zstream stream, *stream_to_end = NULL; - char hdr[MAX_HEADER_LEN]; -- unsigned long size_scratch; -+ size_t size_scratch; - enum object_type type_scratch; - struct stat st; - -@@ odb/source-loose.c: static int odb_source_loose_read_object_stream(struct odb_read_stream **out, - struct object_info oi = OBJECT_INFO_INIT; - struct odb_loose_read_stream *st; - unsigned long mapsize; -- unsigned long size_ul; - void *mapped; - - mapped = odb_source_loose_map_object(loose, oid, &mapsize); -@@ odb/source-loose.c: static int odb_source_loose_read_object_stream(struct odb_read_stream **out, - * Note: loose objects >4GB would still truncate here, but such - * large loose objects are uncommon (they'd normally be packed). - */ -- oi.sizep = &size_ul; -+ oi.sizep = &st->base.size; - oi.typep = &st->base.type; - - if (parse_loose_header(st->hdr, &oi) < 0 || st->base.type < 0) - goto error; -- st->base.size = size_ul; - - st->mapped = mapped; - st->mapsize = mapsize;To: 6f86cac591 (ci: only run the expensive tests in the Windows tests for now, 2026-06-12) (b9c09592d0..6f86cac591)
Statistics
Range-diff (click to expand)
1: 197b5c5 = 1: cf48271 ci(dockerized): reduce the PID limit for private repositories
2: 9c7fd19 = 2: 8a6dfbe mingw: skip symlink type auto-detection for network share targets
3: f3f7c0c = 3: 1b16185 Merge branch 'fix-ci'
4: b0b5806 = 4: ebe32e2 unix-socket: avoid leak when initialization fails
5: 469cd99 = 5: 5c65ed1 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: a63ec78 = 6: 2c605a1 grep: prevent
^$false match at end of file7: f264253 = 7: 881df0c Merge branch 'v2.53.0.windows.3'
8: 5aad512 = 8: a11fedd Merge branch 'fixes-from-the-git-mailing-list'
9: 6e8a676 = 9: 672ee92 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
10: 09e4055 = 10: 94548d9 vcpkg_install: detect lack of Git
11: 88416ec = 11: b443cc5 vcpkg_install: add comment regarding slow network connections
12: 407ba04 = 12: 8161662 vcbuild: install ARM64 dependencies when building ARM64 binaries
14: 4a9ac00 = 13: 66bb502 vcbuild: add an option to install individual 'features'
18: 3abacca = 14: f6aaca2 cmake: allow building for Windows/ARM64
23: 0a50e45 = 15: 6b2d5cf ci(vs-build) also build Windows/ARM64 artifacts
51: 42f7fe7 = 16: 0e39459 Add schannel to curl installation
52: 062b6c4 = 17: 1ec26bb hash-object: demonstrate a >4GB/LLP64 problem
54: e96e64a = 18: 0830059 cmake(): allow setting HOST_CPU for cross-compilation
55: a2f31f0 ! 19: 2afe563 object-file.c: use size_t for header lengths
13: d6315c3 = 20: d133247 t9350: point out that refs are not updated correctly
58: 531a16b = 21: 23d0580 CMake: default Visual Studio generator has changed
59: b31b06f = 22: 8d94c2c hash algorithms: use size_t for section lengths
15: 225a426 = 23: 0a7c045 transport-helper: add trailing --
16: ae2a0e3 = 24: 9a1608d mingw: demonstrate a
git addissue with NTFS junctions62: cf88439 = 25: faf3b35 .gitignore: add Visual Studio CMakeSetting.json file
63: 183eb30 = 26: fb4cb3a hash-object --stdin: verify that it works with >4GB/LLP64
17: bcb7ef9 = 27: eae309a t5505/t5516: allow running without
.git/branches/in the templates19: dfd746d = 28: ce64d5e remote-helper: check helper status after import/export
20: 3de8c0c = 29: e34a2ca strbuf_realpath(): use platform-dependent API if available
24: c3b7cc0 = 30: 08a2b4e http: use new "best effort" strategy for Secure Channel revoke checking
66: 02ef72d = 31: 772cce8 subtree: update
contrib/subtreetesttarget67: 4a7dc2d = 32: 01f75a3 CMakeLists: add default "x64-windows" arch for Visual Studio
68: e257953 = 33: aa48e31 hash-object: add another >4GB/LLP64 test case
69: 4b593aa = 34: 68409c6 setup: properly use "%(prefix)/" when in WSL
21: 6c57072 = 35: 82f2a38 mingw: include the Python parts in the build
22: 127bf26 = 36: d0f75a9 t5505/t5516: fix white-space around redirectors
70: 51d3b65 = 37: 8b6f04b Add config option
windows.appendAtomically25: b371fc6 = 38: 54616be Always auto-gc after calling a fast-import transport
26: 4607a47 = 39: 60d4ff5 mingw: prevent regressions with "drive-less" absolute paths
27: 2d50abd = 40: 090c398 transport: optionally disable side-band-64k
28: af7bb90 = 41: c6e45de mingw: fix fatal error working on mapped network drives on Windows
29: 43cb5ed = 42: 174a23c clink.pl: fix MSVC compile script to handle libcurl-d.lib
30: f48145b = 43: 6cf2cfd mingw: implement a platform-specific
strbuf_realpath()31: 56546c2 = 44: 24da4bd t3701: verify that we can add lots of files interactively
32: 17b3639 = 45: 5a69c8b commit: accept "scissors" with CR/LF line endings
33: bb0e4db = 46: f33c13f t0014: fix indentation
34: 64894a7 = 47: 9e996b9 git-gui: accommodate for intent-to-add files
74: 7a6fec3 = 48: 0d382fd mingw: allow for longer paths in
parse_interpreter()75: f4163f4 = 49: 301c018 compat/vcbuild: document preferred way to build in Visual Studio
76: 9e017dd = 50: b9ff559 http: optionally send SSL client certificate
77: 568af0c = 51: 958c976 ci: run
contrib/subtreetests in CI builds78: c805a50 = 52: 67a7577 CMake: show Win32 and Generator_platform build-option values
79: 8476a6c = 53: cdac423 hash-object: add a >4GB/LLP64 test case using filtered input
80: c6ff088 = 54: b239ce6 compat/mingw.c: do not warn when failing to get owner
81: 3761457 = 55: 7f6a52b mingw: $env:TERM="xterm-256color" for newer OSes
82: c15bbf3 = 56: 870ebf1 winansi: check result and Buffer before using Name
35: 38ef829 = 57: 4f0b671 windows: skip linking
git-<command>for built-ins36: 807cb5c = 58: e9ae852 mingw: stop hard-coding
CC = gcc37: d6e2056 = 59: 2039237 mingw: drop the -D_USE_32BIT_TIME_T option
38: c82eace = 60: de8c42d mingw: only use -Wl,--large-address-aware for 32-bit builds
39: 55c3f63 = 61: c2d7170 mingw: avoid over-specifying
--pic-executable40: ba06a90 = 62: 816b583 mingw: set the prefix and HOST_CPU as per MSYS2's settings
41: 473176c = 63: cb31f67 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
42: a665f02 = 64: 812ea64 mingw: rely on MSYS2's metadata instead of hard-coding it
43: 01c5f40 = 65: e19ada6 mingw: always define
ETC_*for MSYS2 environments44: 71239e0 = 66: 9a65596 max_tree_depth: lower it for clang builds in general on Windows
45: 5afba9a = 67: c3c8478 mingw: ensure valid CTYPE
46: 94b982d = 68: 5e9a131 mingw: allow
git.exeto be used instead of the "Git wrapper"73: bc3fbcc = 69: 0153ca1 revision: create mark_trees_uninteresting_dense()
47: e401b0c = 70: 1160e5d mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
96: fddbfa2 = 71: b18ee3d survey: stub in new experimental 'git-survey' command
48: 63148b2 = 72: ade82f3 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
97: 4214bf7 = 73: b813d62 survey: add command line opts to select references
49: 2cf2d42 = 74: 2334e9d clink.pl: fix libexpatd.lib link error when using MSVC
100: 5fcdae8 = 75: 3645fee survey: start pretty printing data in table form
50: c9f6a1d = 76: 70b20c4 Makefile: clean up .ilk files when MSVC=1
103: c2c018b = 77: 00c2277 survey: add object count summary
53: 970f84f = 78: 0a54c07 vcbuild: add support for compiling Windows resource files
106: 8db9bf7 = 79: 51c81ec survey: summarize total sizes by object type
56: 5bdff06 = 80: fc411c8 config.mak.uname: add git.rc to MSVC builds
57: 4145329 = 81: f477505 MinGW: link as terminal server aware
109: fdeade5 = 82: b5f6e7d survey: show progress during object walk
110: 75afa90 = 83: 734e003 mingw: make sure
errnois set correctly when socket operations fail60: 5b08ae5 = 84: c46476c clink.pl: ignore no-stack-protector arg on MSVC=1 builds
61: b7a4148 = 85: 5749aa4 http: optionally load libcurl lazily
115: b55a96d = 86: 9ba1d8a survey: add ability to track prioritized lists
116: 365b218 = 87: fdddadb compat/mingw: handle WSA errors in strerror
64: beebd34 = 88: 2cd74d7 clink.pl: move default linker options for MSVC=1 builds
65: 9cac23b = 89: 2473c6f http: support lazy-loading libcurl also on Windows
121: f24af16 = 90: 9af2e19 survey: add report of "largest" paths
122: c1220d0 = 91: 7d8fe12 compat/mingw: drop outdated comment
111: dbfc648 ! 92: 4e1b688 t5563: verify that NTLM authentication works
71: 74a62c1 = 93: f9150d4 cmake: install headless-git.
72: af8f7c3 = 94: 1d6da86 http: when loading libcurl lazily, allow for multiple SSL backends
127: 5faf564 = 95: cdc5313 survey: add --top= option and config
128: 506102c = 96: acd2281 t0301: actually test credential-cache on Windows
117: cd2257f = 97: 8c31d63 http: disallow NTLM authentication by default
83: da341a1 = 98: 49238b4 mingw: change core.fsyncObjectFiles = 1 by default
84: a0fed3b = 99: a18bd67 Fix Windows version resources
85: 083aa17 = 100: 0790e05 status: fix for old-style submodules with commondir
86: fc1d851 = 101: 5f6b8f7 git.rc: include winuser.h
87: 141bc3c = 102: 950636e mingw: do load libcurl dynamically by default
88: 7f4e870 = 103: 9302830 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
89: bcad148 = 104: cf7c412 mingw: suggest
windows.appendAtomicallyin more cases90: ada7acb = 105: c350e5e win32: use native ANSI sequence processing, if possible
91: 8d3b69f = 106: 35e2c55 common-main.c: fflush stdout buffer upon exit
92: 3900040 = 107: 2dbca03 t5601/t7406(mingw): do run tests with symlink support
93: f2367d2 = 108: 5375a47 win32: ensure that
localtime_r()is declared even in i686 builds94: 3304c43 = 109: a12a742 Fallback to AppData if XDG_CONFIG_HOME is unset
95: 77323d1 = 110: 39430fe run-command: be helpful with Git LFS fails on Windows 7
133: d9dd92d = 111: 3990077 survey: clearly note the experimental nature in the output
134: d83b233 = 112: 41c0935 credential-cache: handle ECONNREFUSED gracefully
135: 38d0024 = 113: 560a827 reftable: do make sure to use custom allocators
136: 9632ef8 = 114: 02f0d05 check-whitespace: avoid alerts about upstream commits
137: 4499264 = 115: ec56596 t/t5571-prep-push-hook.sh: Add test with writing to stderr
99: ea6c819 = 116: 7ced1ad Merge 'remote-hg-prerequisites' into HEAD
102: 59d5962 = 117: 965cc02 Merge branch 'drive-prefix'
105: a3aa3e7 = 118: 719ccc4 Merge branch 'msys2-python'
108: e5c056f = 119: a451826 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
114: 39ba783 = 120: 4388d59 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
98: e2a9901 = 121: e816cd5 mingw: Support
git_terminal_promptwith more terminals120: 351eb4d = 122: 52a284b Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
101: 0074c75 = 123: 2660fde compat/terminal.c: only use the Windows console if bash 'read -r' fails
126: 5e7e178 = 124: 9ac3329 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction104: e3e7485 = 125: 70c8e96 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
132: 81b8c39 = 126: 910ae04 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
107: 43eacd2 = 127: 9a3106f Win32: symlink: move phantom symlink creation to a separate function
146: 9887a47 = 128: a744447 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
112: 4492c09 = 129: 7a194c8 mingw: introduce code to detect whether we're inside a Windows container
113: e93e924 = 130: e5eeca1 Introduce helper to create symlinks that knows about index_state
147: 1380c93 = 131: 7adfca6 Merge 'add-p-many-files'
118: ecf8519 = 132: 025e3a5 mingw: when running in a Windows container, try to rename() harder
119: 8fd4327 = 133: cec2ca5 mingw: allow to specify the symlink type in .gitattributes
148: 14e9cdf = 134: f1fcea5 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
123: c6be215 = 135: e147e2a http: warn if might have failed because of NTLM
124: ddf079b = 136: 2ce0cee mingw: move the file_attr_to_st_mode() function definition
125: 14ff63a = 137: 09df7b7 Win32: symlink: add test for
symlinkattribute149: 36cb56d = 138: 60c4ec6 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
129: 3014587 = 139: 44b7fd1 credential: advertise NTLM suppression and allow helpers to re-enable
130: 0b957b3 = 140: 64e8450 mingw: Windows Docker volumes are not symbolic links
131: 940416e = 141: 2c7ad6a clean: do not traverse mount points
150: 9ed52e1 = 142: 4c04189 Merge 'git-gui/js/intent-to-add'
138: 923565a = 143: 5a0c18e dir: do not traverse mount points
139: 4154272 = 144: 224d76b win32: thread-utils: handle multi-socket systems
140: d9a448f = 145: 7ef1b03 t5563: add tests for http.emptyAuth with Negotiate
141: f79eac7 = 146: 657a26d entry: flush fscache after creating directories and writing files
142: eda54da = 147: 7441dea ci(macos): skip the
git p4tests143: ed7656d = 148: 5f491f6 mingw: work around rename() failing on a read-only file
144: 3356722 = 149: e6ac22b clean: remove mount points when possible
145: c4eb127 = 150: 827024c mingw: optionally enable wsl compability file mode bits
151: 8ba5404 = 151: 7cfa262 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
152: db93b49 = 152: a1b1fe2 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
153: 85e3fc5 = 153: 641c89e Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
154: 76aed68 = 154: 5ef769f Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path155: 5fa4dbe = 155: d14b095 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
156: bf65f72 = 156: dd14658 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
157: 5a4ae26 = 157: 5f7c2f7 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests158: 7e490f6 = 158: 5ab41ea Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
159: 6998458 = 159: 151d17c Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t160: 0d71b48 = 160: 0840a8f Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory161: de8b10a = 161: 8fcfdb5 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
162: 193a064 = 162: c8cd55d Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
163: 33a2beb = 163: 4fd09c4 Merge branch 'optionally-dont-append-atomically-on-windows'
164: 6813fcf = 164: f66033e Merge branch 'fsync-object-files-always'
165: ed7a9e6 = 165: 2d3f5cb Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
166: 126b3fa = 166: 3481377 Fix Windows version resources (Fix Windows version resources git#4092)
167: 506ef74 = 167: eac14fe Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
168: c25a292 = 168: 34975d1 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)169: a79e76b = 169: 254bf1e Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)170: e96605d = 170: 501c318 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283171: 9610e08 = 171: a8a2724 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
172: 15861bd = 172: 9ff9565 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
173: 1fce33b = 173: 44b2ac7 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
174: 630b990 = 174: 525c67f Merge branch 'nano-server'
175: bbf5e85 = 175: 8742742 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
176: 033724d = 176: f609f54 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
177: 15402b8 = 177: b582969 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
178: 9a354c5 = 178: 2a90642 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
179: 5ae2fbf = 179: 3aae9bc Merge branch 'Fix-i686-build-with-GCC-v14'
180: f9939ff = 180: 2efaa36 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
181: 9679de0 = 181: 6eddd4e Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
182: 8ac8736 = 182: 14c2fa0 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
183: 11c71cb = 183: 0010a7a Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
184: 6f8aba9 = 184: dc4b980 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
185: 98b19b5 = 185: f1908f1 Merge branch 'reftable-vs-custom-allocators'
186: e153f23 = 186: eba7c29 Merge branch 'check-whitespace-only-downstream'
187: ec9b96a = 187: dbb4e73 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)
188: 5f2136c = 188: 74a4b87 Merge branch 'disallow-ntlm-auth-by-default'
189: d4bd8f8 = 189: c140853 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)190: 9760e51 = 190: 37381f4 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
191: ab9ff68 = 191: 993da32 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
192: dda54d9 = 192: 7f759dc entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
193: ff59f29 = 193: 4f266bb ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)194: f424269 = 194: e424a05 Merge branch 'msys2'
195: 77e8a0e = 195: cee373b Merge 'docker-volumes-are-no-symlinks'
196: e9f7fd1 = 196: 4030638 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
197: e2b7bfc = 197: 0d171fa Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
198: c3ae8d6 = 198: 7f2914c Merge branch 'dont-clean-junctions'
199: 5e9a8f5 = 199: a2e06b1 Merge branch 'wsl-file-mode-bits'
200: e1a8dfc = 200: 02e34bd Merge branch 'ready-for-upstream'
208: 7c51318 = 201: 418e3b9 git-gui--askyesno: fix funny text wrapping
210: e7104f5 = 202: 250b9a5 git-gui--askyesno (mingw): use Git for Windows' icon, if available
201: 3820980 = 203: eb40da5 Win32: make FILETIME conversion functions public
202: 62f6f01 = 204: 78260d5 Win32: dirent.c: Move opendir down
203: e0fcddc = 205: abadefa mingw: make the dirent implementation pluggable
204: 4ba257d = 206: 131b9c0 Win32: make the lstat implementation pluggable
205: 5469f66 = 207: 93dd522 mingw: add infrastructure for read-only file system level caches
206: 29e2f36 ! 208: f46721e mingw: add a cache below mingw's lstat and dirent implementations
207: c79e631 = 209: f11326b fscache: load directories only once
209: fae96bc = 210: b64fa0d fscache: add key for GIT_TRACE_FSCACHE
211: 3fe3fd4 = 211: 4679dd6 fscache: remember not-found directories
212: d36897e = 212: e698315 fscache: add a test for the dir-not-found optimization
213: f5186be = 213: da88158 add: use preload-index and fscache for performance
214: c0f88ea ! 214: 763c863 dir.c: make add_excludes aware of fscache during status
215: c787b0e ! 215: 4995544 fscache: make fscache_enabled() public
216: 4a3939a = 216: eb4a597 dir.c: regression fix for add_excludes with fscache
217: d28a2ba = 217: 7ffbfb2 fetch-pack.c: enable fscache for stats under .git/objects
218: 68fdfba ! 218: f1127a6 checkout.c: enable fscache for checkout again
219: e3c0217 = 219: 83fbdad Enable the filesystem cache (fscache) in refresh_index().
220: 9eea6b3 = 220: 84b9f26 fscache: use FindFirstFileExW to avoid retrieving the short name
221: 1367356 = 221: 81aca6f fscache: add GIT_TEST_FSCACHE support
222: 294f56a = 222: 30c92ff fscache: add fscache hit statistics
223: 8071a9b = 223: 9c254d1 unpack-trees: enable fscache for sparse-checkout
224: 78225f9 = 224: 0b81000 status: disable and free fscache at the end of the status command
225: c8d0e59 = 225: 244e433 mem_pool: add GIT_TRACE_MEMPOOL support
226: c9f42ec ! 226: d3e4050 fscache: fscache takes an initial size
227: b15f557 ! 227: b5f8bb4 fscache: update fscache to be thread specific instead of global
228: b4fc308 = 228: 976557f fscache: teach fscache to use mempool
229: 14bfb59 = 229: 0c3e642 fscache: make fscache_enable() thread safe
230: 4745116 = 230: ca5f376 fscache: teach fscache to use NtQueryDirectoryFile
231: 6e11021 = 231: add8ed2 fscache: remember the reparse tag for each entry
232: 70bed86 = 232: 9526911 fscache: Windows Docker volumes are not symbolic links
233: 2b1e241 = 233: a69a862 fscache: optionally enable wsl compability file mode bits
234: 7169e30 = 234: c71c1f1 Merge branch 'fscache'
235: c83973c = 235: bd42506 fscache: implement an FSCache-aware is_mount_point()
236: 99633f0 = 236: c86e789 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
237: c228b54 = 237: 5b4563b clean: make use of FSCache
238: 6b818f7 = 238: 6126227 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
239: 0a16464 = 239: 90fff42 Merge branch 'dont-clean-junctions-fscache'
240: 26ef163 = 240: 27bee76 pack-objects (mingw): demonstrate a segmentation fault with large deltas
241: d6d3fd7 = 241: f575763 mingw: support long paths
242: f144e87 = 242: f9e00e2 win32(long path support): leave drive-less absolute paths intact
243: 9631271 = 243: 78129ba compat/fsmonitor/fsm-*-win32: support long paths
244: 99dc172 = 244: a7cb011 clean: suggest using
core.longPathsif paths are too long to remove245: f3ac867 = 245: dad1809 mingw: explicitly specify with which cmd to prefix the cmdline
246: eaa420c = 246: 6c68c34 mingw: when path_lookup() failed, try BusyBox
247: 8642cd8 = 247: e60752c test-tool: learn to act as a drop-in replacement for
iconv248: 8434265 = 248: 8947140 tests(mingw): if
iconvis unavailable, usetest-helper --iconv249: 946446c = 249: ea844ef gitattributes: mark .png files as binary
250: 58afb80 = 250: b5a6724 tests: move test PNGs into t/lib-diff/
251: 38034e6 = 251: 7dbf583 tests: only override sort & find if there are usable ones in /usr/bin/
252: 5763869 = 252: f58406c tests: use the correct path separator with BusyBox
253: c280da3 = 253: 4149d08 mingw: only use Bash-ism
builtin pwd -Wwhen available254: 2fbeb8e = 254: a1cb336 tests (mingw): remove Bash-specific pwd option
255: affb3b0 = 255: b99375d test-lib: add BUSYBOX prerequisite
256: 5db9220 = 256: 2836535 t5003: use binary file from t/lib-diff/
257: 2474b74 = 257: 14703f4 t5532: workaround for BusyBox on Windows
258: 7c47481 = 258: 0bde9e2 t5605: special-case hardlink test for BusyBox-w32
259: 827fd93 = 259: 34d9d52 t5813: allow for $PWD to be a Windows path
260: 820ef6e = 260: d8584ad t9200: skip tests when $PWD contains a colon
264: 0ec65ce = 261: e96dfbe Describe Git for Windows' architecture
265: 7a801e5 = 262: 6ac8cca Add an AGENTS.md file to help with AI-assisted debugging/development
267: 1c44db9 = 263: 822ac13 Modify the Code of Conduct for Git for Windows
269: 1e54dd0 = 264: daac01f CONTRIBUTING.md: add guide for first-time contributors
271: 2086b9b = 265: 2504acf README.md: Add a Windows-specific preamble
273: bcd99ff = 266: 1940fac Add an issue template
274: c77a5ef = 267: 512a7d3 Add a GitHub workflow to monitor component updates
276: c7cc402 = 268: 6130c8f Modify the GitHub Pull Request template (to reflect Git for Windows)
266: ba036b8 = 269: 73fab28 Merge branch 'gitk-and-git-gui-patches'
261: b853c10 = 270: c76c4b9 Partially un-revert "editor: save and reset terminal after calling EDITOR"
262: 18b1f21 = 271: 014e6bb reset: reinstate support for the deprecated --stdin option
263: be25e1a = 272: 6af66d0 fsmonitor: reintroduce core.useBuiltinFSMonitor
277: ec53b9a = 273: 0c1c46c dependabot: help keeping GitHub Actions versions up to date
279: aaf33d1 = 274: f2e2001 SECURITY.md: document Git for Windows' policies
268: ed62a12 = 275: a58cf5c Merge branch 'long-paths'
270: 76cb391 = 276: 4d167a9 Merge branch 'busybox-w32'
272: 84ed9f1 = 277: 6a4f441 Merge branch 'un-revert-editor-save-and-reset'
275: 90c88c5 = 278: 0a5cd6b Merge branch 'phase-out-reset-stdin'
278: 25c17b6 = 279: 657d7b7 Merge branch 'deprecate-core.useBuiltinFSMonitor'
280: d886dbc = 280: 4b2606e Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
281: 7275030 = 281: 6b3cb76 Merge 'readme' into HEAD
-: ---------- > 282: 18b5e59 Merge 'objects-larger-than-4gb-on-windows-pt2'
-: ---------- > 283: 6f86cac ci: only run the expensive tests in the Windows tests for now