Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#31733293229) - #372
Open
gitforwindowshelper[bot] wants to merge 320 commits into
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#31733293229)#372gitforwindowshelper[bot] wants to merge 320 commits into
gitforwindowshelper[bot] wants to merge 320 commits into
Conversation
Atomic append on windows is only supported on local disk files, and it may cause errors in other situations, e.g. network file system. If that is the case, this config option should be used to turn atomic append off. Co-Authored-By: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: 孙卓识 <sunzhuoshi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
From the documentation of said setting: This boolean will enable fsync() when writing object files. This is a total waste of time and effort on a filesystem that orders data writes properly, but can be useful for filesystems that do not use journalling (traditional UNIX filesystems) or that only journal metadata and not file contents (OS X’s HFS+, or Linux ext3 with "data=writeback"). The most common file system on Windows (NTFS) does not guarantee that order, therefore a sudden loss of power (or any other event causing an unclean shutdown) would cause corrupt files (i.e. files filled with NULs). Therefore we need to change the default. Note that the documentation makes it sound as if this causes really bad performance. In reality, writing loose objects is something that is done only rarely, and only a handful of files at a time. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Whith Windows 2000, Microsoft introduced a flag to the PE header to mark executables as "terminal server aware". Windows terminal servers provide a redirected Windows directory and redirected registry hives when launching legacy applications without this flag set. Since we do not use any INI files in the Windows directory and don't write to the registry, we don't need this additional preparation. Telling the OS that we don't need this should provide slightly improved startup times in terminal server environments. When building for supported Windows Versions with MSVC the /TSAWARE linker flag is automatically set, but MinGW requires us to set the --tsaware flag manually. This partially addresses git-for-windows#3935. Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Add FileVersion, which is a required field As not all required fields were present, none were being included Fixes git-for-windows#4090 Signed-off-by: Kiel Hurley <kielhurley@gmail.com>
In f9b7573 (repository: free fields before overwriting them, 2017-09-05), Git was taught to release memory before overwriting it, but 357a03e (repository.c: move env-related setup code back to environment.c, 2018-03-03) changed the code so that it would not _always_ be overwritten. As a consequence, the `commondir` attribute would point to already-free()d memory. This seems not to cause problems in core Git, but there are add-on patches in Git for Windows where the `commondir` attribute is subsequently used and causing invalid memory accesses e.g. in setups containing old-style submodules (i.e. the ones with a `.git` directory within theirs worktrees) that have `commondir` configured. This fixes git-for-windows#4083. Signed-off-by: Andrey Zabavnikov <zabavnikov@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In 436a422 (max_tree_depth: lower it for clangarm64 on Windows, 2025-04-23), I provided a work-around for a nasty issue with clangarm builds, where the stack is exhausted before the maximal tree depth is reached, and the resulting error cannot easily be handled by Git (because it would require Windows-specific handling). Turns out that this is not at all limited to ARM64. In my tests with CLANG64 in MSYS2 on the GitHub Actions runners, the test t6700.4 failed in the exact same way. What's worse: The limit needs to be quite a bit lower for x86_64 than for aarch64. In aforementioned tests, the breaking point was 1232: With 1231 it still worked as expected, with 1232 it would fail with the `STATUS_STACK_OVERFLOW` incorrectly mapped to exit code 127. For comparison, in my tests on GitHub Actions' Windows/ARM64 runners, the breaking point was 1439 instead. Therefore the condition needs to be adapted once more, to accommodate (with some safety margin) both aarch64 and x86_64 in clang-based builds on Windows, to let that test pass. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ctory Internally, Git expects the environment variable `HOME` to be set, and to point to the current user's home directory. This environment variable is not set by default on Windows, and therefore Git tries its best to construct one if it finds `HOME` unset. There are actually two different approaches Git tries: first, it looks at `HOMEDRIVE`/`HOMEPATH` because this is widely used in corporate environments with roaming profiles, and a user generally wants their global Git settings to be in a roaming profile. Only when `HOMEDRIVE`/`HOMEPATH` is either unset or does not point to a valid location, Git will fall back to using `USERPROFILE` instead. However, starting with Windows Vista, for secondary logons and services, the environment variables `HOMEDRIVE`/`HOMEPATH` point to Windows' system directory (usually `C:\Windows\system32`). That is undesirable, and that location is usually write-protected anyway. So let's verify that the `HOMEDRIVE`/`HOMEPATH` combo does not point to Windows' system directory before using it, falling back to `USERPROFILE` if it does. This fixes git-for-windows#2709 Initial-Path-by: Ivan Pozdeev <vano@mail.mipt.ru> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
headless-git is a git executable without opening a console window. It is useful when other GUI executables want to call git. We should install it together with git on Windows. Signed-off-by: Yuyi Wang <Strawberry_Str@hotmail.com>
winuser.h contains the definition of RT_MANIFEST that our LLVM based toolchain needs to understand that we want to embed compat/win32/git.manifest as an application manifest. It currently just embeds it as additional data that Windows doesn't understand. This also helps our GCC based toolchain understand that we only want one copy embedded. It currently embeds one working assembly manifest and one nearly identical, but useless copy as additional data. This also teaches our Visual Studio based buildsystems to pick up the manifest file from git.rc. This means we don't have to explicitly specify it in contrib/buildsystems/Generators/Vcxproj.pm anymore. Slightly counter-intuitively this also means we have to explicitly tell Cmake not to embed a default manifest. This fixes git-for-windows#4707 Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
This will help with Git for Windows' maintenance going forward: It allows Git for Windows to switch its primary libcurl to a variant without the OpenSSL backend, while still loading an alternate when setting `http.sslBackend = openssl`. This is necessary to avoid maintenance headaches with upgrading OpenSSL: its major version name is encoded in the shared library's file name and hence major version updates (temporarily) break libraries that are linked against the OpenSSL library. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
While this command is definitely something we _want_, chances are that upstreaming this will require substantial changes. We still want to be able to experiment with this before that, to focus on what we need out of this command: To assist with diagnosing issues with large repositories, as well as to help monitoring the growth and the associated painpoints of such repositories. To that end, we are about to integrate this command into `microsoft/git`, to get the tool into the hands of users who need it most, with the idea to iterate in close collaboration between these users and the developers familar with Git's internals. However, we will definitely want to avoid letting anybody have the impression that this command, its exact inner workings, as well as its output format, are anywhere close to stable. To make that fact utterly clear (and thereby protect the freedom to iterate and innovate freely before upstreaming the command), let's mark its output as experimental in all-caps, as the first thing we do. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In 245670c (credential-cache: check for windows specific errors, 2021-09-14) we concluded that on Windows we would always encounter ENETDOWN where we would expect ECONNREFUSED on POSIX systems, when connecting to unix sockets. As reported in [1], we do encounter ECONNREFUSED on Windows if the socket file doesn't exist, but the containing directory does and ENETDOWN if neither exists. We should handle this case like we do on non-windows systems. [1] git-for-windows#4762 (comment) This fixes git-for-windows#5314 Helped-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>
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>
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>
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>
Smallest piece of the tree topic. link_len is only used as strbuf_splice()'s size_t length and as an array index; widening it outright removes the cast_size_t_to_ulong() shim and the bridge local that fed it. odb_read_object() now writes straight into link_len. Assisted-by: Opus 4.7 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>
Prep for dropping the cast_size_t_to_ulong() shim in add_preferred_base() (pack-objects.c), and aligns the public API with the size_t shape the rest of the tree topic is moving toward. struct tree_desc.size stays unsigned int -- the on-disk tree format hard-caps each tree at 4 GiB, so the field is intentionally narrow and the assignment in init_tree_desc_internal() already truncated unsigned long inputs the same way it now truncates size_t inputs. The widening is purely about the call-side type-correctness; the internal cap is unchanged. All 30+ callers pass values that promote cleanly (unsigned long, size_t, or smaller integer types). Assisted-by: Opus 4.7 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>
These are Git for Windows' Git GUI and gitk patches. We will have to decide at some point what to do about them, but that's a little lower priority (as Git GUI seems to be unmaintained for the time being, and the gitk maintainer keeps a very low profile on the Git mailing list, too). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
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>
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>
…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`.
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…tact Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is now required by `bc/parse-options-exit-0-on-help`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: seen
From: 4f672bba70 (fixup??? survey: stub in new experimental 'git-survey' command, 2026-08-01) (32c56ea30a..4f672bba70)
Resolved: 4fda550 (transport: optionally disable side-band-64k, 2014-05-08)
resolved by keeping the patch's conditional use_sideband logic and no-ref-delta check, replacing upstream's simple side-band-64k check
Range-diff
1: 4fda550 ! 1: 033cb17 transport: optionally disable side-band-64k
To: 421eca8b01 (fixup??? survey: stub in new experimental 'git-survey' command, 2026-08-01) (2ab550f210..421eca8b01)
Statistics
Range-diff (click to expand)
1: 4b10e01 = 1: e727fe5 unix-socket: avoid leak when initialization fails
2: fada87d = 2: f9d2af6 grep: prevent
^$false match at end of file3: 284f8e8 = 3: 6c2c387 Merge branch 'fixes-from-the-git-mailing-list'
4: 03d685d = 4: 54e9686 t9350: point out that refs are not updated correctly
5: 0658bea = 5: 4471611 transport-helper: add trailing --
6: ba8bd05 = 6: c965d5b remote-helper: check helper status after import/export
7: aee9a89 = 7: 84d00e8 bundle-uri: refuse advertised URIs by protocol
8: 7ad13b9 = 8: 54bce3a ci: bump actions/checkout from 6 to 7
9: b7e2321 = 9: d9e6427 Always auto-gc after calling a fast-import transport
10: b39d51e = 10: 2713359 mingw: prevent regressions with "drive-less" absolute paths
14: 5b1c37a = 11: 38a3b36 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
15: 1842858 = 12: 5f60211 vcpkg_install: detect lack of Git
16: 138f5c1 = 13: 9f8452c vcpkg_install: add comment regarding slow network connections
19: 1a247aa = 14: 1980616 vcbuild: install ARM64 dependencies when building ARM64 binaries
22: e0b4a4b = 15: 9662f1c vcbuild: add an option to install individual 'features'
24: adab4b4 = 16: 9c05fc7 cmake: allow building for Windows/ARM64
26: de01b2c = 17: a7be51e ci(vs-build) also build Windows/ARM64 artifacts
34: d081fc2 = 18: d5ccf9b mingw: demonstrate a
git addissue with NTFS junctions17: ba87fb8 = 19: 8907bed t5505/t5516: allow running without
.git/branches/in the templates28: 7631c99 = 20: 1db7d17 vcbuild: stop hard-coding OpenSSL as a dependency
37: 50d9f32 = 21: c04c353 strbuf_realpath(): use platform-dependent API if available
20: f8e6488 = 22: 4713cc4 t5505/t5516: fix white-space around redirectors
30: 1dedce7 = 23: 57f283e cmake(): allow setting HOST_CPU for cross-compilation
38: 5c5d337 = 24: c44c499 http: use new "best effort" strategy for Secure Channel revoke checking
11: 4fda550 ! 25: 033cb17 transport: optionally disable side-band-64k
12: fa2e843 = 26: 50e1c5b mingw: fix fatal error working on mapped network drives on Windows
13: 840592e = 27: b9691c2 clink.pl: fix MSVC compile script to handle libcurl-d.lib
46: eadc640 = 28: e3af5e1 mingw: implement a platform-specific
strbuf_realpath()47: 091607c = 29: 245c9c6 t3701: verify that we can add lots of files interactively
48: daebb2b = 30: f1bcf2e commit: accept "scissors" with CR/LF line endings
49: 2456a03 = 31: 08f3ced t0014: fix indentation
50: c07014a = 32: 315a602 git-gui: accommodate for intent-to-add files
51: fab7dcd = 33: 2e66388 mingw: allow for longer paths in
parse_interpreter()52: dacf8be = 34: e5881b3 compat/vcbuild: document preferred way to build in Visual Studio
18: d1578bd = 35: 577f946 max_tree_depth: lower it for clang builds in general on Windows
64: 124037a = 36: 4ab3d08 revision: create mark_trees_uninteresting_dense()
21: de96e49 = 37: 9f93bc8 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
65: 54468ec = 38: 0cbc427 survey: stub in new experimental 'git-survey' command
23: 7ac32e9 = 39: 5c18255 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
66: e31e8a0 = 40: 4f4d397 survey: add command line opts to select references
25: e7635a8 = 41: 86a0606 clink.pl: fix libexpatd.lib link error when using MSVC
68: dc090f2 = 42: 2fc9366 survey: start pretty printing data in table form
27: 1b152dc = 43: fc39d46 Makefile: clean up .ilk files when MSVC=1
70: bf80e79 = 44: c870e67 survey: add object count summary
29: 9ca21bb = 45: 7eea863 vcbuild: add support for compiling Windows resource files
72: bc1ad85 = 46: 6fff978 survey: summarize total sizes by object type
31: 89e4215 = 47: 2b6e632 config.mak.uname: add git.rc to MSVC builds
45: 96772eb = 48: 04e7ccd MinGW: link as terminal server aware
74: 3090d39 = 49: 4504153 survey: show progress during object walk
75: cecbe16 = 50: c6488fd mingw: make sure
errnois set correctly when socket operations fail32: d08f9b3 = 51: d0a39d5 CMake: default Visual Studio generator has changed
33: 2a8a1d0 = 52: c400fb0 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
79: a935c07 = 53: 675f701 http: optionally load libcurl lazily
80: 0708963 = 54: 6098320 survey: add ability to track prioritized lists
81: 9f7e3c3 = 55: c160640 compat/mingw: handle WSA errors in strerror
35: 037e50a = 56: 3997b02 .gitignore: add Visual Studio CMakeSetting.json file
36: 1e055e9 = 57: 8cbb77e clink.pl: move default linker options for MSVC=1 builds
85: 733531d = 58: bffa993 http: support lazy-loading libcurl also on Windows
86: 810463e = 59: 8dc636a survey: add report of "largest" paths
87: 999f368 = 60: dda6795 compat/mingw: drop outdated comment
39: 3eb213c = 61: b3f4ae3 subtree: update
contrib/subtreetesttarget40: d192005 = 62: 194edfb CMakeLists: add default "x64-windows" arch for Visual Studio
41: 5ddc423 = 63: cca83ac hash-object: add another >4GB/LLP64 test case
42: 7c8b44d = 64: 42620c3 setup: properly use "%(prefix)/" when in WSL
43: 98f8f3d = 65: 1e86629 Add config option
windows.appendAtomically44: 2527f5a = 66: b91ec0d cmake: install headless-git.
91: 5c954e3 = 67: c988192 http: when loading libcurl lazily, allow for multiple SSL backends
92: 9f086ec = 68: e1d97d3 survey: add --top= option and config
93: 1547087 = 69: cf65721 t0301: actually test credential-cache on Windows
53: 1aeb814 = 70: b02ea49 http: optionally send SSL client certificate
54: 992103c = 71: 6c06c93 ci: run
contrib/subtreetests in CI builds55: 41ed726 = 72: 5926846 CMake: show Win32 and Generator_platform build-option values
56: b6be56a = 73: def5791 hash-object: add a >4GB/LLP64 test case using filtered input
57: 5e6c901 = 74: e10fb1e compat/mingw.c: do not warn when failing to get owner
58: e375033 = 75: d2c09f7 mingw: $env:TERM="xterm-256color" for newer OSes
59: c70b5df = 76: 7230b92 winansi: check result and Buffer before using Name
60: 09e67fe = 77: 7e71c44 mingw: change core.fsyncObjectFiles = 1 by default
61: 31f13dd = 78: 9a7ef65 Fix Windows version resources
62: 7ae6b88 = 79: 48cd4c5 status: fix for old-style submodules with commondir
63: 5b41520 = 80: 17982d3 git.rc: include winuser.h
97: 7820f7f = 81: 9148a99 mingw: do load libcurl dynamically by default
98: 05f9d65 = 82: f529afa Add a GitHub workflow to verify that Git/Scalar work in Nano Server
99: 29a5fd0 = 83: 5b2baaa mingw: suggest
windows.appendAtomicallyin more cases100: 1ad6213 = 84: a667382 win32: use native ANSI sequence processing, if possible
101: 1456829 = 85: f64045b common-main.c: fflush stdout buffer upon exit
102: 517aa2e = 86: 780284f t5601/t7406(mingw): do run tests with symlink support
103: 42a20cc = 87: ac2a60c Fallback to AppData if XDG_CONFIG_HOME is unset
104: a3015ea = 88: 39825d6 survey: clearly note the experimental nature in the output
105: bc5ca3e = 89: 4ca78b4 credential-cache: handle ECONNREFUSED gracefully
67: 8dd0dc9 = 90: b71d63f mingw: Support
git_terminal_promptwith more terminals69: 5cc92d5 = 91: 5e05c72 compat/terminal.c: only use the Windows console if bash 'read -r' fails
116: 028a486 = 92: 1a365c4 diff: stop truncating the deflated-binary-diff size on Windows
71: 4039bbe = 93: 1c339ac mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
117: 14af64e = 94: a52a0cf convert: widen gather_convert_stats() helpers to size_t
73: 0d0d331 = 95: aca27d7 Win32: symlink: move phantom symlink creation to a separate function
118: 31c4a79 = 96: 9cd9ee3 read-cache: stop truncating index blob sizes on Windows
76: f99a8ff = 97: c5dc932 t5563: verify that NTLM authentication works
77: 322c296 = 98: 7b87345 mingw: introduce code to detect whether we're inside a Windows container
78: 45078d4 = 99: 6b778e6 Introduce helper to create symlinks that knows about index_state
119: 24d3b3b = 100: 3e52a54 xdiff-interface: widen buffer_is_binary() size parameter to size_t
120: 50fc9ce = 101: f953092 tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
82: 4ef2e87 = 102: fcbf12d http: disallow NTLM authentication by default
83: 12d2445 = 103: 602d111 mingw: when running in a Windows container, try to rename() harder
84: 8312fb9 = 104: 9a32ded mingw: allow to specify the symlink type in .gitattributes
121: 3fdf717 = 105: 7bd97ea combine-diff: stop truncating combined-diff blob sizes on Windows
122: cec885d = 106: e46507f tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
88: 75a5041 = 107: 13ebe47 http: warn if might have failed because of NTLM
89: 686844a = 108: 5d7ea9f mingw: move the file_attr_to_st_mode() function definition
90: 28478f2 = 109: 787632a Win32: symlink: add test for
symlinkattribute123: 6884a6b = 110: 7f83fb5 diff: widen textconv_object() size out-param to size_t
126: 92588e1 = 111: e8fd4d3 pack-objects: drop the two tree-walk casts in the preferred-base path
94: ef50f03 = 112: a48bc63 credential: advertise NTLM suppression and allow helpers to re-enable
95: 69c979b = 113: 7782d89 mingw: Windows Docker volumes are not symbolic links
96: 185d6c9 = 114: eb7163f clean: do not traverse mount points
124: f939c85 = 115: 3199221 pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
127: 162bd14 = 116: 96d2c77 diffcore: widen struct diff_filespec.size to size_t
129: d754e6b = 117: 32d74b7 tree: widen struct tree.size and parse_tree_buffer() to size_t
131: 8fdcccd = 118: e7bdfc9 commit: widen the commit-buffer API to size_t
133: 174f524 = 119: acb15da blame: widen find_line_starts() len parameter to size_t
135: 1ebcfb3 = 120: ca21a4c grep: widen struct grep_source.size and grep_buffer() to size_t
106: 8ce9355 = 121: 1d13139 reftable: do make sure to use custom allocators
107: 615b48f = 122: d984e49 check-whitespace: avoid alerts about upstream commits
108: 5a7a767 = 123: 69d480d t/t5571-prep-push-hook.sh: Add test with writing to stderr
109: 46c5c58 = 124: 14e6e06 dir: do not traverse mount points
110: b0352f5 = 125: 2b8ad1c win32: thread-utils: handle multi-socket systems
111: 2f45970 = 126: 6f332fa t5563: add tests for http.emptyAuth with Negotiate
112: e01a12e = 127: 772b298 entry: flush fscache after creating directories and writing files
113: c85bf66 = 128: 4936f26 ci(macos): skip the
git p4tests114: 14e991e = 129: ba1babc mingw: work around rename() failing on a read-only file
115: 14278bb = 130: 0652cd7 clean: remove mount points when possible
141: fd4c2ce = 131: 8f08b4c mingw: optionally enable wsl compability file mode bits
142: 4d57edf = 132: ba0ff11 Refuse to follow invalid paths in
.gitfiles125: 33494cd = 133: 18c3556 Merge branch 'size-t/pack-objects-delta'
128: d931d1b = 134: 8f3b884 Merge branch 'size-t/pack-bitmap'
130: 18d086c = 135: fc06672 Merge branch 'size-t/diff'
132: 9f36675 = 136: d0af005 Merge branch 'size-t/tree'
134: 7257410 = 137: 87cc893 Merge branch 'size-t/commit'
136: cdaf564 = 138: eaa6985 Merge branch 'size-t/blame'
137: 9883137 = 139: 53e9742 fast-export: drop the export_blob() size cast and widen anonymize_blob()
138: 95ba172 = 140: d50d976 Merge branch 'size-t/grep'
139: 7a614cf = 141: c86cf0c repo: drop the inflated-size cast in count_objects()
143: a93ae8e = 142: 90c2069 Merge branch 'size-t/fast-export'
140: 3d642ce = 143: becdf04 unpack-objects: widen the size-passing infrastructure to size_t
144: fcdec93 = 144: 61e8264 Merge branch 'size-t/repo'
145: c444f58 = 145: edb05c3 Merge branch 'size-t/unpack-objects'
146: b0edd84 = 146: a37c5af Merge branch 'topic/size-t' into size-t-followups
147: 4d0b80b = 147: 3696026 pack-objects: drop cast_size_t_to_ulong shims in get_delta()
148: 60be27c = 148: e051bfd pack-objects: drop cast_size_t_to_ulong shims in try_delta()
149: 8c61644 = 149: 1594feb pack-objects: drop the last size shim in write_no_reuse_object()
150: 5fe422e = 150: 12c1a6e blame: widen struct blame_scoreboard.final_buf_size to size_t
151: 5bde5fd = 151: a1dd5fc fast-import: drop the six size casts in the object-read paths
152: c51d4d7 = 152: e63704d t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
157: 1464bc0 = 153: afa1ddb Drop the
cast_size_t_to_ulong()helper158: b5a2f91 = 154: 66e852c Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
153: 907ae42 = 155: e592703 Merge tag 'v2.55.0.windows.4'
160: 5f1b92c = 156: a0e34fe Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
161: b96d80f = 157: cce23f3 coverity: skip building with Rust, for now
154: afad3f1 = 158: bcccc4c Merge branch 'bump-ci-actions/checkout-from-6-to-7'
155: 1cddaae = 159: 3cc71f0 Merge 'remote-hg-prerequisites' into HEAD
156: 0f05a87 = 160: ee18324 Merge branch 'drive-prefix'
159: 4027563 = 161: f0b97c1 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
162: b3e722d = 162: 6f25af4 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
163: 8af9410 = 163: 86aeee1 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
164: c5d5831 = 164: d4cf49f Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction165: d3464c9 = 165: 351a7d4 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
166: f64c32e = 166: 804ba61 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
167: 0fc12c3 = 167: 580c94d Merge 'add-p-many-files'
168: 5d9afa3 = 168: 5590c3c Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
169: ff09abf = 169: f85f103 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
170: 07cd154 = 170: 8b6f0c7 Merge 'git-gui/js/intent-to-add'
171: d948834 = 171: 856e0c4 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
172: 78d78fe = 172: 93f1fed Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
173: 8a4d306 = 173: cfcd10c Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
174: ac66959 = 174: ce7a978 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path175: 084fef3 = 175: 5471c2d Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
176: b444263 = 176: 0ed75bc Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
177: af8b7ea = 177: 0589eaf Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests178: d399da5 = 178: 8d53902 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
179: a80cc35 = 179: bf935b7 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t180: 3a4f3a9 = 180: 1f75a79 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory181: 7bcb5b7 = 181: 2e438a7 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
182: a481913 = 182: 46f2163 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
183: ab00a50 = 183: 981643b Merge branch 'optionally-dont-append-atomically-on-windows'
184: 0b3c4e0 = 184: 6137a47 Merge branch 'fsync-object-files-always'
185: a43f725 = 185: 90bf4cc Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
186: a7eb5b5 = 186: 2bd9ede Fix Windows version resources (Fix Windows version resources git#4092)
187: 215e1eb = 187: 4d66dec Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
188: 3621aa6 = 188: f13d9a7 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)189: b16b970 = 189: b880a65 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283190: 71750df = 190: 18c84bf Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
191: 3e8bb62 = 191: 5c317c9 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
192: 10f260b = 192: 86010c0 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
193: e9ee3c3 = 193: bcef4b2 Merge branch 'nano-server'
194: 83036be = 194: 8e4d6c1 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
195: 96b5b21 = 195: fc33a41 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
196: 6902971 = 196: 40a4eb4 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
197: 795ceb3 = 197: 4af6b06 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
198: 4978121 = 198: ef95e0e Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
199: e9e708a = 199: e5a3399 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
200: 330ca93 = 200: 04a1732 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
201: 3e29422 = 201: bedd509 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
202: 3b6c624 = 202: 76ec7da Merge branch 'reftable-vs-custom-allocators'
203: d4a2fbb = 203: ecb48a7 Merge branch 'check-whitespace-only-downstream'
204: 0be0729 = 204: a1fb118 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)
205: 0f58bf6 = 205: 00008c4 Merge branch 'disallow-ntlm-auth-by-default'
206: 82ac347 = 206: 92084a8 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)207: fc1b733 = 207: 23d21aa Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
208: f28b784 = 208: 50eafa0 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
209: c9dbcbb = 209: 639b67b entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
210: b7fb7f2 = 210: 9b578eb ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)211: 90c0178 = 211: e718063 Merge branch 'msys2'
212: c8df192 = 212: 44b55a3 Merge 'docker-volumes-are-no-symlinks'
213: fe0c120 = 213: a68ca3a mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
214: 6ed00d0 = 214: f329dae Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
215: ffc279f = 215: 4a4745c Merge branch 'dont-clean-junctions'
216: 9bf6e6d = 216: 929c312 Merge branch 'wsl-file-mode-bits'
217: 45a087c = 217: 0cc7d51 Merge branch 'validate-dotgit'
218: 060caf9 = 218: a19b455 Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
219: 2162199 = 219: fe10e9f Merge branch 'skip-rust-in-the-coverity-builds'
220: 82f8fe9 = 220: a46f13e Merge branch 'ready-for-upstream'
236: 4256338 = 221: 1b9ae01 git-gui--askyesno: fix funny text wrapping
238: 1524d80 = 222: 46a8509 git-gui--askyesno (mingw): use Git for Windows' icon, if available
221: d7ce514 = 223: 2694b60 Win32: make FILETIME conversion functions public
222: 8921041 = 224: 65ee470 Win32: dirent.c: Move opendir down
223: d12b01c = 225: 15cb165 mingw: make the dirent implementation pluggable
224: b368c2f = 226: 6e6df72 Win32: make the lstat implementation pluggable
225: 526c031 = 227: f055a3a mingw: add infrastructure for read-only file system level caches
226: 0103e46 = 228: 45dd8f5 mingw: add a cache below mingw's lstat and dirent implementations
227: 8f3bfa8 = 229: 9a264d9 fscache: load directories only once
228: 738981d = 230: 4fa4cce fscache: add key for GIT_TRACE_FSCACHE
229: 08edf57 = 231: 4406524 fscache: remember not-found directories
230: 2fb65fc = 232: 79a3a6a fscache: add a test for the dir-not-found optimization
231: afa86ae = 233: f469457 add: use preload-index and fscache for performance
232: 774c64c = 234: 9776402 dir.c: make add_excludes aware of fscache during status
233: 19685a3 = 235: 6bd4d30 fscache: make fscache_enabled() public
234: 4c803be = 236: f6aa6c2 dir.c: regression fix for add_excludes with fscache
235: 0fafe85 = 237: 2972b30 fetch-pack.c: enable fscache for stats under .git/objects
237: 48a9440 = 238: 913a1b9 checkout.c: enable fscache for checkout again
239: 7497b65 = 239: 24637e4 Enable the filesystem cache (fscache) in refresh_index().
240: 0f4806a = 240: 6a98bbd fscache: use FindFirstFileExW to avoid retrieving the short name
241: 9cb1fdb = 241: d998bf3 fscache: add GIT_TEST_FSCACHE support
242: 561e63e = 242: 5f6b4ac fscache: add fscache hit statistics
243: 797337c = 243: be08ac2 unpack-trees: enable fscache for sparse-checkout
244: 8c51ebb = 244: 24fa45c status: disable and free fscache at the end of the status command
245: fb5739c = 245: 55399dc mem_pool: add GIT_TRACE_MEMPOOL support
246: 4d8f0b5 = 246: 4eed917 fscache: fscache takes an initial size
247: f9071d0 = 247: 04fcfa4 fscache: update fscache to be thread specific instead of global
248: cc37fe1 = 248: 35f2659 fscache: teach fscache to use mempool
249: 78c0ee0 = 249: 4778a5e fscache: make fscache_enable() thread safe
250: 5647431 = 250: 73f5e0c fscache: teach fscache to use NtQueryDirectoryFile
251: bd5bc43 = 251: 4d9630c fscache: remember the reparse tag for each entry
252: dc087b0 = 252: deabdf9 fscache: Windows Docker volumes are not symbolic links
253: 89b798e = 253: a3567ec fscache: optionally enable wsl compability file mode bits
254: 22b99cc = 254: c6a2247 Merge branch 'fscache'
255: bba0b6b = 255: 9c17b78 fscache: implement an FSCache-aware is_mount_point()
256: bb07f60 = 256: f84e573 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
257: d8e8a47 = 257: 4e7a31f clean: make use of FSCache
258: a42bf42 = 258: c971ab6 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
259: c889a49 = 259: 8ff2876 Merge branch 'dont-clean-junctions-fscache'
260: 3bd888a = 260: a9d5823 pack-objects (mingw): demonstrate a segmentation fault with large deltas
261: e044951 = 261: 8d372db mingw: support long paths
262: a7f69c8 = 262: c23b525 win32(long path support): leave drive-less absolute paths intact
263: 9603383 = 263: 48a1a9d compat/fsmonitor/fsm-*-win32: support long paths
264: a3d00a1 = 264: 569476d clean: suggest using
core.longPathsif paths are too long to remove265: b719ade = 265: 2acaf1c mingw: explicitly specify with which cmd to prefix the cmdline
266: d99a610 = 266: e6da21c mingw: when path_lookup() failed, try BusyBox
267: 724cbf8 = 267: b339af3 test-tool: learn to act as a drop-in replacement for
iconv268: 0afc306 = 268: b30b6bd tests(mingw): if
iconvis unavailable, usetest-helper --iconv269: 1f8f6d0 = 269: 8af7314 gitattributes: mark .png files as binary
270: 0730d94 = 270: 8acef04 tests: move test PNGs into t/lib-diff/
271: 2c011e6 = 271: 9193dae tests: only override sort & find if there are usable ones in /usr/bin/
272: d218c88 = 272: 4fcff18 tests: use the correct path separator with BusyBox
273: a2044bd = 273: 7372ef6 mingw: only use Bash-ism
builtin pwd -Wwhen available274: 2f7672d = 274: 6a01142 tests (mingw): remove Bash-specific pwd option
275: 35b401a = 275: 007283b test-lib: add BUSYBOX prerequisite
276: 45eb33d = 276: e33a7fd t5003: use binary file from t/lib-diff/
277: 1cc08d4 = 277: 3cde36f t5532: workaround for BusyBox on Windows
278: 63e8c09 = 278: 07c60d0 t5605: special-case hardlink test for BusyBox-w32
279: 38e5c6b = 279: e95609a t5813: allow for $PWD to be a Windows path
280: 152831b = 280: aaef738 t9200: skip tests when $PWD contains a colon
281: 85b794f = 281: c9c8df5 Describe Git for Windows' architecture
282: 8a6b160 = 282: c0b894f Add an AGENTS.md file to help with AI-assisted debugging/development
283: 3ce9c98 = 283: 37d0895 Modify the Code of Conduct for Git for Windows
284: a22af66 = 284: c8aae58 CONTRIBUTING.md: add guide for first-time contributors
292: 1640811 = 285: 5f961a0 Add a GitHub workflow to monitor component updates
285: 3475c45 = 286: b495a52 README.md: Add a Windows-specific preamble
290: 018561c = 287: a66cf14 Partially un-revert "editor: save and reset terminal after calling EDITOR"
294: 5da1c77 = 288: 5eba425 reset: reinstate support for the deprecated --stdin option
296: d48e99d = 289: 9121882 fsmonitor: reintroduce core.useBuiltinFSMonitor
297: 9c899be = 290: 769509c dependabot: help keeping GitHub Actions versions up to date
286: 2eaad1b = 291: e4538e7 Merge branch 'gitk-and-git-gui-patches'
288: 73f8740 = 292: 1e1e2de Merge branch 'long-paths'
291: 00a80f8 = 293: debec99 Merge branch 'busybox-w32'
287: 898abc4 = 294: 6457688 Add an issue template
295: 332100c = 295: 0781d08 Merge branch 'un-revert-editor-save-and-reset'
289: 110365e = 296: d614b31 Modify the GitHub Pull Request template (to reflect Git for Windows)
299: 4cee462 = 297: 50929f1 Merge branch 'phase-out-reset-stdin'
293: fb42198 = 298: 73c8349 SECURITY.md: document Git for Windows' policies
300: 84fedc1 = 299: 52bf7e9 Merge branch 'deprecate-core.useBuiltinFSMonitor'
298: 208015d = 300: 5a38b2f ci: only run the expensive tests in the Windows tests for now
301: 5eea5e6 = 301: a033f45 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
302: b7307c1 = 302: 48216fa Merge 'readme' into HEAD
303: 24544dc = 303: acf9ed6 build(deps): bump actions/cache from 5 to 6
304: 78e9194 = 304: 1623a62 build(deps): bump actions/cache from 5 to 6 (build(deps): bump actions/cache from 5 to 6 git#6303)
305: 4b046c0 = 305: f14c939 repo: split annotated tags out from total tag count in structure
306: c2a0378 = 306: 6f041a0 repo: filter the structure scope via --ref-filter=
307: 5c6f152 = 307: 1347532 repo: report top-N paths by count, disk, and inflated size in structure
308: febb649 = 308: a05c957 t1901: cover the --top option of
git repo structure309: 7833766 = 309: 245ba28 repo: read the
--topdefault fromrepo.structure.top310: 34f42dd = 310: 9c2b197 git-survey: announce the upcoming pivot into
git repo structure311: bd350e0 = 311: 044cea0 survey: turn into a thin shim over
git repo structure312: fa17406 = 312: 6ac745c Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)313: 1c30f01 = 313: feb686d fixup??? repo: filter the structure scope via --ref-filter=
314: ffa8f9f = 314: 6c227c1 fixup??? t1901: cover the --top option of
git repo structure315: 2739814 = 315: 55648f4 fixup??? repo: read the
--topdefault fromrepo.structure.top316: bc88691 = 316: 0cace2a fixup??? mingw: support long paths
317: da1cd2a = 317: 30665cf fixup??? win32(long path support): leave drive-less absolute paths intact
318: 4b02b24 = 318: 3f2f0dd fixup??? survey: stub in new experimental 'git-survey' command
319: fff2f98 = 319: 3286848 fixup??? survey: turn into a thin shim over
git repo structure320: 4f672bb = 320: 421eca8 fixup??? survey: stub in new experimental 'git-survey' command
Truncated; see the full conflict report in the workflow run summary.