Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#27423262167)#230
Open
gitforwindowshelper[bot] wants to merge 283 commits into
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#27423262167)#230gitforwindowshelper[bot] wants to merge 283 commits into
gitforwindowshelper[bot] wants to merge 283 commits into
Conversation
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>
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>
This is no longer true in general, not with supporting Clang out of the box. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib` rather than `libexpat.lib`. It appears that the `vcpkg` package for "libexpat" has changed and now creates `libexpatd.lib` for debug mode builds. Previously, both debug and release builds created a ".lib" with the same basename. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
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>
In bf2d5d8 (Don't let ld strip relocations, 2016-01-16) (picked from git-for-windows@6a237925bf10), Git for Windows introduced the `-Wl,-pic-executable` flag, specifying the exact entry point via `-e`. This required discerning between i686 and x86_64 code because the former required the symbol to be prefixed with an underscore, the latter did not. As per https://sourceware.org/bugzilla/show_bug.cgi?id=10865, the specified symbols are already the default, though. So let's drop the overly-specific definition. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
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>
MSYS2 already defines a couple of helpful environment variables, and we can use those to infer the installation location as well as the CPU. No need for hard-coding ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Create a wrapper for the Windows Resource Compiler (RC.EXE) for use by the MSVC=1 builds. This is similar to the CL.EXE and LIB.EXE wrappers used for the MSVC=1 builds. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
At the moment, nothing is obvious about the reason for the use of the
path-walk API, but this will become more prevelant in future iterations. For
now, use the path-walk API to sum up the counts of each kind of object.
For example, this is the reachable object summary output for my local repo:
REACHABLE OBJECT SUMMARY
========================
Object Type | Count
------------+-------
Tags | 1343
Commits | 179344
Trees | 314350
Blobs | 184030
Signed-off-by: Derrick Stolee <stolee@gmail.com>
The tell-tale is the presence of the `MSYSTEM` value while compiling, of course. In that case, we want to ensure that `MSYSTEM` is set when running `git.exe`, and also enable the magic MSYS2 tty detection. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The Git for Windows project has grown quite complex over the years, certainly much more complex than during the first years where the `msysgit.git` repository was abusing Git for package management purposes and the `git/git` fork was called `4msysgit.git`. Let's describe the status quo in a thorough way. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The -W option is only understood by MSYS2 Bash's pwd command. We already make sure to override `pwd` by `builtin pwd -W` for MINGW, so let's not double the effort here. This will also help when switching the shell to another one (such as BusyBox' ash) whose pwd does *not* understand the -W option. 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>
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>
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>
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>
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>
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: seen
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)
dropped duplicate loose-object functions from object-file.c that already exist in odb/source-loose.c after upstream refactoring
Range-diff
1: 916bb18 ! 1: 127eda8 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 1c1ecac7a5..07f019a0f6 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) +-<<<<<<< 96b7a696eb (Merge 'readme' into HEAD) -======= -static int read_object_info_from_path(struct odb_source *source, - const char *path, @@ object-file.c: int parse_loose_header(const char *hdr, struct object_info *oi) static void hash_object_body(const struct git_hash_algo *algo, struct git_hash_ctx *c, const void *buf, size_t len, struct object_id *oid, -@@ object-file.c: struct odb_transaction *odb_transaction_files_begin(struct odb_source *source) - - return &transaction->base; - } --<<<<<<< 08500dd7c4 (Merge 'readme' into HEAD) +@@ object-file.c: void free_object_info_contents(struct object_info *object_info) + { + if (!object_info) + return; +-<<<<<<< 96b7a696eb (Merge 'readme' into HEAD) + free(object_info->typep); + free(object_info->sizep); + free(object_info->disk_sizep); + free(object_info->delta_base_oid); -======= -- --struct odb_source_loose *odb_source_loose_new(struct odb_source *source) --{ -- struct odb_source_loose *loose; -- CALLOC_ARRAY(loose, 1); -- loose->source = source; -- return loose; --} -- --void odb_source_loose_free(struct odb_source_loose *loose) --{ -- if (!loose) -- return; - odb_source_loose_clear_cache(loose); - loose_object_map_clear(&loose->map); - free(loose); @@ object-file.c: struct odb_transaction *odb_transaction_files_begin(struct odb_so - munmap(mapped, mapsize); - free(st); - 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: 73ae616066 (ci: only run the expensive tests in the Windows tests for now, 2026-06-12) (357600b98f..73ae616066)
Statistics
Range-diff (click to expand)
1: 11ee1c0 = 1: a51f625 ci(dockerized): reduce the PID limit for private repositories
2: f265e48 = 2: 787bb22 mingw: skip symlink type auto-detection for network share targets
3: 55dfb74 = 3: 762827d Merge branch 'fix-ci'
4: ffbd43e = 4: 740a0e6 unix-socket: avoid leak when initialization fails
5: 84d4d40 = 5: a9d2866 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: 02febb3 = 6: 2492c8c grep: prevent
^$false match at end of file7: e35e628 = 7: 127dfd2 Merge branch 'v2.53.0.windows.3'
8: ebde94a = 8: c1cb32b Merge branch 'fixes-from-the-git-mailing-list'
9: 9b519a9 = 9: f63576d ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
10: 7de0130 = 10: 616671e vcpkg_install: detect lack of Git
11: 78e35a8 = 11: cc231be vcpkg_install: add comment regarding slow network connections
12: 2af425d = 12: 545f8c5 vcbuild: install ARM64 dependencies when building ARM64 binaries
13: f1dc312 = 13: db4c126 vcbuild: add an option to install individual 'features'
14: 9206c4d = 14: 46409d4 cmake: allow building for Windows/ARM64
15: 8f004b4 = 15: c7777f2 ci(vs-build) also build Windows/ARM64 artifacts
16: df37a2c = 16: ae4f66b Add schannel to curl installation
18: ec81a7c = 17: 6f7dac0 cmake(): allow setting HOST_CPU for cross-compilation
17: 4b23a8b = 18: 36afbdb hash-object: demonstrate a >4GB/LLP64 problem
20: a8b5a89 = 19: 0bfdf51 t9350: point out that refs are not updated correctly
21: 2586f50 = 20: b2ebf7d CMake: default Visual Studio generator has changed
19: 5d88389 ! 21: 5cabd77 object-file.c: use size_t for header lengths
23: bc5430b = 22: e4c0edd transport-helper: add trailing --
24: 9a3fca6 = 23: 346dfaf mingw: demonstrate a
git addissue with NTFS junctions25: b2b5e28 = 24: 91240f5 .gitignore: add Visual Studio CMakeSetting.json file
27: 53dad0f = 25: 1bac1e3 t5505/t5516: allow running without
.git/branches/in the templates22: e2078ec = 26: f41b375 hash algorithms: use size_t for section lengths
28: 57758e0 = 27: 93a9bd3 remote-helper: check helper status after import/export
29: 018ec9d = 28: 87153b6 strbuf_realpath(): use platform-dependent API if available
30: 64abdbc = 29: 128353b http: use new "best effort" strategy for Secure Channel revoke checking
31: d732c5a = 30: a69964b subtree: update
contrib/subtreetesttarget32: 1f1d032 = 31: 7534283 CMakeLists: add default "x64-windows" arch for Visual Studio
34: 0d37032 = 32: dc3a772 mingw: include the Python parts in the build
35: 4eb995c = 33: f20f4b2 t5505/t5516: fix white-space around redirectors
26: cf8465b = 34: d903064 hash-object --stdin: verify that it works with >4GB/LLP64
36: 9dff4df = 35: ecc861b Always auto-gc after calling a fast-import transport
37: fd790e4 = 36: 1e13697 mingw: prevent regressions with "drive-less" absolute paths
38: 3f08fef = 37: 0f04573 transport: optionally disable side-band-64k
39: 9d5fe1e = 38: 71a3470 mingw: fix fatal error working on mapped network drives on Windows
40: 358c1d1 = 39: a2c7bc9 clink.pl: fix MSVC compile script to handle libcurl-d.lib
41: 614d859 = 40: 3663a77 mingw: implement a platform-specific
strbuf_realpath()42: ca02eed = 41: 230b02a t3701: verify that we can add lots of files interactively
43: 7025124 = 42: a1683d0 commit: accept "scissors" with CR/LF line endings
44: 057ff5f = 43: 655f9c9 t0014: fix indentation
45: f0fa151 = 44: 265bdb8 git-gui: accommodate for intent-to-add files
46: ec48718 = 45: 41240f3 mingw: allow for longer paths in
parse_interpreter()47: 88889ee = 46: b620c26 compat/vcbuild: document preferred way to build in Visual Studio
48: e03d34c = 47: ddcb874 http: optionally send SSL client certificate
49: ed1172f = 48: 784b8e7 ci: run
contrib/subtreetests in CI builds50: 1599cc4 = 49: a3e2ec6 CMake: show Win32 and Generator_platform build-option values
52: 37a6bfb = 50: a8c72a0 windows: skip linking
git-<command>for built-ins53: 44620ed = 51: a4b9b08 mingw: stop hard-coding
CC = gcc54: 407cb89 = 52: 6144627 mingw: drop the -D_USE_32BIT_TIME_T option
55: a46945d = 53: d06ecf5 mingw: only use -Wl,--large-address-aware for 32-bit builds
56: edfac1c = 54: 6a63a4c mingw: avoid over-specifying
--pic-executable57: a1b41f4 = 55: 6e11237 mingw: set the prefix and HOST_CPU as per MSYS2's settings
58: 2e2bd47 = 56: 970c171 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
59: 35c41a1 = 57: cad5152 mingw: rely on MSYS2's metadata instead of hard-coding it
60: d7862c2 = 58: 9028b3f mingw: always define
ETC_*for MSYS2 environments61: 466022b = 59: d5e60c4 max_tree_depth: lower it for clang builds in general on Windows
62: 7268cc2 = 60: 6ef5af3 mingw: ensure valid CTYPE
63: 1c3e022 = 61: 27f05c6 mingw: allow
git.exeto be used instead of the "Git wrapper"65: 4a251e6 = 62: e19ed33 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
67: 646d8d5 = 63: 4cea203 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
64: cc33930 = 64: 3dc245a revision: create mark_trees_uninteresting_dense()
69: c913974 = 65: 68e2a75 clink.pl: fix libexpatd.lib link error when using MSVC
66: 8d47a7a = 66: 3bc88b4 survey: stub in new experimental 'git-survey' command
71: 0e5b76a = 67: abb086c Makefile: clean up .ilk files when MSVC=1
68: 5808d59 = 68: 304f421 survey: add command line opts to select references
73: a6960e6 = 69: 0e3e698 vcbuild: add support for compiling Windows resource files
70: 3016e5b = 70: 24ced48 survey: start pretty printing data in table form
75: caba466 = 71: 52ee345 config.mak.uname: add git.rc to MSVC builds
76: c2bd6d7 = 72: 9518b70 MinGW: link as terminal server aware
72: 4553fc6 = 73: e4e6467 survey: add object count summary
79: 8ee578d = 74: e97d987 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
80: c890324 = 75: 06c972c http: optionally load libcurl lazily
74: 5fd1ba9 = 76: b675ba9 survey: summarize total sizes by object type
83: 44f9342 = 77: 09c6a59 clink.pl: move default linker options for MSVC=1 builds
84: 3b91e61 = 78: ecc9277 http: support lazy-loading libcurl also on Windows
77: 1acbd49 = 79: 5b34140 survey: show progress during object walk
33: 13cc283 = 80: 86f3e20 hash-object: add another >4GB/LLP64 test case
87: 82675bb = 81: 57c49d9 setup: properly use "%(prefix)/" when in WSL
88: e6e209a = 82: f0c63f4 Add config option
windows.appendAtomically89: 7bdbc7e = 83: 28faed3 cmake: install headless-git.
90: dcdd350 = 84: 597afd1 http: when loading libcurl lazily, allow for multiple SSL backends
81: f78d792 = 85: 266cde5 survey: add ability to track prioritized lists
51: 1981710 = 86: b85e162 hash-object: add a >4GB/LLP64 test case using filtered input
93: f61273f = 87: ddeee75 compat/mingw.c: do not warn when failing to get owner
94: 68417a0 = 88: f9e4196 mingw: $env:TERM="xterm-256color" for newer OSes
95: b2871b1 = 89: bb3d9df winansi: check result and Buffer before using Name
96: c282014 = 90: 537f31c mingw: change core.fsyncObjectFiles = 1 by default
97: 4e5a990 = 91: 9444e71 Fix Windows version resources
98: 2f684d1 = 92: 58867c2 status: fix for old-style submodules with commondir
99: f0920a8 = 93: efeb703 git.rc: include winuser.h
100: eeebdae = 94: 24688b6 mingw: do load libcurl dynamically by default
101: 60643d9 = 95: abb36a7 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
102: 501dd1c = 96: 5855b26 mingw: suggest
windows.appendAtomicallyin more cases103: 04b4ec9 = 97: fb05675 win32: use native ANSI sequence processing, if possible
104: f7893ad = 98: ca29f55 common-main.c: fflush stdout buffer upon exit
105: 95c7f2a = 99: d5519ae t5601/t7406(mingw): do run tests with symlink support
106: c0abee6 = 100: d2a8997 win32: ensure that
localtime_r()is declared even in i686 builds107: e1365d4 = 101: 43feaf1 Fallback to AppData if XDG_CONFIG_HOME is unset
108: c40f16a = 102: 060812d run-command: be helpful with Git LFS fails on Windows 7
111: 5284a7b = 103: 52d9d8f mingw: Support
git_terminal_promptwith more terminals112: 281d6a3 = 104: f105d2a compat/terminal.c: only use the Windows console if bash 'read -r' fails
114: 7561342 = 105: d91a856 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
116: 36ffe98 = 106: 38406ef Win32: symlink: move phantom symlink creation to a separate function
78: 22ed52a = 107: 4249fa0 mingw: make sure
errnois set correctly when socket operations fail118: 51c92ea ! 108: 834644e t5563: verify that NTLM authentication works
119: 907ba1b = 109: 93f4e27 mingw: introduce code to detect whether we're inside a Windows container
120: 52d5c28 = 110: 6e89dfe Introduce helper to create symlinks that knows about index_state
82: b6daf66 = 111: 4352afb compat/mingw: handle WSA errors in strerror
122: 8e72661 = 112: 2be153a http: disallow NTLM authentication by default
123: 9579fb8 = 113: 214a4d1 mingw: when running in a Windows container, try to rename() harder
124: 7cacd80 = 114: 39d0c5f mingw: allow to specify the symlink type in .gitattributes
113: 8cd6cc6 = 115: 3e5d092 Merge 'remote-hg-prerequisites' into HEAD
85: d8ccd38 = 116: 2177a1c survey: add report of "largest" paths
86: 7eca00e = 117: a182280 compat/mingw: drop outdated comment
126: 0b5b4b1 = 118: 9773245 http: warn if might have failed because of NTLM
127: 3b088d8 = 119: 11cf0b9 mingw: move the file_attr_to_st_mode() function definition
128: b945b74 = 120: 907b67a Win32: symlink: add test for
symlinkattribute115: ad32a03 = 121: 03b074e Merge branch 'drive-prefix'
91: 744d535 = 122: 2b50c8e survey: add --top= option and config
92: 856afcc = 123: 7fdb578 t0301: actually test credential-cache on Windows
130: b2bd42d = 124: 4ca96ab credential: advertise NTLM suppression and allow helpers to re-enable
131: c7dfd6a = 125: 5e5098a mingw: Windows Docker volumes are not symbolic links
132: 89935c4 = 126: 7792192 clean: do not traverse mount points
117: 0ffee40 = 127: fac8428 Merge branch 'msys2-python'
109: 0cd14a9 = 128: 20ef6d4 survey: clearly note the experimental nature in the output
110: 69370b1 = 129: ee42816 credential-cache: handle ECONNREFUSED gracefully
134: 9cb7221 = 130: 404514c reftable: do make sure to use custom allocators
135: 88468d5 = 131: 588b88d check-whitespace: avoid alerts about upstream commits
136: fdce388 = 132: 509b27c t/t5571-prep-push-hook.sh: Add test with writing to stderr
137: 9898f64 = 133: 41aea6e dir: do not traverse mount points
138: 17c941c = 134: e998756 win32: thread-utils: handle multi-socket systems
139: 603772c = 135: c4304d4 t5563: add tests for http.emptyAuth with Negotiate
140: 6819c34 = 136: 8514145 entry: flush fscache after creating directories and writing files
141: 90daee8 = 137: 588c3ee ci(macos): skip the
git p4tests142: 437826c = 138: 3c000a9 mingw: work around rename() failing on a read-only file
143: 14ccaec = 139: f1cbcf5 clean: remove mount points when possible
144: 5349060 = 140: 5bd8801 mingw: optionally enable wsl compability file mode bits
121: 05c082a = 141: 81bfabe Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
125: 8cfccc3 = 142: b0205d0 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
129: c6a39f9 = 143: fa4ef7d Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
133: 1e3b136 = 144: 645ad9e Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction145: 4e42168 = 145: b083ef5 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
146: 1639abf = 146: 5413774 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
147: 8ca2ba0 = 147: dd0eee3 Merge 'add-p-many-files'
148: 731eb95 = 148: 404ef7c Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
149: 3923d9c = 149: 9f669e4 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
150: c977603 = 150: 704e83d Merge 'git-gui/js/intent-to-add'
151: 178b561 = 151: 9beb1e1 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
152: 82e7c9f = 152: 55afd89 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
153: a82bc14 = 153: 36588c1 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
154: 00c05dc = 154: 5ac33d8 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path155: 31c2e31 = 155: 0f4ff18 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: c6faa21 = 156: 6f4ef46 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: 8309b6f = 157: 6043718 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests158: 8241f4e = 158: 00928e9 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
159: f9b60f3 = 159: 4dfc6f9 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t160: a755fa1 = 160: ea31d95 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory161: ecaed3d = 161: 02ead0e Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
162: e02401f = 162: ce48843 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
163: 2026c80 = 163: 92ea9dd Merge branch 'optionally-dont-append-atomically-on-windows'
164: 1add244 = 164: b635818 Merge branch 'fsync-object-files-always'
165: c66ea9c = 165: 834d414 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
166: 35c7589 = 166: 4bf1be3 Fix Windows version resources (Fix Windows version resources git#4092)
167: 9b11499 = 167: 05a59cc Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
168: 5e5cd8a = 168: 4ac8211 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)169: 72a5fb6 = 169: 759c606 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)170: 262b8b7 = 170: af01c22 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283171: 32edcd3 = 171: 6009a62 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
172: 3274ed9 = 172: 169f65b ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
173: 1ff5d74 = 173: d1cca30 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: 31e35e9 = 174: f380830 Merge branch 'nano-server'
175: 34ecd6d = 175: feea141 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
176: 697c22b = 176: 6eb0414 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
177: aaa5dd9 = 177: e5917c0 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
178: 6c7916e = 178: 96f022f Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
179: a48094e = 179: cc0bf31 Merge branch 'Fix-i686-build-with-GCC-v14'
180: d3ad5a3 = 180: 0d75098 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
181: 0be0294 = 181: d163ad5 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
182: 9b2b71c = 182: b1202ac 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: 0ebb136 = 183: 7f0af7c Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
184: e38539e = 184: 1f30661 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
185: cd4b848 = 185: b0662f9 Merge branch 'reftable-vs-custom-allocators'
186: b2c8f34 = 186: 7305d1c Merge branch 'check-whitespace-only-downstream'
187: 84b4a7e = 187: d44451a 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: a216047 = 188: 3f50888 Merge branch 'disallow-ntlm-auth-by-default'
189: d6d2157 = 189: f0a4e14 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)190: 803ca01 = 190: 6b46936 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
191: 4da4cce = 191: 7afc2d5 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
192: 652fe0b = 192: 62d3b8e entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
193: e6ac195 = 193: a07be0e ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)194: 6bd6e1f = 194: f9ae72a Merge branch 'msys2'
195: 0ec8d87 = 195: 414ee7d Merge 'docker-volumes-are-no-symlinks'
196: c074518 = 196: c1c1fec mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
197: 2511369 = 197: 3a84f06 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
198: 0805b81 = 198: 8ace369 Merge branch 'dont-clean-junctions'
199: 0001f9e = 199: 5006552 Merge branch 'wsl-file-mode-bits'
200: 95308ab = 200: 4cd5215 Merge branch 'ready-for-upstream'
201: b7000e7 = 201: a757125 Win32: make FILETIME conversion functions public
202: 0cbeebd = 202: c37e8e8 Win32: dirent.c: Move opendir down
203: abbb39f = 203: 8c642ad mingw: make the dirent implementation pluggable
204: eb602f4 = 204: 1566979 Win32: make the lstat implementation pluggable
220: ea6fe6f = 205: 7f9609a git-gui--askyesno: fix funny text wrapping
205: c306c5b = 206: 7a6a1d0 mingw: add infrastructure for read-only file system level caches
222: f4b2958 = 207: 885cb24 git-gui--askyesno (mingw): use Git for Windows' icon, if available
206: 9b2008d ! 208: 3e8fcf0 mingw: add a cache below mingw's lstat and dirent implementations
207: 3d43d63 = 209: a8a12d7 fscache: load directories only once
208: 3d522bc = 210: 859d429 fscache: add key for GIT_TRACE_FSCACHE
209: a6b5344 = 211: 625048f fscache: remember not-found directories
210: 797a14d = 212: d3b6a02 fscache: add a test for the dir-not-found optimization
211: 1089815 = 213: 8de8eaf add: use preload-index and fscache for performance
212: 7ed1f27 ! 214: 2c1e68a dir.c: make add_excludes aware of fscache during status
213: ee95378 ! 215: cbccd26 fscache: make fscache_enabled() public
214: 96e5eaa = 216: 539ae74 dir.c: regression fix for add_excludes with fscache
215: dbf26e8 = 217: 8d2975f fetch-pack.c: enable fscache for stats under .git/objects
216: 28098cb ! 218: dee20cf checkout.c: enable fscache for checkout again
217: 9432d60 = 219: fd01ad2 Enable the filesystem cache (fscache) in refresh_index().
218: ad2576f = 220: 4a8f158 fscache: use FindFirstFileExW to avoid retrieving the short name
219: 6d47d2a = 221: 0116d2a fscache: add GIT_TEST_FSCACHE support
221: 745d57a = 222: f5515f7 fscache: add fscache hit statistics
223: 77626cf = 223: 7554106 unpack-trees: enable fscache for sparse-checkout
224: c006566 = 224: 0c887e5 status: disable and free fscache at the end of the status command
225: 7e23d4e = 225: b762f01 mem_pool: add GIT_TRACE_MEMPOOL support
226: ca0f9f8 ! 226: 36668b7 fscache: fscache takes an initial size
227: 8123ec7 ! 227: afdb67b fscache: update fscache to be thread specific instead of global
228: a6f5548 = 228: 254be3b fscache: teach fscache to use mempool
229: 78c5e0f = 229: 45a5f82 fscache: make fscache_enable() thread safe
230: 11a8875 = 230: b3d2650 fscache: teach fscache to use NtQueryDirectoryFile
231: 5abcdb4 = 231: 7306cc0 fscache: remember the reparse tag for each entry
232: a7ad872 = 232: 70f7527 fscache: Windows Docker volumes are not symbolic links
233: a8fb05f = 233: f2047ad fscache: optionally enable wsl compability file mode bits
234: c351d89 = 234: 35d900a Merge branch 'fscache'
235: 9a4c7d9 = 235: b7c7db9 fscache: implement an FSCache-aware is_mount_point()
236: 536baba = 236: 80a0453 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: 7151461 = 237: 3594fc8 clean: make use of FSCache
238: 43683ef = 238: 4db0e76 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
239: 45790c6 = 239: ae6b3ff Merge branch 'dont-clean-junctions-fscache'
240: fe77230 = 240: 1a0ab97 pack-objects (mingw): demonstrate a segmentation fault with large deltas
241: bb0235f = 241: f214a0c mingw: support long paths
242: 8fe0123 = 242: bfce78c win32(long path support): leave drive-less absolute paths intact
243: 95acee3 = 243: 0cba044 compat/fsmonitor/fsm-*-win32: support long paths
244: 880b62c = 244: e0cfe6c clean: suggest using
core.longPathsif paths are too long to remove245: 7d54e66 = 245: 7b1769a mingw: explicitly specify with which cmd to prefix the cmdline
246: c2d4b80 = 246: 78f57d4 mingw: when path_lookup() failed, try BusyBox
247: b5a56f6 = 247: 64a5dd8 test-tool: learn to act as a drop-in replacement for
iconv248: 5d0957a = 248: 4e5db65 tests(mingw): if
iconvis unavailable, usetest-helper --iconv249: 1ae099e = 249: bcb65e3 gitattributes: mark .png files as binary
250: 99fd7bd = 250: 4d52efb tests: move test PNGs into t/lib-diff/
251: 6cb2d41 = 251: 0c9ca3b tests: only override sort & find if there are usable ones in /usr/bin/
252: d7528f1 = 252: 6cbc71c tests: use the correct path separator with BusyBox
253: b159e6b = 253: 4ea9153 mingw: only use Bash-ism
builtin pwd -Wwhen available254: e64d6ba = 254: 00e4dd6 tests (mingw): remove Bash-specific pwd option
255: 9eb526e = 255: 54f6ede test-lib: add BUSYBOX prerequisite
256: 1742c1a = 256: 389e6fc t5003: use binary file from t/lib-diff/
257: 39de845 = 257: 71b47f4 t5532: workaround for BusyBox on Windows
258: 850573e = 258: 0e87433 t5605: special-case hardlink test for BusyBox-w32
259: 6c8a637 = 259: effa3ab t5813: allow for $PWD to be a Windows path
260: 5a6632c = 260: 1cc029c t9200: skip tests when $PWD contains a colon
261: b50d4de = 261: 7886f45 Describe Git for Windows' architecture
262: df8074c = 262: 7efc29a Add an AGENTS.md file to help with AI-assisted debugging/development
264: 2b18374 = 263: e1ae693 Modify the Code of Conduct for Git for Windows
266: 83bbd10 = 264: 1f4881b CONTRIBUTING.md: add guide for first-time contributors
269: bfba8c4 = 265: 4222345 README.md: Add a Windows-specific preamble
272: 53c1b10 = 266: dee5edc Add an issue template
273: 37af4dd = 267: bbfa7b8 Add a GitHub workflow to monitor component updates
276: bb801b4 = 268: ce38fa1 Modify the GitHub Pull Request template (to reflect Git for Windows)
267: 0d4ad2d = 269: 3f3419c Partially un-revert "editor: save and reset terminal after calling EDITOR"
270: 99b7243 = 270: 0bfd3c6 reset: reinstate support for the deprecated --stdin option
274: e22b5af = 271: 8b542f4 fsmonitor: reintroduce core.useBuiltinFSMonitor
277: fe0fe75 = 272: 78db58a dependabot: help keeping GitHub Actions versions up to date
279: 881a28d = 273: 0ea114d SECURITY.md: document Git for Windows' policies
263: 4b60ba0 = 274: 652fc0f Merge branch 'gitk-and-git-gui-patches'
265: 61c4d6d = 275: 9d8c7a9 Merge branch 'long-paths'
268: 68f1385 = 276: 0a80562 Merge branch 'busybox-w32'
271: 4a7c291 = 277: 69c0a69 Merge branch 'un-revert-editor-save-and-reset'
275: 7383bd7 = 278: b41ff9c Merge branch 'phase-out-reset-stdin'
278: cbf7903 = 279: 3e3902e Merge branch 'deprecate-core.useBuiltinFSMonitor'
280: adda21d = 280: 2bd37b8 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
281: e5d140a = 281: 96b7a69 Merge 'readme' into HEAD
-: ---------- > 282: 127eda8 Merge 'objects-larger-than-4gb-on-windows-pt2'
-: ---------- > 283: 73ae616 ci: only run the expensive tests in the Windows tests for now