Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#29699723355)#319
Open
gitforwindowshelper[bot] wants to merge 335 commits into
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#29699723355)#319gitforwindowshelper[bot] wants to merge 335 commits into
gitforwindowshelper[bot] wants to merge 335 commits into
Conversation
In Git for Windows v2.39.0, we fixed a regression where `git.exe` would no longer work in Windows Nano Server (frequently used in Docker containers). This GitHub workflow can be used to verify manually that the Git/Scalar executables work in Nano Server. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When running Git for Windows on a remote APFS filesystem, it would appear that the `mingw_open_append()`/`write()` combination would fail almost exactly like on some CIFS-mounted shares as had been reported in git-for-windows#2753, albeit with a different `errno` value. Let's handle that `errno` value just the same, by suggesting to set `windows.appendAtomically=false`. Signed-off-by: David Lomas <dl3@pale-eds.co.uk> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Windows 10 version 1511 (also known as Anniversary Update), according to https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences introduced native support for ANSI sequence processing. This allows using colors from the entire 24-bit color range. All we need to do is test whether the console's "virtual processing support" can be enabled. If it can, we do not even need to start the `console_thread` to handle ANSI sequences. Or, almost all we need to do: When `console_thread()` does its work, it uses the Unicode-aware `write_console()` function to write to the Win32 Console, which supports Git for Windows' implicit convention that all text that is written is encoded in UTF-8. The same is not necessarily true if native ANSI sequence processing is used, as the output is then subject to the current code page. Let's ensure that the code page is set to `CP_UTF8` as long as Git writes to it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
By default, the buffer type of Windows' `stdout` is unbuffered (_IONBF), and there is no need to manually fflush `stdout`. But some programs, such as the Windows Filtering Platform driver provided by the security software, may change the buffer type of `stdout` to full buffering. This nees `fflush(stdout)` to be called manually, otherwise there will be no output to `stdout`. Signed-off-by: MinarKotonoha <chengzhuo5@qq.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A long time ago, we decided to run tests in Git for Windows' SDK with the default `winsymlinks` mode: copying instead of linking. This is still the default mode of MSYS2 to this day. However, this is not how most users run Git for Windows: As the majority of Git for Windows' users seem to be on Windows 10 and newer, likely having enabled Developer Mode (which allows creating symbolic links without administrator privileges), they will run with symlink support enabled. This is the reason why it is crucial to get the fixes for CVE-2024-? to the users, and also why it is crucial to ensure that the test suite exercises the related test cases. This commit ensures the latter. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In order to be a better Windows citizenship, Git should save its configuration files on AppData folder. This can enables git configuration files be replicated between machines using the same Microsoft account logon which would reduce the friction of setting up Git on new systems. Therefore, if %APPDATA%\Git\config exists, we use it; otherwise $HOME/.config/git/config is used. Signed-off-by: Ariel Lourenco <ariellourenco@users.noreply.github.com>
Git LFS is now built with Go 1.21 which no longer supports Windows 7. However, Git for Windows still wants to support Windows 7. Ideally, Git LFS would re-introduce Windows 7 support until Git for Windows drops support for Windows 7, but that's not going to happen: git-for-windows#4996 (comment) The next best thing we can do is to let the users know what is happening, and how to get out of their fix, at least. This is not quite as easy as it would first seem because programs compiled with Go 1.21 or newer will simply throw an exception and fail with an Access Violation on Windows 7. The only way I found to address this is to replicate the logic from Go's very own `version` command (which can determine the Go version with which a given executable was built) to detect the situation, and in that case offer a helpful error message. This addresses git-for-windows#4996. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The sparse tree walk algorithm was created in d5d2e93 (revision: implement sparse algorithm, 2019-01-16) and involves using the mark_trees_uninteresting_sparse() method. This method takes a repository and an oidset of tree IDs, some of which have the UNINTERESTING flag and some of which do not. Create a method that has an equivalent set of preconditions but uses a "dense" walk (recursively visits all reachable trees, as long as they have not previously been marked UNINTERESTING). This is an important difference from mark_tree_uninteresting(), which short-circuits if the given tree has the UNINTERESTING flag. A use of this method will be added in a later change, with a condition set whether the sparse or dense approach should be used. Signed-off-by: Derrick Stolee <stolee@gmail.com>
Continue the size_t evacuation around large object handling: with deflate_it() and the locals around it widened, the cast_size_t_to_ulong() shim the prior delta_delta() widening had to leave behind in emit_binary_diff_body() goes away. deflate_it() is file-static; the only callers are the two in emit_binary_diff_body() already touched here. emit_diff_symbol() formats the resulting sizes via uintmax_t / %"PRIuMAX", so the diff output is not affected; only the per-process upper bound on a binary patch chunk that this function can address grows beyond 4 GiB on Windows. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Prep for the upcoming read_blob_data_from_index() widening, whose callers in convert.c feed the size they receive straight into these two helpers. Both are file-static, so the change is contained. Also fixes a small pre-existing narrowing on the get_wt_convert_stats_ascii() path, where strbuf.len (size_t) was passed to a unsigned long parameter. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Now that we have explored objects by count, we can expand that a bit more to summarize the data for the on-disk and inflated size of those objects. This information is helpful for diagnosing both why disk space (and perhaps clone or fetch times) is growing but also why certain operations are slow because the inflated size of the abstract objects that must be processed is so large. Note: zlib-ng is slightly more efficient even at those small sizes. Even between zlib versions, there are slight differences in compression. To accommodate for that in the tests, not the exact numbers but some rough approximations are validated (the test should validate `git survey`, after all, not zlib). Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue the size_t evacuation. read_blob_data_from_index() reads the blob through the size_t odb_read_object() API but writes the size back through an unsigned long out-parameter, silently truncating anything past 4 GiB on Windows. Widen the out-parameter, drop the cast_size_t_to_ulong() shim, and move the matching locals in the two convert.c callers and the one in attr.c. Their downstream consumers (gather_convert_stats() widened in the prior commit and read_attr_from_buf() already size_t) take the new type directly. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
The winsock2 library provides functions that work on different data types than file descriptors, therefore we wrap them. But that is not the only difference: they also do not set `errno` but expect the callers to enquire about errors via `WSAGetLastError()`. Let's translate that into appropriate `errno` values whenever the socket operations fail so that Git's code base does not have to change its expectations. This closes git-for-windows#2404 Helped-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Prep for the widenings of its callers, where size-receiving locals will become size_t (combine-diff's result_size in the immediately following commit, struct diff_filespec.size in a later topic). Body caps the parameter at 8000 anyway, so the type change is mechanical. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In future changes, we will make use of these methods. The intention is to keep track of the top contributors according to some metric. We don't want to store all of the entries and do a sort at the end, so track a constant-size table and remove rows that get pushed out depending on the chosen sorting algorithm. Co-authored-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by; Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
We map WSAGetLastError() errors to errno errors in winsock_error_to_errno(), but the MSVC strerror() implementation only produces "Unknown error" for most of them. Produce some more meaningful error messages in these cases. Our builds for ARM64 link against the newer UCRT strerror() that does know these errors, so we won't change the strerror() used there. The wording of the messages is copied from glibc strerror() messages. Reported-by: M Hickford <mirth.hickford@gmail.com> Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Although NTLM authentication is considered weak (extending even to
NTLMv2, which purportedly allows brute-forcing reasonably complex
8-character passwords in a matter of days, given ample compute
resources), it _is_ one of the authentication methods supported by
libcurl.
Note: The added test case *cannot* reuse the existing `custom_auth`
facility. The reason is that that facility is backed by an NPH script
("No Parse Headers"), which does not allow handling the 3-phase NTLM
authentication correctly (in my hands, the NPH script would not even be
called upon the Type 3 message, a "200 OK" would be returned, but no
headers, let alone the `git http-backend` output as payload). Having a
separate NTLM authentication script makes the exact workings clearer and
more readable, anyway.
Co-authored-by: Matthew John Cheetham <mjcheetham@outlook.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This will come in handy in the next commit. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Bert Belder <bertbelder@gmail.com>
Continue the size_t evacuation. With buffer_is_binary() widened in the prior commit, every consumer that the size flows into in combine-diff.c is size_t-ready, so widen grab_blob()'s out-param outright and move the matching locals at its three call sites together. grab_blob()'s body collapses to a direct odb_read_object(&size) since the bridge variable is no longer needed. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Since we are already walking our reachable objects using the path-walk API,
let's now collect lists of the paths that contribute most to different
metrics. Specifically, we care about
* Number of versions.
* Total size on disk.
* Total inflated size (no delta or zlib compression).
This information can be critical to discovering which parts of the
repository are causing the most growth, especially on-disk size. Different
packing strategies might help compress data more efficiently, but the toal
inflated size is a representation of the raw size of all snapshots of those
paths. Even when stored efficiently on disk, that size represents how much
information must be processed to complete a command such as 'git blame'.
The exact disk size seems to be not quite robust enough for testing, as
could be seen by the `linux-musl-meson` job consistently failing, possibly
because of zlib-ng deflates differently: t8100.4(git survey
(default)) was failing with a symptom like this:
TOTAL OBJECT SIZES BY TYPE
===============================================
Object Type | Count | Disk Size | Inflated Size
------------+-------+-----------+--------------
- Commits | 10 | 1523 | 2153
+ Commits | 10 | 1528 | 2153
Trees | 10 | 495 | 1706
Blobs | 10 | 191 | 101
- Tags | 4 | 510 | 528
+ Tags | 4 | 547 | 528
This means: the disk size is unlikely something we can verify robustly.
Since zlib-ng seems to increase the disk size of the tags from 528 to
547, we cannot even assume that the disk size is always smaller than the
inflated size. We will most likely want to either skip verifying the
disk size altogether, or go for some kind of fuzzy matching, say, by
replacing `s/ 1[45][0-9][0-9] / ~1.5k /` and `s/ [45][0-9][0-9] / ~½k /`
or something like that.
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This comment has been true for the longest time; The combination of the two preceding commits made it incorrect, so let's drop that comment. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NTLM authentication is relatively weak. This is the case even with the
default setting of modern Windows versions, where NTLMv1 and LanManager
are disabled and only NTLMv2 is enabled: NTLMv2 hashes of even
reasonably complex 8-character passwords can be broken in a matter of
days, given enough compute resources.
Even worse: On Windows, NTLM authentication uses Security Support
Provider Interface ("SSPI"), which provides the credentials without
requiring the user to type them in.
Which means that an attacker could talk an unsuspecting user into
cloning from a server that is under the attacker's control and extracts
the user's NTLMv2 hash without their knowledge.
For that reason, let's disallow NTLM authentication by default.
NTLM authentication is quite simple to set up, though, and therefore
there are still some on-prem Azure DevOps setups out there whose users
and/or automation rely on this type of authentication. To give them an
escape hatch, introduce the `http.<url>.allowNTLMAuth` config setting
that can be set to `true` to opt back into using NTLM for a specific
remote repository.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `git_terminal_prompt()` function expects the terminal window to be attached to a Win32 Console. However, this is not the case with terminal windows other than `cmd.exe`'s, e.g. with MSys2's own `mintty`. Non-cmd terminals such as `mintty` still have to have a Win32 Console to be proper console programs, but have to hide the Win32 Console to be able to provide more flexibility (such as being resizeable not only vertically but also horizontally). By writing to that Win32 Console, `git_terminal_prompt()` manages only to send the prompt to nowhere and to wait for input from a Console to which the user has no access. This commit introduces a function specifically to support `mintty` -- or other terminals that are compatible with MSys2's `/dev/tty` emulation. We use the `TERM` environment variable as an indicator for that: if the value starts with "xterm" (such as `mintty`'s "xterm_256color"), we prefer to let `xterm_prompt()` handle the user interaction. The most prominent user of `git_terminal_prompt()` is certainly `git-remote-https.exe`. It is an interesting use case because both `stdin` and `stdout` are redirected when Git calls said executable, yet it still wants to access the terminal. When running inside a `mintty`, the terminal is not accessible to the `git-remote-https.exe` program, though, because it is a MinGW program and the `mintty` terminal is not backed by a Win32 console. To solve that problem, we simply call out to the shell -- which is an *MSys2* program and can therefore access `/dev/tty`. Helped-by: nalla <nalla@hamal.uberspace.de> Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is a known issue that a rename() can fail with an "Access denied" error at times, when copying followed by deleting the original file works. Let's just fall back to that behavior. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, symbolic links actually have a type depending on the target: it can be a file or a directory. In certain circumstances, this poses problems, e.g. when a symbolic link is supposed to point into a submodule that is not checked out, so there is no way for Git to auto-detect the type. To help with that, we will add support over the course of the next commits to specify that symlink type via the Git attributes. This requires an index_state, though, something that Git for Windows' `symlink()` replacement cannot know about because the function signature is defined by the POSIX standard and not ours to change. So let's introduce a helper function to create symbolic links that *does* know about the index_state. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue the size_t evacuation. textconv_object() fills its out-parameter from fill_textconv()'s size_t return through an unsigned long*; widen the API to match, then take advantage of the new shape where callers can. cat-file's 'c' and batch-mode 'c' branches lose their size_ul bridge variables (one site becomes a direct call, the other collapses an if/else into a single negated condition that reads as "try textconv, fall back to a raw read"). blame.c likewise drops the file_size_st bridge in fill_origin_blob() and hoists final_buf_size_st to bracket both branches in setup_scoreboard(). The latter keeps a cast_size_t_to_ulong() shim because struct blame_scoreboard.final_buf_size is still unsigned long; that field is its own topic. log.c just widens its local from unsigned long to size_t. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The 'git survey' builtin provides several detail tables, such as "top files by on-disk size". The size of these tables defaults to 10, currently. Allow the user to specify this number via a new --top=<N> option or the new survey.top config key. Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Commit 2406bf5 (Win32: detect unix socket support at runtime, 2024-04-03) introduced a runtime detection for whether the operating system supports unix sockets for Windows, but a mistake snuck into the tests. When building and testing Git without NO_UNIX_SOCKETS we currently skip t0301-credential-cache on Windows if unix sockets are supported and run the tests if they aren't. Flip that logic to actually work the way it was intended. Signed-off-by: Matthias Aßhauer <mha1993@live.de> 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>
…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>
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>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
…updates Start monitoring updates of Git for Windows' component in the open
Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v5...v6) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/actions/cache/releases">actions/cache's releases</a>.</em></p> <blockquote> <h2>v6.0.0</h2> <h2>What's Changed</h2> <ul> <li>Update packages, migrate to ESM by <a href="https://github.com/Samirat"><code>@Samirat</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1760">actions/cache#1760</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v6.0.0">https://github.com/actions/cache/compare/v5...v6.0.0</a></p> <h2>v5.1.0</h2> <h2>What's Changed</h2> <ul> <li>Bump <code>@actions/cache</code> to v5.1.0 - handle read-only cache access by <a href="https://github.com/jasongin"><code>@jasongin</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1775">actions/cache#1775</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.1.0">https://github.com/actions/cache/compare/v5...v5.1.0</a></p> <h2>v5.0.5</h2> <h2>What's Changed</h2> <ul> <li>Update ts-http-runtime dependency by <a href="https://github.com/yacaovsnc"><code>@yacaovsnc</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1747">actions/cache#1747</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.0.5">https://github.com/actions/cache/compare/v5...v5.0.5</a></p> <h2>v5.0.4</h2> <h2>What's Changed</h2> <ul> <li>Add release instructions and update maintainer docs by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1696">actions/cache#1696</a></li> <li>Potential fix for code scanning alert no. 52: Workflow does not contain permissions by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1697">actions/cache#1697</a></li> <li>Fix workflow permissions and cleanup workflow names / formatting by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1699">actions/cache#1699</a></li> <li>docs: Update examples to use the latest version by <a href="https://github.com/XZTDean"><code>@XZTDean</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1690">actions/cache#1690</a></li> <li>Fix proxy integration tests by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1701">actions/cache#1701</a></li> <li>Fix cache key in examples.md for bun.lock by <a href="https://github.com/RyPeck"><code>@RyPeck</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1722">actions/cache#1722</a></li> <li>Update dependencies & patch security vulnerabilities by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1738">actions/cache#1738</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/XZTDean"><code>@XZTDean</code></a> made their first contribution in <a href="https://redirect.github.com/actions/cache/pull/1690">actions/cache#1690</a></li> <li><a href="https://github.com/RyPeck"><code>@RyPeck</code></a> made their first contribution in <a href="https://redirect.github.com/actions/cache/pull/1722">actions/cache#1722</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.0.4">https://github.com/actions/cache/compare/v5...v5.0.4</a></p> <h2>v5.0.3</h2> <h2>What's Changed</h2> <ul> <li>Bump <code>@actions/cache</code> to v5.0.5 (Resolves: <a href="https://github.com/actions/cache/security/dependabot/33">https://github.com/actions/cache/security/dependabot/33</a>)</li> <li>Bump <code>@actions/core</code> to v2.0.3</li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.0.3">https://github.com/actions/cache/compare/v5...v5.0.3</a></p> <h2>v.5.0.2</h2> <h1>v5.0.2</h1> <h2>What's Changed</h2> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/actions/cache/blob/main/RELEASES.md">actions/cache's changelog</a>.</em></p> <blockquote> <h1>Releases</h1> <h2>How to prepare a release</h2> <blockquote> <p>[!NOTE] Relevant for maintainers with write access only.</p> </blockquote> <ol> <li>Switch to a new branch from <code>main</code>.</li> <li>Run <code>npm test</code> to ensure all tests are passing.</li> <li>Update the version in <a href="https://github.com/actions/cache/blob/main/package.json"><code>https://github.com/actions/cache/blob/main/package.json</code></a>.</li> <li>Run <code>npm run build</code> to update the compiled files.</li> <li>Update this <a href="https://github.com/actions/cache/blob/main/RELEASES.md"><code>https://github.com/actions/cache/blob/main/RELEASES.md</code></a> with the new version and changes in the <code>## Changelog</code> section.</li> <li>Run <code>licensed cache</code> to update the license report.</li> <li>Run <code>licensed status</code> and resolve any warnings by updating the <a href="https://github.com/actions/cache/blob/main/.licensed.yml"><code>https://github.com/actions/cache/blob/main/.licensed.yml</code></a> file with the exceptions.</li> <li>Commit your changes and push your branch upstream.</li> <li>Open a pull request against <code>main</code> and get it reviewed and merged.</li> <li>Draft a new release <a href="https://github.com/actions/cache/releases">https://github.com/actions/cache/releases</a> use the same version number used in <code>package.json</code> <ol> <li>Create a new tag with the version number.</li> <li>Auto generate release notes and update them to match the changes you made in <code>RELEASES.md</code>.</li> <li>Toggle the set as the latest release option.</li> <li>Publish the release.</li> </ol> </li> <li>Navigate to <a href="https://github.com/actions/cache/actions/workflows/release-new-action-version.yml">https://github.com/actions/cache/actions/workflows/release-new-action-version.yml</a> <ol> <li>There should be a workflow run queued with the same version number.</li> <li>Approve the run to publish the new version and update the major tags for this action.</li> </ol> </li> </ol> <h2>Changelog</h2> <h3>6.1.0</h3> <ul> <li>Bump <code>@actions/cache</code> to v6.1.0 to pick up <a href="https://redirect.github.com/actions/toolkit/pull/2435">actions/toolkit#2435 Handle cache write error due to read-only token</a></li> <li>Switch redundant "Cache save failed" warning to debug log in save-only</li> </ul> <h3>6.0.0</h3> <ul> <li>Updated <code>@actions/cache</code> to ^6.0.1, <code>@actions/core</code> to ^3.0.1, <code>@actions/exec</code> to ^3.0.0, <code>@actions/io</code> to ^3.0.2</li> <li>Migrated to ESM module system</li> <li>Upgraded Jest to v30 and test infrastructure to be ESM compatible</li> </ul> <h3>5.0.4</h3> <ul> <li>Bump <code>minimatch</code> to v3.1.5 (fixes ReDoS via globstar patterns)</li> <li>Bump <code>undici</code> to v6.24.1 (WebSocket decompression bomb protection, header validation fixes)</li> <li>Bump <code>fast-xml-parser</code> to v5.5.6</li> </ul> <h3>5.0.3</h3> <ul> <li>Bump <code>@actions/cache</code> to v5.0.5 (Resolves: <a href="https://github.com/actions/cache/security/dependabot/33">https://github.com/actions/cache/security/dependabot/33</a>)</li> <li>Bump <code>@actions/core</code> to v2.0.3</li> </ul> <h3>5.0.2</h3> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/actions/cache/commit/55cc8345863c7cc4c66a329aec7e433d2d1c52a9"><code>55cc834</code></a> Merge pull request <a href="https://redirect.github.com/actions/cache/issues/1768">#1768</a> from jasongin/readonly-cache</li> <li><a href="https://github.com/actions/cache/commit/d8cd72f230726cdf4457ebb61ec1b593a8d12337"><code>d8cd72f</code></a> Bump <code>@actions/cache</code> to v6.1.0 - handle cache write error due to RO token</li> <li><a href="https://github.com/actions/cache/commit/2c8a9bd7457de244a408f35966fab2fb45fda9c8"><code>2c8a9bd</code></a> Merge pull request <a href="https://redirect.github.com/actions/cache/issues/1760">#1760</a> from actions/samirat/esm_migration_and_package_update</li> <li><a href="https://github.com/actions/cache/commit/e9b91fdc3fea7d79165fceb79042ef45c2d51023"><code>e9b91fd</code></a> Prettier fixes</li> <li><a href="https://github.com/actions/cache/commit/e4884b8ff7f92ef6b52c79eda480bbc86e685adb"><code>e4884b8</code></a> Rebuild dist</li> <li><a href="https://github.com/actions/cache/commit/10baf0191a3c426ea0fa4a3253a5c04233b6e18f"><code>10baf01</code></a> Fixed licenses</li> <li><a href="https://github.com/actions/cache/commit/e39b386c9004d72a15d864ade8c0b3a702d47a37"><code>e39b386</code></a> Fix test mock return order</li> <li><a href="https://github.com/actions/cache/commit/b6928203372a8571ff984c0c883ef3a1adfb0c06"><code>b692820</code></a> PR feedback</li> <li><a href="https://github.com/actions/cache/commit/60749128a44d25d3c520a489e576380cf00ff3f1"><code>6074912</code></a> Rebuild dist bundles as ESM to match type:module</li> <li><a href="https://github.com/actions/cache/commit/5a912e8b4af820fa082a0e75cfd2c782f8fbfe0e"><code>5a912e8</code></a> Fix lint and jest issues</li> <li>Additional commits viewable in <a href="https://github.com/actions/cache/compare/v5...v6">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
) While upstreaming those patches, I've been asked to adjust them. This backports those fixes. Of course, the _real_ reason to do this _now_ is that I need _some_ PR to make a new Git for Windows release (to address [the NTLM](git-for-windows#6308) issue).
Mirror what git survey already reports: lightweight tags (pointing straight at a commit/tree/blob) and annotated tags (pointing at an OBJ_TAG that is itself stored as a separate object) are different things in many monorepo contexts, and one of the differences git survey users routinely care about. Add an annotated_tags counter to struct ref_stats, populate it in count_references() by peeking at the ref OID's object type, and expose it as a sub-row under Tags in the table output and as references.tags.annotated.count in the machine-readable formats. Step toward pivoting the standalone git survey command onto git repo structure; this fills the first of the four feature gaps documented in the assessment. Tests in t1901 widened to assert the new row and key. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git repo structure` walks every reference enumerated by `refs_for_each_ref()` and feeds each reference's tip into the path walk that produces the object counts. There is no way to scope the inquiry to a subset of refs, even though that is the most common need when an operator is investigating what part of the history is driving cost: only branches, only release tags, only one remote's view, etc. Add a single `--ref-filter=<pattern>` option that, when given, restricts both the reference count and the object walk to refs whose full name matches one of the patterns. The option is repeatable; multiple patterns form a union, so `--ref-filter='refs/heads/*' --ref-filter='refs/tags/v*'` includes local branches and tags whose short name starts with `v`. Patterns use `wildmatch()` with `WM_PATHNAME` semantics so a `*` does not cross `/`, matching the convention used by `git for-each-ref` positional arguments. Choosing a single flexible filter, rather than a proliferation of per-kind flags like `--branches`, `--tags`, `--remotes`, keeps the option surface small and lets the same mechanism express narrow selections the per-kind flags could not, such as "only release tags" (`'refs/tags/v*'`) or "only one remote's branches" (`'refs/remotes/origin/*'`). Without `--ref-filter`, behaviour is unchanged: every ref `refs_for_each_ref()` enumerates contributes. Both the reference counter and the path-walk seeding (via `add_pending_oid()`) sit on the same callback, so an early return when no pattern matches naturally excludes a ref from both. No separate object-walk machinery is needed. Cover the two interesting code paths with tests in t1901: a single filter narrowing to branches, and two filters unioning to include both branches and tags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` distinguishes itself from `git repo structure` largely by its path-level reporting: in addition to whole-repo totals it lists the paths whose object histories dominate the repository, ranked by raw count, on-disk size, and inflated size, separately for trees and blobs. That is often the most actionable output from `git survey`, since it points an operator at the directories and files that should be reviewed for cleanup, sparse-checkout exclusion, or rewriting. `git repo structure` already drives the same path-walk traversal that `git survey` uses to gather its per-path numbers; the callback simply discards the path. Aggregate per-(path, type) summaries inside that existing callback and add a bounded, descending-sorted "top-N" table keyed by each of the three axes. Gate the feature behind a new `--top=<n>` option, defaulting to 0, so unadorned invocations are unaffected and pay no extra work for the top-N tracking. Mirror the sort and eviction strategy from `builtin/survey.c`: keep an array of at most N entries sorted from largest to smallest, walk it from the bottom on each candidate, and shift entries down when a new one belongs. Compared to `builtin/survey.c`, drop the void-pointer indirection in the table data, type the comparator's arguments, and fold the trivial comparators into the `(a > b) - (a < b)` idiom. For the human-readable `table` output, extend the existing nested bullet layout with two new top-level sections, `* Top trees` and `* Top blobs`, each containing three sub-tables (`Top by count`, `Top by disk size`, `Top by inflated size`). The path becomes the row name and the relevant scalar becomes the value, reusing `stats_table_count_addf` and `stats_table_size_addf` so units and column alignment match the rest of the table. For the `lines`/`nul` key-value formats, emit one `objects.<type>.top.by_<axis>.<rank>.path=<path>` entry alongside an `objects.<type>.top.by_<axis>.<rank>.<axis>=<value>` entry per ranked path, so consumers can dispatch by axis without parsing the schema. The root tree's path is the empty string as produced by the path-walk machinery; preserve that as-is to stay faithful to the upstream representation rather than fabricating a placeholder. This is the first piece of folding `git survey`'s functionality into `git repo structure`. Subsequent commits will add the corresponding configuration knob and, eventually, turn `git survey` into a thin deprecated shim over `git repo structure`. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The preceding commit added `--top=<n>` to `git repo structure`,
reporting the top-N paths per type ranked by count, on-disk size, and
inflated size. Cover the three behaviors that matter for that option:
* Without `--top`, the key-value output emits no `top.*` keys, so
existing parsers stay unaffected.
* `--top=N` produces exactly N ranked entries on each of the six
`objects.<type>.top.by_<axis>` axes (count/disk_size/inflated_size
crossed with trees/blobs), and a constructed input where one blob
is several orders of magnitude bigger than the other lets us
assert the ordering on the disk-size and inflated-size axes.
* A negative `--top` is rejected with a non-zero exit and a message
naming the constraint, so a typo cannot silently degrade into the
default zero.
Avoid grep patterns starting with `--`; grep would parse the leading
double dash as an option terminator.
Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` exposes its `--top` default via `survey.top` so that a site or per-repository operator can switch the detail tables on once and have every subsequent invocation include them. Mirror that ergonomics for `git repo structure` so that, as `git survey`'s functionality is folded into `git repo structure`, the configuration side of the migration story stays equivalent. Add a small `git_config_int` callback bound to `repo.structure.top` and invoke it before `parse_options()`, so a `--top=<N>` on the command line cleanly overrides the configured default (including `--top=0` to opt out of the detail tables when configuration enables them). Reject negative configured values with the same wording as the command-line guard, since `git_config_int()` happily returns negative integers. Document the new variable in a fresh `Documentation/config/repo.adoc` and wire it into the alphabetical includes in `Documentation/config.adoc` between `repack.adoc` and `rerere.adoc`. Cover the precedence behaviour with a t1901 test: a configured value enables the tables by default, and a command-line `--top=0` suppresses them again. Note that the reported paths respect the `core.quotePath` setting. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` started life as an experimental scale-measurement tool; the preceding commits give `git repo structure` the path-level detail tables and ref-scoping mechanism that were `git survey`'s main draw, so the two now overlap substantially. Plan the migration explicitly: add a short notice at the top of the description making clear which of `git survey`'s knobs map to which `git repo structure` option, and state that a future release will turn `git survey` into a thin shim over `git repo structure`. Putting the notice in the description (rather than only the synopsis) ensures it shows up in `git help survey` rendering before the reader sees any option specifics, so an operator skimming the page learns about the replacement before adopting any survey-specific flags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` was an experimental scale-measurement tool whose
distinctive features (ref-kind filters, top-N path tables) are now
all available in `git repo structure`. With the path-level reporting
in place (commits "repo: filter the structure scope via
--ref-filter=<pattern>" and "repo: report top-N paths by count, disk,
and inflated size in structure"), there is no functionality `git
survey` provides that `git repo structure` cannot.
Replace the 764-line `git survey` implementation with a roughly
hundred-line shim that:
* Accepts the existing `git survey` command line so callers in
scripts continue to parse without changes.
* Emits a deprecation warning naming the replacement command, so
interactive users learn about the migration target.
* Translates the survey-specific knobs into the equivalent
`git repo structure` invocation and re-execs the canonical
command via `execv_git_cmd()`. Per-kind ref selectors fan out
into the corresponding `refs/heads/*`, `refs/tags/*`, etc.
`--ref-filter` patterns; `--top=<N>` is forwarded directly;
`--all-refs` becomes the absence of any `--ref-filter`.
Two survey options have no `git repo structure` counterpart:
`--verbose` controlled per-step trace output the new command does
not emit, and `--detached` selected the detached HEAD which
`git repo structure` does not enumerate separately. Both are
silently accepted and produce a single warning each, so old
invocations keep working while the absence of these knobs in `git
repo structure` is made visible.
Rewrite t8100 to assert the shim's contract: the deprecation
warning is printed, the output is byte-identical to a corresponding
`git repo structure` invocation, and the per-kind selector
translation produces the right `--ref-filter` pattern. The
preceding survey-specific output assertions (the multi-column
plaintext tables) no longer apply, since `git repo structure`'s
output format is now the canonical one and is covered by t1901.
The `survey.*` configuration keys (`survey.top`, `survey.progress`,
`survey.verbose`) are no longer honored by the shim. They were
mirrored by the preceding `repo.structure.top` work for the most
useful knob; users with `survey.top` set in config should migrate
to `repo.structure.top`. This is a backward-incompatible removal
documented by the deprecation notice in `git-survey.adoc`.
Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows dropped Windows 7 support a long time ago. This patch was carried in Git for Windows without making it upstream, and exists exclusively to support Windows 7 users. Therefore it can now go enjoy its retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…it-for-windows#6268) `git survey` was always experimental, and I never got around to upstreaming it to make it non-experimental. In the meantime, the `git repo structure` command was upstreamed upstream, which covers most of the same ground with a cleaner option surface and a stable output contract. This PR closes the remaining gap (annotated-tag breakdown, ref scoping, top-N paths by count/disk/inflated, and the corresponding configuration knob) and then turns `git survey` into a thin shim that warns about deprecation, translates its old command line into the equivalent `git repo structure` invocation, and re-execs the canonical command. Net result: one user-facing tool to maintain and to teach instead of two. The intent is that scripts pinned to `git survey` keep working (a warning aside), and that operators have a single answer when they ask "how do I see what's making my repository large?". The `survey.*` configuration keys are intentionally dropped; the only one that mattered, `survey.top`, has a direct replacement in `repo.structure.top`.
Git for Windows dropped Windows 7 support a long time ago. There is a patch (introduced in git-for-windows#5042 and in git-for-windows#5059) to detect when Git LFS failed to start because of lack of Windows 7 support (which was lost somewhat surprisingly, via a Go upgrade that slipped that change in), and to provid a helpful message to the user in that instance. Since Git for Windows itself does not support Windows 7 anymore, that patch is no longer necessary, either.
Git for Windows v2.55.0(3)
Changes since Git for Windows v2.55.0(2) (July 2nd 2026):
New Features
* Comes with Git Credential Manager v2.9.0.
Bug Fixes
* Fixes heap overflows in the credential helper wincred, see
GHSA-rxqw-wxqg-g7hw for full details.
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: 7608b4ab22 (Merge tag 'v2.55.0.windows.3', 2026-07-16) (8d82cfd875..7608b4ab22)
Resolved: 7c2fa94 (Some amendments for the
hashliteral_tsize fixes (git-for-windows#6311), 2026-07-03)Resolved by taking HEAD (ours) for 13 files where original merge kept parent1, and taking theirs for t/t1007-hash-object.sh to apply the SIZE_T_IS_64BIT prerequisite fixup (removing !LONG_IS_64BIT)
Range-diff
1: 7c2fa94 ! 1: aa50eaf Some amendments for the
hashliteral_tsize fixes (Some amendments for thehashliteral_tsize fixes git#6311)@@ Commit message to make a new Git for Windows release (to address [the NTLM](https://github.com/git-for-windows/git/issues/6308) issue). - ## refs/reftable-backend.c ## -@@ refs/reftable-backend.c: static struct ref_store *reftable_be_init(struct repository *repo, + ## builtin/fast-import.c ## + remerge CONFLICT (content): Merge conflict in builtin/fast-import.c + index add10caf98..7d856af38d 100644 + --- builtin/fast-import.c + +++ builtin/fast-import.c +@@ builtin/fast-import.c: static int store_object( + struct object_entry *e; + unsigned char hdr[96]; + struct object_id oid; +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + size_t hdrlen, deltalen = 0; +-======= +- size_t hdrlen, deltalen; +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + struct git_hash_ctx c; + git_zstream s; + struct repo_config_values *cfg = repo_config_values(the_repository); +@@ builtin/fast-import.c: static void cat_blob_write(const char *buf, unsigned long size) + static void cat_blob(struct object_entry *oe, struct object_id *oid) + { + struct strbuf line = STRBUF_INIT; +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + struct iovec iov[3]; +-======= +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + size_t size; + enum object_type type = 0; + char *buf; + + ## ci/lib.sh ## + remerge CONFLICT (content): Merge conflict in ci/lib.sh + index 2298dde0a8..f31a36ceeb 100755 + --- ci/lib.sh + +++ ci/lib.sh +@@ ci/lib.sh: export SKIP_DASHED_BUILT_INS=YesPlease + # In order to catch bugs introduced at integration time by mismerges, + # enable the long tests for pushes to the integration branches as well. + test -z "$MSYSTEM" || +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + case "$CI_EVENT,$CI_BRANCH" in +-======= +-case "$GITHUB_EVENT_NAME,$CI_BRANCH" in +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + pull_request,*|push,*next*|push,*master*|push,*main*|push,*maint*) + export GIT_TEST_LONG=${GIT_TEST_LONG:-true} + ;; + + ## compat/mingw.c ## + remerge CONFLICT (content): Merge conflict in compat/mingw.c + index e8dfd1b4b7..df70bae6b6 100644 + --- compat/mingw.c + +++ compat/mingw.c +@@ compat/mingw.c: static void setup_windows_environment(void) + + if (!getenv("LC_ALL") && !getenv("LC_CTYPE") && !getenv("LANG")) + setenv("LC_CTYPE", "C.UTF-8", 1); +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + } + + int mingw_platform_has_symlinks(void) + { + static int has_symlinks = -1; +-======= +- +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + /* + * Change 'core.symlinks' default to false, unless native symlinks are + * enabled in MSys2 (via 'MSYS=winsymlinks:nativestrict'). Thus we can + + ## compat/win32/path-utils.c ## + remerge CONFLICT (content): Merge conflict in compat/win32/path-utils.c + index 371c0a7708..84b620756a 100644 + --- compat/win32/path-utils.c + +++ compat/win32/path-utils.c +@@ + + #include "../../git-compat-util.h" + #include "../../environment.h" +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + #include "../../repository.h" +-======= +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + #include "../../wrapper.h" + #include "../../strbuf.h" + #include "../../versioncmp.h" + + ## config.mak.uname ## + remerge CONFLICT (content): Merge conflict in config.mak.uname + index 54ad03cb21..e0c8dcef9c 100644 + --- config.mak.uname + +++ config.mak.uname +@@ config.mak.uname: endif + EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj kernel32.lib ntdll.lib + GITLIBS += git.res + PTHREAD_LIBS = +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + RC = lib/compat/vcbuild/scripts/rc.pl +-======= +- RC = compat/vcbuild/scripts/rc.pl +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + lib = + BASIC_CFLAGS += $(vcpkg_inc) $(sdk_includes) $(msvc_includes) + ifndef DEBUG + + ## git-compat-util.h ## + remerge CONFLICT (content): Merge conflict in git-compat-util.h + index ac5ddce201..4980c60506 100644 + --- git-compat-util.h + +++ git-compat-util.h +@@ git-compat-util.h: struct fscache; + #ifndef enable_fscache + #define enable_fscache(x) /* noop */ + #endif +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + #ifndef flush_fscache + #define flush_fscache() /* noop */ + #endif +-======= +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + + #ifndef disable_fscache + #define disable_fscache() /* noop */ + + ## meson_options.txt ## + remerge CONFLICT (content): Merge conflict in meson_options.txt + index 7d5e1dd5d8..427697f5f7 100644 + --- meson_options.txt + +++ meson_options.txt +@@ meson_options.txt: option('runtime_prefix', type: 'boolean', value: false, + description: 'Resolve ancillary tooling and support files relative to the location of the runtime binary instead of hard-coding them into the binary.') + option('sane_tool_path', type: 'array', value: [], + description: 'An array of paths to pick up tools from in case the normal tools are broken or lacking.') +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + option('nanosec', type: 'boolean', value: false, + description: 'Care about sub-second file mtimes and ctimes.') +-======= +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + option('msystem', type: 'string', value: '', + description: 'Fall-back on Windows when MSYSTEM is not set.') + option('mingw_prefix', type: 'string', value: '', + + ## object-file.c ## + remerge CONFLICT (content): Merge conflict in object-file.c + index 5373c18eee..ec35c318bc 100644 + --- object-file.c + +++ object-file.c +@@ object-file.c: int parse_loose_header(const char *hdr, struct object_info *oi) + return 0; + } + +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) +-======= +-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, +- char *hdr, size_t *hdrlen) +-{ +- algo->init_fn(c); +- git_hash_update(c, hdr, *hdrlen); +- git_hash_update(c, buf, len); +- git_hash_final_oid(oid, c); +-} +- +-void write_object_file_prepare(const struct git_hash_algo *algo, +- const void *buf, size_t len, +- enum object_type type, struct object_id *oid, +- char *hdr, size_t *hdrlen) +-{ +- struct git_hash_ctx c; +- +- /* Generate the header */ +- *hdrlen = format_object_header(hdr, *hdrlen, type, len); +- +- /* Hash (function pointers) computation */ +- hash_object_body(algo, &c, buf, len, oid, hdr, hdrlen); +-} +- +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + #define CHECK_COLLISION_DEST_VANISHED -2 + + static int check_collision(const char *source, const char *dest) +@@ object-file.c: void hash_object_file(const struct git_hash_algo *algo, const void *buf, + { + struct git_hash_ctx c; + char hdr[MAX_HEADER_LEN]; +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + int hdrlen; +-======= +- size_t hdrlen = sizeof(hdr); +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) - reftable_set_alloc(malloc, realloc, free); + hdrlen = format_object_header(hdr, sizeof(hdr), type, len); -+ reftable_set_alloc(malloc, realloc, free); -+ - refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir, - &ref_common_dir); + + ## object-file.h ## + remerge CONFLICT (content): Merge conflict in object-file.h + index 1726e29e9e..805f2cfa28 100644 + --- object-file.h + +++ object-file.h +@@ object-file.h: int finalize_object_file_flags(struct repository *repo, + void hash_object_file(const struct git_hash_algo *algo, const void *buf, + size_t len, enum object_type type, + struct object_id *oid); +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) +-======= +-void write_object_file_prepare(const struct git_hash_algo *algo, +- const void *buf, size_t len, +- enum object_type type, struct object_id *oid, +- char *hdr, size_t *hdrlen); +-int write_loose_object(struct odb_source_loose *loose, +- const struct object_id *oid, char *hdr, +- int hdrlen, const void *buf, unsigned long len, +- time_t mtime, unsigned flags); +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + /* Helper to check and "touch" a file */ + int check_and_freshen_file(const char *fn, int freshen, + + ## odb/source-loose.c ## + remerge CONFLICT (content): Merge conflict in odb/source-loose.c + index 86a989dcab..ef0e919277 100644 + --- odb/source-loose.c + +++ odb/source-loose.c +@@ odb/source-loose.c: static int write_loose_object(struct odb_source_loose *loose, + + static int odb_source_loose_write_object(struct odb_source *source, + const void *buf, size_t len, +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + enum object_type type, + const struct object_id *oid, + const struct object_id *compat_oid, + const time_t *mtime, +-======= +- enum object_type type, struct object_id *oid, +- struct object_id *compat_oid_in, +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + enum odb_write_object_flags flags) + { + struct odb_source_loose *loose = odb_source_loose_downcast(source); + char hdr[MAX_HEADER_LEN]; +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + int hdrlen; +-======= +- size_t hdrlen = sizeof(hdr); +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + + hdrlen = format_object_header(hdr, sizeof(hdr), type, len); + + + ## send-pack.c ## + remerge CONFLICT (content): Merge conflict in send-pack.c + index e3411845a2..0d3a0d330c 100644 + --- send-pack.c + +++ send-pack.c +@@ send-pack.c: int send_pack(struct repository *r, + allow_deleting_refs = 1; + if (server_supports("ofs-delta")) + args->use_ofs_delta = 1; +-<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + if (server_supports("no-ref-delta")) + args->no_ref_delta = 1; +-======= +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + use_sideband = use_sideband && server_supports("side-band-64k"); + if (server_supports("quiet")) + quiet_supported = 1; ## t/t1007-hash-object.sh ## + remerge CONFLICT (content): Merge conflict in t/t1007-hash-object.sh + index c450bb81c9..4bc82dd968 100755 + --- t/t1007-hash-object.sh + +++ t/t1007-hash-object.sh +@@ t/t1007-hash-object.sh: done + test_expect_success 'too-short tree' ' + echo abc >malformed-tree && + test_must_fail git hash-object -t tree malformed-tree 2>err && +- test_grep "too-short tree object" err ++ grep "too-short tree object" err + ' + + test_expect_success PERL_TEST_HELPERS 'malformed mode in tree' ' +@@ t/t1007-hash-object.sh: test_expect_success PERL_TEST_HELPERS 'malformed mode in tree' ' + bin_oid=$(echo $hex_oid | hex2oct) && + printf "9100644 \0$bin_oid" >tree-with-malformed-mode && + test_must_fail git hash-object -t tree tree-with-malformed-mode 2>err && +- test_grep "malformed mode in tree entry" err ++ grep "malformed mode in tree entry" err + ' + + test_expect_success PERL_TEST_HELPERS 'empty filename in tree' ' +@@ t/t1007-hash-object.sh: test_expect_success PERL_TEST_HELPERS 'empty filename in tree' ' + bin_oid=$(echo $hex_oid | hex2oct) && + printf "100644 \0$bin_oid" >tree-with-empty-filename && + test_must_fail git hash-object -t tree tree-with-empty-filename 2>err && +- test_grep "empty filename in tree entry" err ++ grep "empty filename in tree entry" err + ' + + test_expect_success PERL_TEST_HELPERS 'duplicate filename in tree' ' +@@ t/t1007-hash-object.sh: test_expect_success PERL_TEST_HELPERS 'duplicate filename in tree' ' + printf "100644 file\0$bin_oid" + } >tree-with-duplicate-filename && + test_must_fail git hash-object -t tree tree-with-duplicate-filename 2>err && +- test_grep "duplicateEntries" err ++ grep "duplicateEntries" err + ' + + test_expect_success 'corrupt commit' ' @@ t/t1007-hash-object.sh: test_expect_success EXPENSIVE,SIZE_T_IS_64BIT \ # This clean filter does nothing, other than excercising the interface. # We ensure that cleaning doesn't mangle large files on 64-bit Windows. +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) -test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \ -+test_expect_success EXPENSIVE,SIZE_T_IS_64BIT \ +-================================ + test_expect_success EXPENSIVE,SIZE_T_IS_64BIT \ +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) 'hash filtered files over 4GB correctly' ' { test -f big || test-tool genzeros $((5*1024*1024*1024)) >big; } && test_oid large5GB >expect && + + ## t/t1517-outside-repo.sh ## + remerge CONFLICT (content): Merge conflict in t/t1517-outside-repo.sh + index e59b3b051e..efbac29c0e 100755 + --- t/t1517-outside-repo.sh + +++ t/t1517-outside-repo.sh +@@ t/t1517-outside-repo.sh: do + http-backend | http-fetch | http-push | init-db | \ + mktag | p4 | p4.py | pickaxe | remote-ftp | remote-ftps | \ + remote-http | remote-https | replay | send-email | \ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + sh-i18n--envsubst | shell | show | stage | survey | \ + upload-archive--writer | upload-pack | whatchanged) + h_expect_outcome=expect_failure +@@ t/t1517-outside-repo.sh: do + h_expect_outcome=expect_success + all_expect_outcome=expect_failure + ;; +-================================ +- sh-i18n--envsubst | shell | show | stage | submodule | survey | svn | \ +- upload-archive--writer | upload-pack | web--browse | whatchanged) +- expect_outcome=expect_failure ;; +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + *) + h_expect_outcome=expect_success + all_expect_outcome=expect_success + + ## t/t6403-merge-file.sh ## + remerge CONFLICT (content): Merge conflict in t/t6403-merge-file.sh + index adf0fd530a..bd58e471bc 100755 + --- t/t6403-merge-file.sh + +++ t/t6403-merge-file.sh +@@ t/t6403-merge-file.sh: test_expect_success "expected conflict markers" ' + test_expect_success 'binary files cannot be merged' ' + test_must_fail git merge-file -p \ + orig.txt "$TEST_DIRECTORY"/lib-diff/test-binary-1.png new1.txt 2> merge.err && +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 7c31d7e9e4 (build(deps): bump actions/cache from 5 to 6 (#6303)) + test_grep "Cannot merge binary files" merge.err +-================================ +- grep "Cannot merge binary files" merge.err +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + ' + + test_expect_success 'binary files cannot be merged with --object-id' 'To: cd8f3be44d (Merge tag 'v2.55.0.windows.3', 2026-07-16) (103bb7d388..cd8f3be44d)
Statistics
Range-diff (click to expand)
1: 3dc8192 = 1: 17d8560 mingw: skip symlink type auto-detection for network share targets
3: 07f14d8 = 2: e92ecf2 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
2: eb5c1f7 = 3: b26a315 unix-socket: avoid leak when initialization fails
4: c8fa178 = 4: 5e84f4a grep: prevent
^$false match at end of file5: ee4075d = 5: b95b051 Merge branch 'v2.53.0.windows.3'
6: 27d17dc = 6: 3b10b59 Merge branch 'fixes-from-the-git-mailing-list'
8: 067e268 = 7: 5ba1cc9 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
11: e317a70 = 8: c553966 vcpkg_install: detect lack of Git
15: b0edc25 = 9: 1e88c29 vcpkg_install: add comment regarding slow network connections
30: cfe5b92 = 10: 68e78e7 vcbuild: install ARM64 dependencies when building ARM64 binaries
31: f78aabc = 11: 1893b1f vcbuild: add an option to install individual 'features'
32: a313299 = 12: e098fca cmake: allow building for Windows/ARM64
7: 1b1d964 = 13: 8c1a3c4 t9350: point out that refs are not updated correctly
33: 3729206 = 14: ee3c167 ci(vs-build) also build Windows/ARM64 artifacts
9: 47d6324 = 15: 20709cd transport-helper: add trailing --
10: a0ca8c8 = 16: 71d7b69 mingw: demonstrate a
git addissue with NTFS junctions12: 0d59eb0 = 17: a741f56 t5505/t5516: allow running without
.git/branches/in the templates34: ea66f6a = 18: d6bfcd1 vcbuild: stop hard-coding OpenSSL as a dependency
13: 4f8c5a7 = 19: 2b3420a remote-helper: check helper status after import/export
14: 2594a3d = 20: 0ff9f48 strbuf_realpath(): use platform-dependent API if available
17: 98a2825 = 21: 7248255 mingw: include the Python parts in the build
18: 0b4e567 = 22: b3fafbd t5505/t5516: fix white-space around redirectors
35: 590dfe4 = 23: 46d7efc cmake(): allow setting HOST_CPU for cross-compilation
16: 132da0d = 24: 62099f2 http: use new "best effort" strategy for Secure Channel revoke checking
19: 8e30f63 = 25: c3a1258 ci: bump actions/checkout from 6 to 7
20: fad20b9 = 26: d7cc12a Always auto-gc after calling a fast-import transport
21: bae01af = 27: a8fbb28 mingw: prevent regressions with "drive-less" absolute paths
22: f01840f = 28: eb654a2 transport: optionally disable side-band-64k
23: d95bf4c = 29: 5b28d3e mingw: fix fatal error working on mapped network drives on Windows
24: 1aeba93 = 30: 1bfe639 clink.pl: fix MSVC compile script to handle libcurl-d.lib
25: b528aa2 = 31: 510c400 mingw: implement a platform-specific
strbuf_realpath()26: c4904b1 = 32: e9fa408 t3701: verify that we can add lots of files interactively
27: ae364de = 33: 56aac51 commit: accept "scissors" with CR/LF line endings
28: 61981e1 = 34: 20247ca t0014: fix indentation
29: 7fadbd3 = 35: 266c408 git-gui: accommodate for intent-to-add files
40: 13f4f2f = 36: 7bc72ce mingw: allow for longer paths in
parse_interpreter()41: e104126 = 37: c3411c7 compat/vcbuild: document preferred way to build in Visual Studio
55: 29ef550 = 38: c49e504 windows: skip linking
git-<command>for built-ins56: 0d2c6f2 = 39: 85f9f1e mingw: stop hard-coding
CC = gcc57: d3e3cc6 = 40: a3c9adb mingw: drop the -D_USE_32BIT_TIME_T option
58: c9976d4 = 41: c990cd2 mingw: only use -Wl,--large-address-aware for 32-bit builds
59: 54dda3e = 42: be6468a mingw: avoid over-specifying
--pic-executable60: eea334e = 43: 9c732ad mingw: set the prefix and HOST_CPU as per MSYS2's settings
61: f5ff7c2 = 44: def6503 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
63: f207da1 = 45: e3021df mingw: rely on MSYS2's metadata instead of hard-coding it
64: dc88b5f = 46: 620c233 mingw: always define
ETC_*for MSYS2 environments65: 836aa2f = 47: 73a0c88 max_tree_depth: lower it for clang builds in general on Windows
66: 2918d4e = 48: 73b1068 mingw: ensure valid CTYPE
67: 0c6208c = 49: 6afbaa1 mingw: allow
git.exeto be used instead of the "Git wrapper"68: 0d81d0c = 50: fd084f8 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
69: 715ca2b = 51: 2e61251 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
70: 758976c = 52: bc07fe7 clink.pl: fix libexpatd.lib link error when using MSVC
71: b7c73da = 53: b785209 Makefile: clean up .ilk files when MSVC=1
72: c041011 = 54: d9a0e33 vcbuild: add support for compiling Windows resource files
81: 59ae910 = 55: 1e382d3 revision: create mark_trees_uninteresting_dense()
73: bcc142f = 56: 9cbaf1e config.mak.uname: add git.rc to MSVC builds
53: b6adddd = 57: 049f736 MinGW: link as terminal server aware
82: b9dbc8f = 58: 1a8909b survey: stub in new experimental 'git-survey' command
36: ad90ce6 = 59: f9eccbc CMake: default Visual Studio generator has changed
74: 8b962bf = 60: 4b23b02 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
78: d020ee9 = 61: 1cab8e6 http: optionally load libcurl lazily
91: 7cce046 = 62: 5608b5a survey: add command line opts to select references
37: 215b2a1 = 63: 1ca0800 .gitignore: add Visual Studio CMakeSetting.json file
75: 10c4c16 = 64: 52c14d7 clink.pl: move default linker options for MSVC=1 builds
79: 8f23078 = 65: 527881c http: support lazy-loading libcurl also on Windows
93: 133512d = 66: 8d956aa survey: start pretty printing data in table form
38: ff109bd = 67: 7896f0b subtree: update
contrib/subtreetesttarget39: c206714 = 68: 39c1043 CMakeLists: add default "x64-windows" arch for Visual Studio
44: 8a242b7 = 69: 948ae3c hash-object: add another >4GB/LLP64 test case
45: cd94e7a = 70: ab33d31 setup: properly use "%(prefix)/" when in WSL
46: 4d44e54 = 71: ae08ff0 Add config option
windows.appendAtomically76: c0719d3 = 72: 89e6348 cmake: install headless-git.
80: 214ac63 = 73: 5edfc4d http: when loading libcurl lazily, allow for multiple SSL backends
95: 1b1eba6 = 74: 604ae7b survey: add object count summary
42: bd3d430 = 75: aecdf45 http: optionally send SSL client certificate
43: d26e182 = 76: e3dedc1 ci: run
contrib/subtreetests in CI builds47: 5a2dba7 = 77: 39f602f CMake: show Win32 and Generator_platform build-option values
48: 7d0bd1c = 78: 34cf706 hash-object: add a >4GB/LLP64 test case using filtered input
49: f33a233 = 79: 6ec0b73 compat/mingw.c: do not warn when failing to get owner
50: 065eb3f = 80: d2e096e mingw: $env:TERM="xterm-256color" for newer OSes
51: 5694fbd = 81: 92a5af0 winansi: check result and Buffer before using Name
52: f2f625f = 82: f0a7beb mingw: change core.fsyncObjectFiles = 1 by default
54: 2cdab03 = 83: 6b601a2 Fix Windows version resources
62: 1ccde99 = 84: 40a16e3 status: fix for old-style submodules with commondir
77: a0df9b8 = 85: 3bc86f5 git.rc: include winuser.h
83: 0ae0b61 = 86: 36ce9d1 mingw: do load libcurl dynamically by default
84: 8792c88 = 87: 68b2b81 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
85: 1e038c1 = 88: 87f9385 mingw: suggest
windows.appendAtomicallyin more cases86: bb53596 = 89: 0f1204c win32: use native ANSI sequence processing, if possible
87: 4e8d64a = 90: e677428 common-main.c: fflush stdout buffer upon exit
88: 79e2980 = 91: bcd9ffa t5601/t7406(mingw): do run tests with symlink support
89: 33025d4 = 92: 507e255 Fallback to AppData if XDG_CONFIG_HOME is unset
90: 352dcb9 = 93: 46f4e59 run-command: be helpful with Git LFS fails on Windows 7
92: 4e395e8 = 94: b26757d mingw: Support
git_terminal_promptwith more terminals94: eb504b9 = 95: 618458f compat/terminal.c: only use the Windows console if bash 'read -r' fails
131: 1ae62f7 = 96: 71cbae4 diff: stop truncating the deflated-binary-diff size on Windows
96: 2241928 = 97: 2f53c47 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
132: 9ff0f3d = 98: 13ef076 convert: widen gather_convert_stats() helpers to size_t
97: 4336d5d = 99: 9368aaa survey: summarize total sizes by object type
98: 7184ec1 = 100: 88a3db7 Win32: symlink: move phantom symlink creation to a separate function
133: 2510308 = 101: e189310 read-cache: stop truncating index blob sizes on Windows
99: 03c6d0a = 102: 063035b survey: show progress during object walk
100: 33b774e = 103: d9b1489 mingw: make sure
errnois set correctly when socket operations fail101: 7e5c474 = 104: 774ee4e t5563: verify that NTLM authentication works
102: ec6cff5 = 105: dbc32ea mingw: introduce code to detect whether we're inside a Windows container
103: 36b1cbd = 106: de6b896 Introduce helper to create symlinks that knows about index_state
134: c76ca62 = 107: 6255426 xdiff-interface: widen buffer_is_binary() size parameter to size_t
104: 7b9dc02 = 108: 2b53737 survey: add ability to track prioritized lists
105: 599f723 = 109: 66ded2b compat/mingw: handle WSA errors in strerror
106: 0bbc896 = 110: 836b3d6 http: disallow NTLM authentication by default
107: b6f9146 = 111: 29b92d6 mingw: when running in a Windows container, try to rename() harder
108: e59aba5 = 112: 91b1391 mingw: allow to specify the symlink type in .gitattributes
136: f95e31d = 113: e54dca2 combine-diff: stop truncating combined-diff blob sizes on Windows
109: 298ec9b = 114: d70bf2a survey: add report of "largest" paths
110: ad66c4c = 115: 51aea24 compat/mingw: drop outdated comment
111: 1780ec4 = 116: d8d63f8 http: warn if might have failed because of NTLM
112: 30b2561 = 117: d4e7316 mingw: move the file_attr_to_st_mode() function definition
113: eef7db6 = 118: afd95ab Win32: symlink: add test for
symlinkattribute138: 7f8fff9 = 119: 53f5772 diff: widen textconv_object() size out-param to size_t
114: acab435 = 120: cae6ba9 survey: add --top= option and config
115: 22e0a3e = 121: c2b7fb1 t0301: actually test credential-cache on Windows
116: 3aaa320 = 122: 6940b35 credential: advertise NTLM suppression and allow helpers to re-enable
117: 3e0aa25 = 123: 2345cf0 mingw: Windows Docker volumes are not symbolic links
118: 2a36790 = 124: fccda54 clean: do not traverse mount points
140: b2c2d46 = 125: 4f275bf pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
141: 926ebcf = 126: 5684244 diffcore: widen struct diff_filespec.size to size_t
119: f35f483 = 127: 7611bdf survey: clearly note the experimental nature in the output
120: 4be4651 = 128: 0b5214a credential-cache: handle ECONNREFUSED gracefully
121: 11540a5 = 129: e3eede8 reftable: do make sure to use custom allocators
122: c40317e = 130: 515b2a0 check-whitespace: avoid alerts about upstream commits
123: 39f64c9 = 131: af09100 t/t5571-prep-push-hook.sh: Add test with writing to stderr
124: 8462e91 = 132: c80cd32 dir: do not traverse mount points
125: bf72bca = 133: 9662591 win32: thread-utils: handle multi-socket systems
126: 9f34681 = 134: d31c019 t5563: add tests for http.emptyAuth with Negotiate
127: a2c7325 = 135: dfc4c10 entry: flush fscache after creating directories and writing files
128: 45a3083 = 136: 3ca9673 ci(macos): skip the
git p4tests129: fc6241b = 137: f3c8e6a mingw: work around rename() failing on a read-only file
130: 67e8f2e = 138: a8d2808 clean: remove mount points when possible
144: f180533 = 139: 29e1182 mingw: optionally enable wsl compability file mode bits
145: 52780ed = 140: 72e6d60 Refuse to follow invalid paths in
.gitfiles135: 2121b4e = 141: 9628a7a tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
146: 8422300 = 142: 8a384cc Merge branch 'size-t/pack-objects-delta'
137: 2cfc1dd = 143: e2a87bd tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
147: aaeff02 = 144: 05afd84 Merge branch 'size-t/pack-bitmap'
139: 78e8384 = 145: ccbfd3a pack-objects: drop the two tree-walk casts in the preferred-base path
142: 30fe436 = 146: 5294ce7 diff-delta: widen sizeof_delta_index() return to size_t
148: 333d80b = 147: 52f4c9d Merge branch 'size-t/diff'
143: e718e48 = 148: e998372 tree: widen struct tree.size and parse_tree_buffer() to size_t
149: ab6eb90 = 149: f95613e Merge branch 'size-t/diff-delta-sizeof'
150: b99efdd = 150: 28c1128 commit: widen the commit-buffer API to size_t
151: f220dd9 = 151: 4df67db Merge branch 'size-t/tree'
152: 1066a05 = 152: ea5136d blame: widen find_line_starts() len parameter to size_t
153: d238d75 = 153: 2e55f00 Merge branch 'size-t/commit'
154: 7377390 = 154: a4339a7 grep: widen struct grep_source.size and grep_buffer() to size_t
155: d6478c4 = 155: eed500d Merge branch 'size-t/blame'
156: c30d3d8 = 156: fde93e1 fast-export: drop the export_blob() size cast and widen anonymize_blob()
157: adbd3a9 = 157: 7ece782 Merge branch 'size-t/grep'
158: a870e39 = 158: 687adec repo: drop the inflated-size cast in count_objects()
159: 3b995e3 = 159: 958f77f Merge branch 'size-t/fast-export'
160: 54eb79c = 160: f1949ab unpack-objects: widen the size-passing infrastructure to size_t
161: a85803f = 161: c581140 Merge branch 'size-t/repo'
162: 07bcee4 = 162: d46a373 Merge branch 'size-t/unpack-objects'
163: d21d7be = 163: 5dce3ea Merge branch 'topic/size-t' into size-t-followups
164: 27fdd6a = 164: 43ae1ee pack-objects: drop cast_size_t_to_ulong shims in get_delta()
169: 1bc5d39 = 165: f7184bd Merge branch 'bump-ci-actions/checkout-from-6-to-7'
165: 06daea6 = 166: 1a892d7 pack-objects: drop cast_size_t_to_ulong shims in try_delta()
170: 6cdf491 = 167: 8cfadbf Merge 'remote-hg-prerequisites' into HEAD
166: 658486f = 168: 153fe81 pack-objects: drop the last size shim in write_no_reuse_object()
171: 27a947c = 169: 3c4127c Merge branch 'drive-prefix'
167: 08d124f = 170: 625b18e blame: widen struct blame_scoreboard.final_buf_size to size_t
172: 50f5298 = 171: 333def7 Merge branch 'msys2-python'
168: dcad1f1 = 172: 097d21c fast-import: drop the six size casts in the object-read paths
173: ebd4b69 = 173: 355f20f Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
174: fac8e0d = 174: f3c5b02 t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
175: 4bebdf8 = 175: ce02599 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
176: bcf64bc = 176: 22c2add Drop the
cast_size_t_to_ulong()helper177: 0f43f03 = 177: 26d5c51 Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
178: 6e58bf3 = 178: ea21e39 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
179: 3d1dde0 = 179: 6cd54c2 Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
180: 52f7baf = 180: a5d8bf3 coverity: skip building with Rust, for now
181: a4676de = 181: b3a2886 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction182: b68c6c8 = 182: 1f5d3a7 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
183: 5b2cfa3 = 183: 155f7ba Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
184: e4e7761 = 184: 0314c68 Merge 'add-p-many-files'
185: dcad855 = 185: a177986 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
186: 74fd0a1 = 186: a8ce606 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
187: ddf5a87 = 187: 7c3bcf9 Merge 'git-gui/js/intent-to-add'
188: 7a4694e = 188: b30fe92 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
189: 721b230 = 189: 78008f8 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
190: b1de16f = 190: b240e27 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
191: de89b49 = 191: 42c4ee1 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path192: 1b4d841 = 192: 8d7e00c Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
193: ccb2ccc = 193: b413a33 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
194: e143deb = 194: 3bdd52e Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests195: 2e379b2 = 195: 749a3bc Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
196: 48d4179 = 196: c72b43d Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t197: 3a6089f = 197: dcbc69f Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory198: 65d4cb7 = 198: 6d0be8b Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
199: b7d6e5d = 199: 6e55794 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
200: 7701a72 = 200: 13adb7d Merge branch 'optionally-dont-append-atomically-on-windows'
201: b2857b1 = 201: 55747a0 Merge branch 'fsync-object-files-always'
202: 5154861 = 202: 8a3ab39 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
203: 993d2b4 = 203: 54b38b4 Fix Windows version resources (Fix Windows version resources git#4092)
204: 9fb7fbb = 204: 2c6e0d0 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
205: 6a029ce = 205: 0e151ec Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)206: 0fe44fc = 206: 3c8510a Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)207: 2dc67aa = 207: d074b7e Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283208: 0ba28a6 = 208: 0edf9ee Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
209: 143b8e9 = 209: 310cc2f ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
210: 3a40e85 = 210: d40005c Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
211: 4cb02d6 = 211: 6788391 Merge branch 'nano-server'
212: fddb46d = 212: 1676197 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
213: 47b328a = 213: 59f3457 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
214: ca1574b = 214: 8978f01 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
215: c1214df = 215: 5c0cd9d Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
216: 8d4fceb = 216: b20b9bb Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
217: 85d2f01 = 217: 23bfee5 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
218: 411cf81 = 218: ffb9f4b Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
219: 0f6db04 = 219: 261dc3f Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
220: 237edb3 = 220: 1f7c890 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
221: 4abbfc8 = 221: d535f1f Merge branch 'reftable-vs-custom-allocators'
222: d63280f = 222: cdc085f Merge branch 'check-whitespace-only-downstream'
223: a98b26d = 223: 536befd 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)
224: c3ec22e = 224: 3b5ee2f Merge branch 'disallow-ntlm-auth-by-default'
225: db4c856 = 225: a7b7d0a Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)226: 3f49097 = 226: fa521d7 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
227: 6ceb0dd = 227: ca14913 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
228: 483c3ea = 228: 7b19adb entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
229: 0708222 = 229: 660e08e ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)230: db5b6dd = 230: d5fdb5b Merge branch 'msys2'
231: c56fb0f = 231: bec3c22 Merge 'docker-volumes-are-no-symlinks'
232: 3b0b912 = 232: ee44cd0 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
233: 44d8e37 = 233: ac19846 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
234: 25e1cd9 = 234: 41fcc03 Merge branch 'dont-clean-junctions'
235: ff28ae4 = 235: ca67eae Merge branch 'wsl-file-mode-bits'
236: da82d00 = 236: a541b6f Merge branch 'validate-dotgit'
237: 764b413 = 237: 766d8ce Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
238: e0c2fee = 238: ce61c6e Merge branch 'skip-rust-in-the-coverity-builds'
239: 1edac29 = 239: ecc82c1 Merge branch 'ready-for-upstream'
240: 2e1408d = 240: 4e98871 Win32: make FILETIME conversion functions public
241: d1ecef5 = 241: 1080f68 Win32: dirent.c: Move opendir down
242: 0f58461 = 242: 40f80d0 mingw: make the dirent implementation pluggable
243: 415bb80 = 243: 5ebb74a Win32: make the lstat implementation pluggable
245: 9fa1b07 = 244: bd94a78 mingw: add infrastructure for read-only file system level caches
247: 765a2f1 = 245: af07c8c mingw: add a cache below mingw's lstat and dirent implementations
248: 4ec78be = 246: e6c127b fscache: load directories only once
249: 8761b29 = 247: 2c23f08 fscache: add key for GIT_TRACE_FSCACHE
250: 14cce94 = 248: da40616 fscache: remember not-found directories
251: 075e8a8 = 249: 72c0c42 fscache: add a test for the dir-not-found optimization
252: 662c76d = 250: 711e29a add: use preload-index and fscache for performance
253: 1818881 = 251: 38f2409 dir.c: make add_excludes aware of fscache during status
254: ca82a3b = 252: eb95c3b fscache: make fscache_enabled() public
255: ceb72ab = 253: 54fc981 dir.c: regression fix for add_excludes with fscache
256: 5f8b2bc = 254: 05c0422 fetch-pack.c: enable fscache for stats under .git/objects
257: 05f9cd7 = 255: 88b72c0 checkout.c: enable fscache for checkout again
258: c471a18 = 256: 3c74fd7 Enable the filesystem cache (fscache) in refresh_index().
259: fd7f5c7 = 257: 3c4cba1 fscache: use FindFirstFileExW to avoid retrieving the short name
244: 70a343f = 258: 2541779 git-gui--askyesno: fix funny text wrapping
260: 6eed08e = 259: cf10ada fscache: add GIT_TEST_FSCACHE support
246: d757f3c = 260: 74fc34d git-gui--askyesno (mingw): use Git for Windows' icon, if available
261: 9e6a0eb = 261: cd2fc25 fscache: add fscache hit statistics
262: 5a91e27 = 262: 0a87194 unpack-trees: enable fscache for sparse-checkout
263: 010a08a = 263: 9cc9d1e status: disable and free fscache at the end of the status command
264: 1ced5d7 = 264: b8ab7b5 mem_pool: add GIT_TRACE_MEMPOOL support
265: 382a88f = 265: b8b50ad fscache: fscache takes an initial size
266: 790a6b4 = 266: e696e22 fscache: update fscache to be thread specific instead of global
267: 3dac0cf = 267: c3e0a57 fscache: teach fscache to use mempool
268: c67e968 = 268: 5f07ade fscache: make fscache_enable() thread safe
269: da65dab = 269: 1d2856f fscache: teach fscache to use NtQueryDirectoryFile
270: 80241eb = 270: 48fdcb4 fscache: remember the reparse tag for each entry
271: 8aea631 = 271: 4b22296 fscache: Windows Docker volumes are not symbolic links
272: 36c49c6 = 272: 13ffe1b fscache: optionally enable wsl compability file mode bits
273: f80e14e = 273: 9c5d730 Merge branch 'fscache'
274: aee17ee = 274: 01d9d60 fscache: implement an FSCache-aware is_mount_point()
275: 1ec5e9c = 275: f9deb85 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
276: 455f29a = 276: 4ccd670 clean: make use of FSCache
277: d07b7ef = 277: 092cc32 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
278: 417a2e8 = 278: fb24cc0 Merge branch 'dont-clean-junctions-fscache'
279: 3f0cb37 = 279: eef3bbf pack-objects (mingw): demonstrate a segmentation fault with large deltas
280: 2167c46 = 280: 75d4f19 mingw: support long paths
281: a79c857 = 281: f20f19f win32(long path support): leave drive-less absolute paths intact
282: 91341af = 282: c059dd6 compat/fsmonitor/fsm-*-win32: support long paths
283: cadc342 = 283: b8bdc58 clean: suggest using
core.longPathsif paths are too long to remove284: ec5edae = 284: d89218a mingw: explicitly specify with which cmd to prefix the cmdline
285: 269956e = 285: 66d5765 mingw: when path_lookup() failed, try BusyBox
286: fe9affd = 286: 9b04720 test-tool: learn to act as a drop-in replacement for
iconv287: ca80f9a = 287: 0c2d97b tests(mingw): if
iconvis unavailable, usetest-helper --iconv288: 99762f2 = 288: 400d67b gitattributes: mark .png files as binary
289: 30fb7fe = 289: 28a18ae tests: move test PNGs into t/lib-diff/
290: 1077dc4 = 290: a84f89f tests: only override sort & find if there are usable ones in /usr/bin/
291: 7c13b3c = 291: 6e1d4e4 tests: use the correct path separator with BusyBox
292: 1444ca5 = 292: 3d3bcc8 mingw: only use Bash-ism
builtin pwd -Wwhen available293: e028e0b = 293: a103154 tests (mingw): remove Bash-specific pwd option
294: 656a5d2 = 294: 6468397 test-lib: add BUSYBOX prerequisite
295: 56b3ea5 = 295: 7725a2e t5003: use binary file from t/lib-diff/
296: 874b7e8 = 296: ec691a6 t5532: workaround for BusyBox on Windows
297: 1c5740e = 297: 5f6527c t5605: special-case hardlink test for BusyBox-w32
298: 7b6213d = 298: 7572ecd t5813: allow for $PWD to be a Windows path
299: 9b2770b = 299: bcbebe0 t9200: skip tests when $PWD contains a colon
300: da223aa = 300: 17bc5a0 Describe Git for Windows' architecture
301: 8ef0fd5 = 301: eacb7b4 Add an AGENTS.md file to help with AI-assisted debugging/development
302: e0e4f3d = 302: bf910ab Modify the Code of Conduct for Git for Windows
303: cba2bfb = 303: 125468e Merge branch 'gitk-and-git-gui-patches'
304: a2c41d9 = 304: 8451d01 CONTRIBUTING.md: add guide for first-time contributors
305: 999b666 = 305: d4168b8 Merge branch 'long-paths'
306: 6bd37bf = 306: 1806932 README.md: Add a Windows-specific preamble
307: 8c2fc3a = 307: 7a96186 Partially un-revert "editor: save and reset terminal after calling EDITOR"
308: f5990b1 = 308: b51a3ea Merge branch 'busybox-w32'
309: bb28765 = 309: 3346019 Add an issue template
310: f2d53d1 = 310: 1658ca3 reset: reinstate support for the deprecated --stdin option
311: ae76d38 = 311: e8cf09f Merge branch 'un-revert-editor-save-and-reset'
312: f43329c = 312: 4ce55bd Modify the GitHub Pull Request template (to reflect Git for Windows)
313: fde258c = 313: db4b775 Add a GitHub workflow to monitor component updates
314: a15448f = 314: a2d2fec fsmonitor: reintroduce core.useBuiltinFSMonitor
315: 2275b76 = 315: 21cf09c Merge branch 'phase-out-reset-stdin'
316: ab58251 = 316: 60541b4 SECURITY.md: document Git for Windows' policies
317: b1504d5 = 317: 07fd698 dependabot: help keeping GitHub Actions versions up to date
318: af8ffc0 = 318: 70e752b Merge branch 'deprecate-core.useBuiltinFSMonitor'
319: ca0b649 = 319: 6d972cc ci: only run the expensive tests in the Windows tests for now
320: 5bae4df = 320: b497c58 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
321: 6164344 = 321: 22fe6c5 Merge 'readme' into HEAD
322: bcf590b = 322: 06cb5b7 build(deps): bump actions/cache from 5 to 6
323: 1236ea8 = 323: 7c31d7e build(deps): bump actions/cache from 5 to 6 (build(deps): bump actions/cache from 5 to 6 git#6303)
324: 7c2fa94 ! 324: aa50eaf Some amendments for the
hashliteral_tsize fixes (Some amendments for thehashliteral_tsize fixes git#6311)325: a265f7b = 325: 90e1e62 repo: split annotated tags out from total tag count in structure
326: 4b56d06 = 326: b93260e repo: filter the structure scope via --ref-filter=
327: 38f77bc = 327: 7c9168f repo: report top-N paths by count, disk, and inflated size in structure
328: 633d4a3 = 328: 77439f2 t1901: cover the --top option of
git repo structure329: 55216ab = 329: bcdb7dc repo: read the
--topdefault fromrepo.structure.top330: baeefa2 = 330: 2e47323 git-survey: announce the upcoming pivot into
git repo structure331: b5e8602 = 331: c534681 survey: turn into a thin shim over
git repo structure332: 75a75f8 = 332: 466a00d Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)333: e6754fe = 333: 730ff31 fixup! run-command: be helpful with Git LFS fails on Windows 7
334: 2ea633c = 334: d116627 Drop Windows 7 support (Drop Windows 7 support git#6325)
335: 7608b4a = 335: cd8f3be Merge tag 'v2.55.0.windows.3'
Truncated; see the full conflict report in the workflow run summary.