Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#30416062618) - #342
Open
gitforwindowshelper[bot] wants to merge 331 commits into
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#30416062618)#342gitforwindowshelper[bot] wants to merge 331 commits into
gitforwindowshelper[bot] wants to merge 331 commits into
Conversation
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>
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>
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>
It is merely a historical wart that, say, `git-commit` exists in the `libexec/git-core/` directory, a tribute to the original idea to let Git be essentially a bunch of Unix shell scripts revolving around very few "plumbing" (AKA low-level) commands. Git has evolved a lot from there. These days, most of Git's functionality is contained within the `git` executable, in the form of "built-in" commands. To accommodate for scripts that use the "dashed" form of Git commands, even today, Git provides hard-links that make the `git` executable available as, say, `git-commit`, just in case that an old script has not been updated to invoke `git commit`. Those hard-links do not come cheap: they take about half a minute for every build of Git on Windows, they are mistaken for taking up huge amounts of space by some Windows Explorer versions that do not understand hard-links, and therefore many a "bug" report had to be addressed. The "dashed form" has been officially deprecated in Git version 1.5.4, which was released on February 2nd, 2008, i.e. a very long time ago. This deprecation was never finalized by skipping these hard-links, but we can start the process now, in Git for Windows. 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>
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>
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>
The reftable library goes out of its way to use its own set of allocator functions that can be configured using `reftable_set_alloc()`. However, Git does not configure this. That is not typically a problem, except when Git uses a custom allocator via some definitions in `git-compat-util.h`, as is the case in Git for Windows (which switched away from the long-unmaintained nedmalloc to mimalloc). Then, it is quite possible that Git assigns a `strbuf` (allocated via the custom allocator) to, say, the `refname` field of a `reftable_log_record` in `write_transaction_table()`, and later on asks the reftable library function `reftable_log_record_release()` to release it, but that function was compiled without using `git-compat-util.h` and hence calls regular `free()` (i.e. _not_ the custom allocator's own function). This has been a problem for a long time and it was a matter of some sort of "luck" that 1) reftables are not commonly used on Windows, and 2) mimalloc can often ignore gracefully when it is asked to release memory that it has not allocated. However, a recent update to `seen` brought this problem to the forefront, letting t1460 fail in Git for Windows, with symptoms much in the same way as the problem I had to address in d02c37c (t-reftable-basics: allow for `malloc` to be `#define`d, 2025-01-08) where exit code 127 was also produced in lieu of `STATUS_HEAP_CORRUPTION` (C0000374) because exit codes are only 7 bits wide. It was not possible to figure out what change in particular caused these new failures within a reasonable time frame, as there are too many changes in `seen` that conflict with Git for Windows' patches, I had to stop the investigation after spending four hours on it fruitlessly. To verify that this patch fixes the issue, I avoided using mimalloc and temporarily patched in a "custom allocator" that would more reliably point out problems, like this: diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c index 68f3829..9421d630b9f5 100644 --- a/refs/reftable-backend.c +++ b/refs/reftable-backend.c @@ -353,6 +353,69 @@ static int reftable_be_fsync(int fd) return fsync_component(FSYNC_COMPONENT_REFERENCE, fd); } +#define DEBUG_REFTABLE_ALLOC +#ifdef DEBUG_REFTABLE_ALLOC +#include "khash.h" + +static inline khint_t __ac_X31_hash_ptr(void *ptr) +{ + union { + void *ptr; + char s[sizeof(void *)]; + } u; + size_t i; + khint_t h; + + u.ptr = ptr; + h = (khint_t)*u.s; + for (i = 0; i < sizeof(void *); i++) + h = (h << 5) - h + (khint_t)u.s[i]; + return h; +} + +#define kh_ptr_hash_func(key) __ac_X31_hash_ptr(key) +#define kh_ptr_hash_equal(a, b) ((a) == (b)) + +KHASH_INIT(ptr, void *, int, 0, kh_ptr_hash_func, kh_ptr_hash_equal) + +static kh_ptr_t *my_malloced; + +static void *my_malloc(size_t sz) +{ + int dummy; + void *ptr = malloc(sz); + if (ptr) + kh_put_ptr(my_malloced, ptr, &dummy); + return ptr; +} + +static void *my_realloc(void *ptr, size_t sz) +{ + int dummy; + if (ptr) { + khiter_t pos = kh_get_ptr(my_malloced, ptr); + if (pos >= kh_end(my_malloced)) + die("Was not my_malloc()ed: %p", ptr); + kh_del_ptr(my_malloced, pos); + } + ptr = realloc(ptr, sz); + if (ptr) + kh_put_ptr(my_malloced, ptr, &dummy); + return ptr; +} + +static void my_free(void *ptr) +{ + if (ptr) { + khiter_t pos = kh_get_ptr(my_malloced, ptr); + if (pos >= kh_end(my_malloced)) + die("Was not my_malloc()ed: %p", ptr); + kh_del_ptr(my_malloced, pos); + } + free(ptr); +} +#endif + static struct ref_store *reftable_be_init(struct repository *repo, const char *gitdir, unsigned int store_flags) @@ -362,6 +425,11 @@ static struct ref_store *reftable_be_init(struct repository *repo, int is_worktree; mode_t mask; +#ifdef DEBUG_REFTABLE_ALLOC + my_malloced = kh_init_ptr(); + reftable_set_alloc(my_malloc, my_realloc, my_free); +#endif + mask = umask(0); umask(mask); I briefly considered contributing this "custom allocator" patch, too, but it is unwieldy (for example, it would not work at all when compiling with mimalloc support) and it would only waste space (or even time, if a compile flag was introduced and exercised as part of the CI builds). Given that it is highly unlikely that Git will lose the new `reftable_set_alloc()` call by mistake, I rejected that idea as simply too wasteful. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Every once in a while, whitespace errors are introduced in Git for Windows' rebases to newer Git versions, simply by virtue of integrating upstream commits that do not follow upstream Git's own whitespace rule. In Git v2.50.0-rc0, for example, 03f2915 (xdiff: disable cleanup_records heuristic with --minimal, 2025-04-29) introduced a trailing space. Arguably, non-actionable alerts are worse than no alerts at all, so let's suppress those alerts that we cannot do anything about, anyway. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The 2.53.0.rc0.windows release candidate had a regression where writing to stderr from a pre-push hook would error out. The regression was fixed in 2.53.0.rc1.windows and the test here ensures that this stays fixed. Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.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>
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>
On Windows, the current working directory is pretty much guaranteed to contain a colon. If we feed that path to CVS, it mistakes it for a separator between host and port, though. This has not been a problem so far because Git for Windows uses MSYS2's Bash using a POSIX emulation layer that also pretends that the current directory is a Unix path (at least as long as we're in a shell script). However, that is rather limiting, as Git for Windows also explores other ports of other Unix shells. One of those is BusyBox-w32's ash, which is a native port (i.e. *not* using any POSIX emulation layer, and certainly not emulating Unix paths). So let's just detect if there is a colon in $PWD and punt in that case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
…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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
`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>
…updates Start monitoring updates of Git for Windows' component in the open
`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>
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>
`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>
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>
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.
…s#6334) As of git-for-windows#6231, Git for Windows does not use mimalloc anymore (because the system allocator has sprouted comparable performance in the meantime). So let's not bother looking for new versions of that project, no reaction is needed from Git for Windows' side anymore when those appear.
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: efe56eec38 (monitor-components: stop looking for mimalloc updates (git-for-windows#6334), 2026-07-27) (5efc3a91f0..efe56eec38)
Resolved: efe56ee (monitor-components: stop looking for mimalloc updates (git-for-windows#6334), 2026-07-27)
Resolved merge by removing mimalloc from monitor-components.yml (the commit's intent) and keeping HEAD's version for 14 other files that had no changes in the original merge relative to the first parent
Range-diff
1: efe56ee ! 1: 9af295f monitor-components: stop looking for mimalloc updates (monitor-components: stop looking for mimalloc updates git#6334)
@@ Commit message reaction is needed from Git for Windows' side anymore when those appear. ## .github/workflows/monitor-components.yml ## + remerge CONFLICT (add/add): Merge conflict in .github/workflows/monitor-components.yml + index fd4eb67f92..e9f16e58ff 100644 + --- .github/workflows/monitor-components.yml + +++ .github/workflows/monitor-components.yml @@ .github/workflows/monitor-components.yml: jobs: feed: https://github.com/msys2/MINGW-packages/commits/master/mingw-w64-llvm.atom - label: innosetup feed: https://github.com/jrsoftware/issrc/tags.atom +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) - - label: mimalloc - feed: https://github.com/microsoft/mimalloc/tags.atom - title-pattern: ^(?!v1\.|v3\.[01]\.) +-======= +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) fail-fast: false steps: - uses: git-for-windows/rss-to-issues@v0 - ## refs/reftable-backend.c ## -@@ refs/reftable-backend.c: static struct ref_store *reftable_be_init(struct repository *repo, + ## Documentation/config.adoc ## + remerge CONFLICT (content): Merge conflict in Documentation/config.adoc + index a44c5f8d42..d09f8e870b 100644 + --- Documentation/config.adoc + +++ Documentation/config.adoc +@@ Documentation/config.adoc: include::config/repack.adoc[] - reftable_set_alloc(malloc, realloc, free); + include::config/repo.adoc[] -+ reftable_set_alloc(malloc, realloc, free); -+ - refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir, - &ref_common_dir); +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + include::config/replay.adoc[] +-======= +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + include::config/rerere.adoc[] + + include::config/revert.adoc[] + + ## builtin/fast-import.c ## + remerge CONFLICT (content): Merge conflict in builtin/fast-import.c + index bc523b135f..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; +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + size_t hdrlen, deltalen = 0; +-======= +- size_t hdrlen, deltalen; +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + 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; +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + struct iovec iov[3]; +-======= +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + size_t size; + enum object_type type = 0; + char *buf; + + ## ci/lib.sh ## + remerge CONFLICT (content): Merge conflict in ci/lib.sh + index 1f0824ad37..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" || +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + case "$CI_EVENT,$CI_BRANCH" in +-======= +-case "$GITHUB_EVENT_NAME,$CI_BRANCH" in +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + 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 4ac1c439fc..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); +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + } + + int mingw_platform_has_symlinks(void) + { + static int has_symlinks = -1; +-======= +- +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + /* + * Change 'core.symlinks' default to false, unless native symlinks are + * enabled in MSys2 (via 'MSYS=winsymlinks:nativestrict'). Thus we can + + ## config.mak.uname ## + remerge CONFLICT (content): Merge conflict in config.mak.uname + index 8d0304d203..17ca1e1439 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 = +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + RC = lib/compat/vcbuild/scripts/rc.pl +-======= +- RC = compat/vcbuild/scripts/rc.pl +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + 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 9f8295a26b..a4154d34b4 100644 + --- git-compat-util.h + +++ git-compat-util.h +@@ git-compat-util.h: static inline int is_xplatform_dir_sep(int c) + #include "compat/win32/path-utils.h" + #include "compat/msvc.h" + #include "compat/win32/fscache.h" +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + #endif + #ifdef DARWIN_REGEXEC + #include "compat/darwin.h" +-======= +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + #endif + + /* used on Mac OS X */ +@@ git-compat-util.h: struct fscache; + #ifndef enable_fscache + #define enable_fscache(x) /* noop */ + #endif +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + #ifndef flush_fscache + #define flush_fscache() /* noop */ + #endif +-======= +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + + #ifndef disable_fscache + #define disable_fscache() /* noop */ + + ## meson_options.txt ## + remerge CONFLICT (content): Merge conflict in meson_options.txt + index 33df250918..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.') +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + option('nanosec', type: 'boolean', value: false, + description: 'Care about sub-second file mtimes and ctimes.') +-======= +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + 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 7067bbc1b8..ec35c318bc 100644 + --- object-file.c + +++ object-file.c +@@ object-file.c: int parse_loose_header(const char *hdr, struct object_info *oi) + return 0; + } + +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) +-======= +-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); +-} +- +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + #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]; +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + int hdrlen; +-======= +- size_t hdrlen = sizeof(hdr); +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + + hdrlen = format_object_header(hdr, sizeof(hdr), type, len); + + + ## object-file.h ## + remerge CONFLICT (content): Merge conflict in object-file.h + index 20c3429e6b..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); +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) +-======= +-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); +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + + /* 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 34a81b35f9..a292eb7efc 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, +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + 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, +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + enum odb_write_object_flags flags) + { + struct odb_source_loose *loose = odb_source_loose_downcast(source); + char hdr[MAX_HEADER_LEN]; +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + int hdrlen; +-======= +- size_t hdrlen = sizeof(hdr); +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + + hdrlen = format_object_header(hdr, sizeof(hdr), type, len); + + + ## send-pack.c ## + remerge CONFLICT (content): Merge conflict in send-pack.c + index 324ccd1a32..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; +-<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + if (server_supports("no-ref-delta")) + args->no_ref_delta = 1; +-======= +->>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + 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 58456210a3..983bd02b17 100755 + --- t/t1007-hash-object.sh + +++ t/t1007-hash-object.sh +@@ 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. +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \ +-================================ +-test_expect_success EXPENSIVE,SIZE_T_IS_64BIT \ +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + '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 033bcde0c9..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 | \ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + 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 ;; +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) + *) + h_expect_outcome=expect_success + all_expect_outcome=expect_success - ## t/t7502-commit-porcelain.sh ## -@@ t/t7502-commit-porcelain.sh: test_expect_success 'cleanup commit messages (scissors option,-F,-e, scissors on - test_must_be_empty actual + ## t/t6403-merge-file.sh ## + remerge CONFLICT (content): Merge conflict in t/t6403-merge-file.sh + index 3fa7d5e2cf..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 && +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 07d561609e (Drop Windows 7 support (#6325)) + test_grep "Cannot merge binary files" merge.err +-================================ +- grep "Cannot merge binary files" merge.err +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 2db2a66133 (fixup! Add a GitHub workflow to monitor component updates) ' -+test_expect_success 'helper-editor' ' -+ -+ write_script lf-to-crlf.sh <<-\EOF -+ sed "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new && -+ mv -f "$1".new "$1" -+ EOF -+' -+ -+test_expect_success 'cleanup commit messages (scissors option,-F,-e, CR/LF line endings)' ' -+ -+ test_config core.editor "\"$PWD/lf-to-crlf.sh\"" && -+ scissors="# ------------------------ >8 ------------------------" && -+ -+ test_write_lines >text \ -+ "# Keep this comment" "" " $scissors" \ -+ "# Keep this comment, too" "$scissors" \ -+ "# Remove this comment" "$scissors" \ -+ "Remove this comment, too" && -+ -+ test_write_lines >expect \ -+ "# Keep this comment" "" " $scissors" \ -+ "# Keep this comment, too" && -+ -+ git commit --cleanup=scissors -e -F text --allow-empty && -+ git cat-file -p HEAD >raw && -+ sed -e "1,/^\$/d" raw >actual && -+ test_cmp expect actual -+' -+ -+test_expect_success 'cleanup commit messages (scissors option,-F,-e, scissors on first line, CR/LF line endings)' ' -+ -+ scissors="# ------------------------ >8 ------------------------" && -+ test_write_lines >text \ -+ "$scissors" \ -+ "# Remove this comment and any following lines" && -+ cp text /tmp/test2-text && -+ git commit --cleanup=scissors -e -F text --allow-empty --allow-empty-message && -+ git cat-file -p HEAD >raw && -+ sed -e "1,/^\$/d" raw >actual && -+ test_must_be_empty actual -+' -+ - test_expect_success 'cleanup commit messages (strip option,-F)' ' - - echo >>negative && + test_expect_success 'binary files cannot be merged with --object-id' 'To: 9af295f451 (monitor-components: stop looking for mimalloc updates (git-for-windows#6334), 2026-07-27) (36feafae2d..9af295f451)
Statistics
Range-diff (click to expand)
1: 985f99b < -: ---------- mingw: skip symlink type auto-detection for network share targets
2: 3cd409b = 1: 0a71b6b unix-socket: avoid leak when initialization fails
3: ff8f95b < -: ---------- Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
4: 5b3671a = 2: 5f739ee grep: prevent
^$false match at end of file5: 804b088 < -: ---------- Merge branch 'v2.53.0.windows.3'
6: 81b67c3 = 3: 2ebd64a Merge branch 'fixes-from-the-git-mailing-list'
7: 7e11d7d = 4: 9cac101 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
8: 6ab6f56 = 5: 849d3e6 vcpkg_install: detect lack of Git
9: 13e621f = 6: 7dd262f vcpkg_install: add comment regarding slow network connections
10: 37d7dd4 = 7: 18be31b vcbuild: install ARM64 dependencies when building ARM64 binaries
11: 12c7342 = 8: d45384a vcbuild: add an option to install individual 'features'
12: 2475701 = 9: 50b6136 cmake: allow building for Windows/ARM64
13: e4d00cc = 10: 0b9dc72 ci(vs-build) also build Windows/ARM64 artifacts
14: ca3940c = 11: 97c96cd vcbuild: stop hard-coding OpenSSL as a dependency
15: ed35f50 = 12: df6e3a7 cmake(): allow setting HOST_CPU for cross-compilation
16: 7cd62f5 = 13: 13d5c7f t9350: point out that refs are not updated correctly
17: 726e6df = 14: a0adc4c CMake: default Visual Studio generator has changed
18: 3f5dc5a = 15: ee5ba4c transport-helper: add trailing --
19: 7f44bc3 = 16: c8138d0 mingw: demonstrate a
git addissue with NTFS junctions20: 79ca409 = 17: acbdd8e .gitignore: add Visual Studio CMakeSetting.json file
22: 60d7936 = 18: 77db9dc t5505/t5516: allow running without
.git/branches/in the templates23: cfd71db = 19: cff7d53 remote-helper: check helper status after import/export
24: 0eea39f = 20: 3e1b9bc strbuf_realpath(): use platform-dependent API if available
25: 36d27ee = 21: a299ac9 http: use new "best effort" strategy for Secure Channel revoke checking
26: 0ac5381 = 22: b904857 subtree: update
contrib/subtreetesttarget27: 16c6847 = 23: db3eba7 CMakeLists: add default "x64-windows" arch for Visual Studio
28: f1ea574 = 24: 4e84d7a hash-object: add another >4GB/LLP64 test case
29: 3988d91 = 25: 8568f73 setup: properly use "%(prefix)/" when in WSL
30: c11d8b7 = 26: c120223 Add config option
windows.appendAtomically21: 2b72229 = 27: 2a14edb mingw: include the Python parts in the build
32: b3ea0f6 = 28: 1d7bb3e t5505/t5516: fix white-space around redirectors
34: c1fe0cd = 29: f234680 ci: bump actions/checkout from 6 to 7
35: 1d644f1 = 30: 230152b Always auto-gc after calling a fast-import transport
36: 2d98b5d = 31: b6c1f9f mingw: prevent regressions with "drive-less" absolute paths
37: e131274 = 32: bad824e transport: optionally disable side-band-64k
38: 3a9b2d4 = 33: 5ce2ba5 mingw: fix fatal error working on mapped network drives on Windows
39: c30746a = 34: 4b56dde clink.pl: fix MSVC compile script to handle libcurl-d.lib
40: 4a5c5b1 = 35: b239950 mingw: implement a platform-specific
strbuf_realpath()41: 7d58dbb = 36: 2351811 t3701: verify that we can add lots of files interactively
42: 4cdb97e = 37: 28b92d0 commit: accept "scissors" with CR/LF line endings
43: f9e8b84 ! 38: 14fc8ca t0014: fix indentation
@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> ## t/t0014-alias.sh ## -@@ t/t0014-alias.sh: test_expect_success 'looping aliases - deprecated builtins' ' +@@ t/t0014-alias.sh: test_expect_success HAVE_DEPRECATED 'looping aliases - deprecated builtins' ' #' test_expect_success 'run-command formats empty args properly' '44: 7034f27 = 39: 0f3026d git-gui: accommodate for intent-to-add files
45: 663c910 = 40: f9fa8c4 mingw: allow for longer paths in
parse_interpreter()46: 00881e9 = 41: 795ed96 compat/vcbuild: document preferred way to build in Visual Studio
47: 3314087 = 42: 84f52be http: optionally send SSL client certificate
48: 5e1ab65 = 43: 3c67ecf ci: run
contrib/subtreetests in CI builds49: dde25a6 = 44: a8f1ea4 CMake: show Win32 and Generator_platform build-option values
50: 91768ea = 45: 2b220f1 hash-object: add a >4GB/LLP64 test case using filtered input
51: 3cc117c = 46: 0feb1b0 compat/mingw.c: do not warn when failing to get owner
52: 4d0bbbb = 47: ecb78c7 mingw: $env:TERM="xterm-256color" for newer OSes
53: af882c4 = 48: 3400a1e winansi: check result and Buffer before using Name
54: d44f53e = 49: 51cd8c1 mingw: change core.fsyncObjectFiles = 1 by default
31: a7efc50 = 50: 746f44a windows: skip linking
git-<command>for built-ins57: 2f5f239 = 51: c262bc5 mingw: stop hard-coding
CC = gcc58: 8f489b9 = 52: 2ddc943 mingw: drop the -D_USE_32BIT_TIME_T option
59: e146562 = 53: 4f2becf mingw: only use -Wl,--large-address-aware for 32-bit builds
60: 099db75 = 54: 74869cf mingw: avoid over-specifying
--pic-executable61: 8b6c8d6 = 55: b620939 mingw: set the prefix and HOST_CPU as per MSYS2's settings
62: 1f8f33e = 56: eb58bee mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
63: 09b69c7 = 57: f9132e2 mingw: rely on MSYS2's metadata instead of hard-coding it
64: 8150eb9 = 58: 5fc8627 mingw: always define
ETC_*for MSYS2 environments65: 2d482a3 = 59: e48b6cd max_tree_depth: lower it for clang builds in general on Windows
66: 6d0fe0a = 60: 1deba14 mingw: ensure valid CTYPE
67: 717b014 = 61: 4557374 mingw: allow
git.exeto be used instead of the "Git wrapper"68: 5e0d379 = 62: 4e55018 revision: create mark_trees_uninteresting_dense()
69: 23f9854 = 63: b2fd99d mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
70: 529f580 = 64: 595b230 survey: stub in new experimental 'git-survey' command
71: 7de4ecf = 65: 9b49311 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
72: a48b5c1 = 66: e3f4122 survey: add command line opts to select references
73: 6c3f329 = 67: 673205d clink.pl: fix libexpatd.lib link error when using MSVC
74: 3fd3fa0 = 68: 769941e survey: start pretty printing data in table form
75: 94c4168 = 69: 69b8bbb Makefile: clean up .ilk files when MSVC=1
76: 21fdaaa = 70: 9b7dd8e survey: add object count summary
77: 92a5e72 = 71: b3feeae vcbuild: add support for compiling Windows resource files
78: 8f5b70e = 72: fd9d1cc survey: summarize total sizes by object type
79: d008671 = 73: f0a2983 config.mak.uname: add git.rc to MSVC builds
33: 9a746b4 = 74: ffe9cc6 MinGW: link as terminal server aware
80: d2b4fc5 = 75: 9096fe1 survey: show progress during object walk
81: 24f2da9 = 76: 672d512 mingw: make sure
errnois set correctly when socket operations fail83: f88f564 = 77: 4865b47 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
84: e9fbf1a = 78: ca676f1 http: optionally load libcurl lazily
85: 8e3a2c1 = 79: e5bca48 survey: add ability to track prioritized lists
86: 25bb364 = 80: 7cc01c2 compat/mingw: handle WSA errors in strerror
88: 04fbfc1 = 81: 2db42db clink.pl: move default linker options for MSVC=1 builds
89: d96ce52 = 82: b457524 http: support lazy-loading libcurl also on Windows
90: 719fd79 = 83: 1477d27 survey: add report of "largest" paths
91: 6bb801f = 84: 113577b compat/mingw: drop outdated comment
93: 81b9ae1 = 85: 3a12f13 cmake: install headless-git.
94: daf8750 = 86: 25b5820 http: when loading libcurl lazily, allow for multiple SSL backends
95: 502ccff = 87: 648936e survey: add --top= option and config
96: c2be03b = 88: 53d4dc0 t0301: actually test credential-cache on Windows
82: 833fd71 = 89: 1ba8f73 t5563: verify that NTLM authentication works
55: e95a80b = 90: 5e942d5 Fix Windows version resources
56: 335a7ab = 91: c8b46f7 status: fix for old-style submodules with commondir
98: 64780d5 = 92: ce149da git.rc: include winuser.h
99: a87c681 = 93: c12cf4a mingw: do load libcurl dynamically by default
100: 04b26e3 = 94: 81a90f2 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
101: 51b3f0b = 95: 3bf518a mingw: suggest
windows.appendAtomicallyin more cases102: 7885dfd = 96: b463027 win32: use native ANSI sequence processing, if possible
103: aa39d07 = 97: c11a65c common-main.c: fflush stdout buffer upon exit
104: 744dc38 = 98: 943f4a1 t5601/t7406(mingw): do run tests with symlink support
105: e2561d6 = 99: 9e4f8e0 Fallback to AppData if XDG_CONFIG_HOME is unset
106: 0a9f546 = 100: 194c4e3 run-command: be helpful with Git LFS fails on Windows 7
107: fa06781 = 101: c0dde63 survey: clearly note the experimental nature in the output
108: a5333da = 102: 43aa893 credential-cache: handle ECONNREFUSED gracefully
109: 5ea8f8f = 103: ca3c153 reftable: do make sure to use custom allocators
110: 3d307b5 = 104: 20b0784 check-whitespace: avoid alerts about upstream commits
111: b18a317 = 105: d2ee5ae t/t5571-prep-push-hook.sh: Add test with writing to stderr
114: 7999db8 = 106: 24e8e85 mingw: Support
git_terminal_promptwith more terminals115: 7446c5b = 107: 754fb97 compat/terminal.c: only use the Windows console if bash 'read -r' fails
116: efcf5ae = 108: 1ac5d98 diff: stop truncating the deflated-binary-diff size on Windows
117: fbd6870 = 109: aacc415 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
118: 4bad690 = 110: 8e7967b convert: widen gather_convert_stats() helpers to size_t
119: 04557b5 = 111: 5608c73 Win32: symlink: move phantom symlink creation to a separate function
120: d1f7eb0 = 112: e6a7997 read-cache: stop truncating index blob sizes on Windows
121: 8f603cf = 113: dde48b4 mingw: introduce code to detect whether we're inside a Windows container
122: 7109e76 = 114: dc2e8b9 Introduce helper to create symlinks that knows about index_state
123: 9315a65 = 115: 715b8bc xdiff-interface: widen buffer_is_binary() size parameter to size_t
124: 002f58d = 116: 9908504 tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
87: dcc69e3 = 117: 7ed1e6b http: disallow NTLM authentication by default
125: edefaf0 = 118: bf19016 mingw: when running in a Windows container, try to rename() harder
126: 14e7aa2 = 119: 520613d mingw: allow to specify the symlink type in .gitattributes
127: 1b64de6 = 120: 990bcaa combine-diff: stop truncating combined-diff blob sizes on Windows
128: ea681f6 = 121: 4b783ae tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
92: 0a3b1d5 = 122: bfb0a33 http: warn if might have failed because of NTLM
129: c1f15bf = 123: 0d24bf5 mingw: move the file_attr_to_st_mode() function definition
130: 1276d2a = 124: c03109a Win32: symlink: add test for
symlinkattribute131: fecddd9 = 125: 112dd02 diff: widen textconv_object() size out-param to size_t
134: 8411c34 = 126: 029fba3 pack-objects: drop the two tree-walk casts in the preferred-base path
97: 4ef961a = 127: 51e4336 credential: advertise NTLM suppression and allow helpers to re-enable
135: 144718c = 128: 4403208 mingw: Windows Docker volumes are not symbolic links
136: 1dbc04d = 129: db45d09 clean: do not traverse mount points
132: d18b2ce = 130: 371c2ca pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
137: f6b6575 = 131: eee9520 diffcore: widen struct diff_filespec.size to size_t
139: 4128fa3 = 132: 46458ea diff-delta: widen sizeof_delta_index() return to size_t
140: 8cd0bac = 133: 1d8cba2 tree: widen struct tree.size and parse_tree_buffer() to size_t
141: 336ca78 = 134: 024537e commit: widen the commit-buffer API to size_t
142: b51e331 = 135: 79df4bd blame: widen find_line_starts() len parameter to size_t
143: dfb0045 = 136: 7b845a6 grep: widen struct grep_source.size and grep_buffer() to size_t
144: cee4b58 = 137: a41cf90 fast-export: drop the export_blob() size cast and widen anonymize_blob()
112: 5c60d84 = 138: b50fa4e dir: do not traverse mount points
113: 40fff51 = 139: f777164 win32: thread-utils: handle multi-socket systems
147: d791803 = 140: deb5e78 t5563: add tests for http.emptyAuth with Negotiate
148: c6215de = 141: f6f757e entry: flush fscache after creating directories and writing files
149: a3d9529 = 142: 8d66903 ci(macos): skip the
git p4tests150: 672d1e1 = 143: 7adcf2f mingw: work around rename() failing on a read-only file
151: 0f24a7b = 144: 8375296 clean: remove mount points when possible
152: 16dac5c = 145: 2c178d3 mingw: optionally enable wsl compability file mode bits
153: d9d56c3 = 146: 120720d Refuse to follow invalid paths in
.gitfiles133: 6ada9ad = 147: ea0da73 Merge branch 'size-t/pack-objects-delta'
138: d5dd9b3 = 148: 124d986 Merge branch 'size-t/pack-bitmap'
154: dc324a2 = 149: 70c8d71 Merge branch 'size-t/diff'
155: c3eda9f = 150: 8d6878a Merge branch 'size-t/diff-delta-sizeof'
156: ab9df83 = 151: c865651 Merge branch 'size-t/tree'
157: 969175c = 152: effc53f Merge branch 'size-t/commit'
158: 90f76c3 = 153: b7143e3 Merge branch 'size-t/blame'
159: 72de27b = 154: 71e565b Merge branch 'size-t/grep'
145: ca63001 = 155: dbdc2fb repo: drop the inflated-size cast in count_objects()
160: 0612cec = 156: 2f07ca4 Merge branch 'size-t/fast-export'
146: d8fb595 = 157: 1f9de6c unpack-objects: widen the size-passing infrastructure to size_t
161: 85a056d = 158: 7a9a399 Merge branch 'size-t/repo'
162: 0d29721 = 159: 6d334d9 Merge branch 'size-t/unpack-objects'
163: 2a6b514 = 160: b93da40 Merge branch 'topic/size-t' into size-t-followups
165: 64717d9 = 161: e1fc499 pack-objects: drop cast_size_t_to_ulong shims in get_delta()
167: 8c0b4fc = 162: c6b72fe pack-objects: drop cast_size_t_to_ulong shims in try_delta()
164: 106ea0f = 163: a169e87 Merge branch 'bump-ci-actions/checkout-from-6-to-7'
169: 13182f7 = 164: 2deb602 pack-objects: drop the last size shim in write_no_reuse_object()
166: 738b3d5 = 165: 9ea467d Merge 'remote-hg-prerequisites' into HEAD
171: 5e15e2d = 166: 406345d blame: widen struct blame_scoreboard.final_buf_size to size_t
168: 732ddc8 = 167: 9a95f87 Merge branch 'drive-prefix'
173: a23cd67 = 168: b76c5b2 fast-import: drop the six size casts in the object-read paths
170: aa7fb83 = 169: f7bdd0b Merge branch 'msys2-python'
175: db081e9 = 170: 6e2880e t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
172: 2f941cf = 171: 5cacaa3 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
177: b598404 = 172: f31ac62 Drop the
cast_size_t_to_ulong()helper178: 0a68a0e = 173: 3a571ff Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
174: 3d917c6 = 174: b39400d Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
180: dd72008 = 175: 3a3800d Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
181: f1159a4 = 176: c14d520 coverity: skip building with Rust, for now
176: a654061 = 177: 7009a22 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
179: 2049c4e = 178: a022cfc Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction182: c151275 = 179: 85fac68 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: 359c575 = 180: b921596 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
184: 33894d3 = 181: bea94b0 Merge 'add-p-many-files'
185: d89a53b = 182: 3d07914 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
186: 856ed8f = 183: 49c8aff Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
187: 2426e32 = 184: 71bafcd Merge 'git-gui/js/intent-to-add'
188: fbf1502 = 185: 667267a Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
189: c1fa27b = 186: 83d70a8 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
190: bf0ee7d = 187: d72546a Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
191: 7df3c3d = 188: 824c863 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path192: 23cd6b5 = 189: 1f56fb6 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: 49d93c1 = 190: 19aa46f 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: 4d0115e = 191: 68da42b Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests195: 93b3147 = 192: 40fdf57 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
196: 3612db1 = 193: 53abd27 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t197: 5cc0f1c = 194: 6279067 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory198: 2e1a942 = 195: 682e1f9 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
199: a9a5a35 = 196: 50bd99c Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
200: e7786e8 = 197: 7434a45 Merge branch 'optionally-dont-append-atomically-on-windows'
201: fbe6ec3 = 198: a1c5dbd Merge branch 'fsync-object-files-always'
202: adab83c = 199: e0b9e63 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
203: 2d1093e = 200: 7a85804 Fix Windows version resources (Fix Windows version resources git#4092)
204: fd3a06f = 201: f779f36 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
205: 6f54801 = 202: c57600a Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)206: 6e7b297 = 203: cf479b6 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)207: 0c0422f = 204: 933f3e0 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283208: 0713732 = 205: 1ac66ae Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
209: 6605362 = 206: 6920a19 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
210: 97f9a20 = 207: 1169f5b 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: 67c5412 = 208: 4d7c81e Merge branch 'nano-server'
212: 0a245a8 = 209: 83191e3 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
213: 318ae4d = 210: 1824975 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
214: 1da6306 = 211: 04931d4 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
215: ef4042b = 212: 47001d9 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
216: a5dd6a8 = 213: 78cd0c7 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
217: e3533ac = 214: 8066724 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
218: f8aed2f = 215: 55afe72 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: fcb64da = 216: 053f766 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
220: ff09904 = 217: 5fea151 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
221: 3c047d0 = 218: 70a13e6 Merge branch 'reftable-vs-custom-allocators'
222: df715e3 = 219: 910c976 Merge branch 'check-whitespace-only-downstream'
223: a12c901 = 220: dafb104 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: 7004f05 = 221: d8b44ed Merge branch 'disallow-ntlm-auth-by-default'
225: 6eae100 = 222: 8cec0c1 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)226: 5f74feb = 223: ef04244 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
227: f0ac2d0 = 224: 10134d8 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
228: 822ffe2 = 225: f056a42 entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
229: 21b5d98 = 226: 114bc72 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)230: b9bd028 = 227: 2ad3af1 Merge branch 'msys2'
231: 4fde546 = 228: e021af2 Merge 'docker-volumes-are-no-symlinks'
232: 4be2054 = 229: e791696 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
233: 4f2c8d9 = 230: 8c604cc Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
234: 009fdac = 231: 596e46b Merge branch 'dont-clean-junctions'
235: e0bd952 = 232: c5d69df Merge branch 'wsl-file-mode-bits'
236: be87ada = 233: b9b5ead Merge branch 'validate-dotgit'
237: 7bc6f80 = 234: 052d2dd Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
238: 3429163 = 235: 1574ce7 Merge branch 'skip-rust-in-the-coverity-builds'
239: f676ec8 = 236: 8bfc949 Merge branch 'ready-for-upstream'
241: 0856c3e = 237: 015e98f Win32: make FILETIME conversion functions public
242: 3dcf643 = 238: 9c93cdf Win32: dirent.c: Move opendir down
243: fc99af2 = 239: 1902ad4 mingw: make the dirent implementation pluggable
244: 03c998b = 240: 5eb2572 Win32: make the lstat implementation pluggable
245: dfa4ec7 = 241: 726f6e2 mingw: add infrastructure for read-only file system level caches
246: 940a25d ! 242: e52e36b mingw: add a cache below mingw's lstat and dirent implementations
247: 42df73a = 243: e41e547 fscache: load directories only once
248: fc6993f = 244: c9ec981 fscache: add key for GIT_TRACE_FSCACHE
249: edac406 = 245: 6bb7b85 fscache: remember not-found directories
250: 1cce96b = 246: b83991f fscache: add a test for the dir-not-found optimization
251: 52ce9cf = 247: 3996e54 add: use preload-index and fscache for performance
252: b9c0206 = 248: a5b2882 dir.c: make add_excludes aware of fscache during status
253: 035fefb = 249: f4baef7 fscache: make fscache_enabled() public
254: 16a1f5a = 250: 613c2f9 dir.c: regression fix for add_excludes with fscache
255: 3b89e93 = 251: af9591f fetch-pack.c: enable fscache for stats under .git/objects
256: d540b16 = 252: 7dda6a5 checkout.c: enable fscache for checkout again
257: 02cefe7 = 253: b8b48c9 Enable the filesystem cache (fscache) in refresh_index().
258: ef3a857 = 254: 77906f8 fscache: use FindFirstFileExW to avoid retrieving the short name
240: 60ed3ae = 255: 19123b8 git-gui--askyesno: fix funny text wrapping
259: bcb58d2 = 256: b29a507 fscache: add GIT_TEST_FSCACHE support
295: 939350a = 257: a0cdc08 git-gui--askyesno (mingw): use Git for Windows' icon, if available
260: cbf6d0a = 258: 055aee1 fscache: add fscache hit statistics
261: bb8e473 = 259: e689402 unpack-trees: enable fscache for sparse-checkout
262: f112b87 = 260: eed316e status: disable and free fscache at the end of the status command
263: 3a53c4e = 261: ce3e458 mem_pool: add GIT_TRACE_MEMPOOL support
264: aa83680 = 262: ec8de42 fscache: fscache takes an initial size
265: 65e4bc1 = 263: f9e2d3d fscache: update fscache to be thread specific instead of global
266: 2ad8e50 = 264: f625f5c fscache: teach fscache to use mempool
267: a584b96 = 265: f73532f fscache: make fscache_enable() thread safe
268: 716b943 = 266: a965b13 fscache: teach fscache to use NtQueryDirectoryFile
269: 0c29794 = 267: c7455c3 fscache: remember the reparse tag for each entry
270: fd63bd8 = 268: 19d3c36 fscache: Windows Docker volumes are not symbolic links
271: e98e2a0 = 269: 49e9bd0 fscache: optionally enable wsl compability file mode bits
272: f305731 = 270: 5322ab2 Merge branch 'fscache'
273: 708203f = 271: 0986319 fscache: implement an FSCache-aware is_mount_point()
274: 3c41ce2 = 272: 01552e4 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
275: 1f41ca2 = 273: 8ea44c8 clean: make use of FSCache
276: 4acf718 = 274: 6a43cd3 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
277: 866277b = 275: fb64945 Merge branch 'dont-clean-junctions-fscache'
278: d779041 = 276: 0cf30c1 pack-objects (mingw): demonstrate a segmentation fault with large deltas
279: cca046c = 277: 4ad1bc2 mingw: support long paths
280: 936da37 = 278: f1656d0 win32(long path support): leave drive-less absolute paths intact
281: d4844fa = 279: 2db3939 compat/fsmonitor/fsm-*-win32: support long paths
282: 8a88e13 = 280: fa7e96e clean: suggest using
core.longPathsif paths are too long to remove283: bd31f5a = 281: f928053 mingw: explicitly specify with which cmd to prefix the cmdline
284: 9ce663f ! 282: 003e114 mingw: when path_lookup() failed, try BusyBox
285: 13408b7 = 283: 881268b test-tool: learn to act as a drop-in replacement for
iconv286: 8bd3ed7 = 284: 77f2a20 tests(mingw): if
iconvis unavailable, usetest-helper --iconv287: 430b502 = 285: 049e9c2 gitattributes: mark .png files as binary
288: 8d9dd1d = 286: 98108aa tests: move test PNGs into t/lib-diff/
289: 9f018e2 = 287: b779fae tests: only override sort & find if there are usable ones in /usr/bin/
290: eaf8858 = 288: 42e687d tests: use the correct path separator with BusyBox
291: ff7ff56 = 289: 00cb84a mingw: only use Bash-ism
builtin pwd -Wwhen available292: 8b0e37b = 290: daf0ba8 tests (mingw): remove Bash-specific pwd option
293: d2ace2a = 291: 3c0c291 test-lib: add BUSYBOX prerequisite
294: 7c2f33e = 292: 98209c4 t5003: use binary file from t/lib-diff/
296: a30fedf = 293: 7ffd313 t5532: workaround for BusyBox on Windows
297: 3dc0d7b = 294: 1e64fc8 t5605: special-case hardlink test for BusyBox-w32
298: 8049a57 = 295: d8622da t5813: allow for $PWD to be a Windows path
299: 31867f8 = 296: 1c78c16 t9200: skip tests when $PWD contains a colon
300: 2084588 = 297: d242f3f Describe Git for Windows' architecture
301: 3a64167 = 298: 3e20d82 Add an AGENTS.md file to help with AI-assisted debugging/development
302: 893269e = 299: 6618700 Modify the Code of Conduct for Git for Windows
304: acbe188 = 300: cdd41e0 CONTRIBUTING.md: add guide for first-time contributors
303: 01c8dda = 301: 2d71dfb Merge branch 'gitk-and-git-gui-patches'
306: 6ae329a = 302: 5f8a256 README.md: Add a Windows-specific preamble
305: 7949a5d = 303: 02efd17 Merge branch 'long-paths'
309: f99d594 = 304: 7c3dc25 Add an issue template
307: 31928c3 = 305: 972edcb Partially un-revert "editor: save and reset terminal after calling EDITOR"
308: 27d5d4b = 306: dfcc75d Merge branch 'busybox-w32'
312: cf30689 = 307: db19da2 Modify the GitHub Pull Request template (to reflect Git for Windows)
310: 2cf5b57 = 308: 423d17a reset: reinstate support for the deprecated --stdin option
311: 18ad536 = 309: 62d76d3 Merge branch 'un-revert-editor-save-and-reset'
313: d22e909 = 310: f63e093 Add a GitHub workflow to monitor component updates
316: e1ff2e9 = 311: e421959 SECURITY.md: document Git for Windows' policies
314: bfec606 = 312: 60253e6 fsmonitor: reintroduce core.useBuiltinFSMonitor
315: f840453 = 313: 5252717 Merge branch 'phase-out-reset-stdin'
317: 32ae531 = 314: 2c1ea37 dependabot: help keeping GitHub Actions versions up to date
319: 7008864 = 315: 0819fd6 ci: only run the expensive tests in the Windows tests for now
318: cbfee58 = 316: cb0d64c Merge branch 'deprecate-core.useBuiltinFSMonitor'
320: e069b60 = 317: c8a4428 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
321: ea62b0a = 318: 0e49ba4 Merge 'readme' into HEAD
322: 33d5241 = 319: 3ad3de8 build(deps): bump actions/cache from 5 to 6
323: 22743e9 = 320: 72d49e2 build(deps): bump actions/cache from 5 to 6 (build(deps): bump actions/cache from 5 to 6 git#6303)
324: f921ae9 = 321: 4648dd6 repo: split annotated tags out from total tag count in structure
325: cabeb43 = 322: 1a55e9a repo: filter the structure scope via --ref-filter=
326: 7565042 = 323: 0da88e3 repo: report top-N paths by count, disk, and inflated size in structure
327: 7264e19 = 324: 865aad2 t1901: cover the --top option of
git repo structure328: 50c2d31 = 325: a2c237f repo: read the
--topdefault fromrepo.structure.top329: 922e92f = 326: ea3bd98 git-survey: announce the upcoming pivot into
git repo structure330: 989b914 = 327: 4c00080 survey: turn into a thin shim over
git repo structure331: 3793046 = 328: 436cb7f Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)332: d7bb3cb = 329: 641a30d fixup! run-command: be helpful with Git LFS fails on Windows 7
333: 1b0f2bf = 330: 07d5616 Drop Windows 7 support (Drop Windows 7 support git#6325)
334: efe56ee = 331: 9af295f monitor-components: stop looking for mimalloc updates (monitor-components: stop looking for mimalloc updates git#6334)
Truncated; see the full conflict report in the workflow run summary.