Rebase shears/next: 2 conflict(s) (0 skipped, 2 resolved) (#29064983848)#293
Open
gitforwindowshelper[bot] wants to merge 340 commits into
Open
Rebase shears/next: 2 conflict(s) (0 skipped, 2 resolved) (#29064983848)#293gitforwindowshelper[bot] wants to merge 340 commits into
gitforwindowshelper[bot] wants to merge 340 commits into
Conversation
This comment has been true for the longest time; The combination of the two preceding commits made it incorrect, so let's drop that comment. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NTLM authentication is relatively weak. This is the case even with the
default setting of modern Windows versions, where NTLMv1 and LanManager
are disabled and only NTLMv2 is enabled: NTLMv2 hashes of even
reasonably complex 8-character passwords can be broken in a matter of
days, given enough compute resources.
Even worse: On Windows, NTLM authentication uses Security Support
Provider Interface ("SSPI"), which provides the credentials without
requiring the user to type them in.
Which means that an attacker could talk an unsuspecting user into
cloning from a server that is under the attacker's control and extracts
the user's NTLMv2 hash without their knowledge.
For that reason, let's disallow NTLM authentication by default.
NTLM authentication is quite simple to set up, though, and therefore
there are still some on-prem Azure DevOps setups out there whose users
and/or automation rely on this type of authentication. To give them an
escape hatch, introduce the `http.<url>.allowNTLMAuth` config setting
that can be set to `true` to opt back into using NTLM for a specific
remote repository.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `git_terminal_prompt()` function expects the terminal window to be attached to a Win32 Console. However, this is not the case with terminal windows other than `cmd.exe`'s, e.g. with MSys2's own `mintty`. Non-cmd terminals such as `mintty` still have to have a Win32 Console to be proper console programs, but have to hide the Win32 Console to be able to provide more flexibility (such as being resizeable not only vertically but also horizontally). By writing to that Win32 Console, `git_terminal_prompt()` manages only to send the prompt to nowhere and to wait for input from a Console to which the user has no access. This commit introduces a function specifically to support `mintty` -- or other terminals that are compatible with MSys2's `/dev/tty` emulation. We use the `TERM` environment variable as an indicator for that: if the value starts with "xterm" (such as `mintty`'s "xterm_256color"), we prefer to let `xterm_prompt()` handle the user interaction. The most prominent user of `git_terminal_prompt()` is certainly `git-remote-https.exe`. It is an interesting use case because both `stdin` and `stdout` are redirected when Git calls said executable, yet it still wants to access the terminal. When running inside a `mintty`, the terminal is not accessible to the `git-remote-https.exe` program, though, because it is a MinGW program and the `mintty` terminal is not backed by a Win32 console. To solve that problem, we simply call out to the shell -- which is an *MSys2* program and can therefore access `/dev/tty`. Helped-by: nalla <nalla@hamal.uberspace.de> Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is a known issue that a rename() can fail with an "Access denied" error at times, when copying followed by deleting the original file works. Let's just fall back to that behavior. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, symbolic links actually have a type depending on the target: it can be a file or a directory. In certain circumstances, this poses problems, e.g. when a symbolic link is supposed to point into a submodule that is not checked out, so there is no way for Git to auto-detect the type. To help with that, we will add support over the course of the next commits to specify that symlink type via the Git attributes. This requires an index_state, though, something that Git for Windows' `symlink()` replacement cannot know about because the function signature is defined by the POSIX standard and not ours to change. So let's introduce a helper function to create symbolic links that *does* know about the index_state. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The previous commits introduced a compile-time option to load libcurl lazily, but it uses the hard-coded name "libcurl-4.dll" (or equivalent on platforms other than Windows). To allow for installing multiple libcurl flavors side by side, where each supports one specific SSL/TLS backend, let's first look whether `libcurl-<backend>-4.dll` exists, and only use `libcurl-4.dll` as a fall back. That will allow us to ship with a libcurl by default that only supports the Secure Channel backend for the `https://` protocol. This libcurl won't suffer from any dependency problem when upgrading OpenSSL to a new major version (which will change the DLL name, and hence break every program and library that depends on it). This is crucial because Git for Windows relies on libcurl to keep working when building and deploying a new OpenSSL package because that library is used by `git fetch` and `git clone`. Note that this feature is by no means specific to Windows. On Ubuntu, for example, a `git` built using `LAZY_LOAD_LIBCURL` will use `libcurl.so.4` for `http.sslbackend=openssl` and `libcurl-gnutls.so.4` for `http.sslbackend=gnutls`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The 'git survey' builtin provides several detail tables, such as "top files by on-disk size". The size of these tables defaults to 10, currently. Allow the user to specify this number via a new --top=<N> option or the new survey.top config key. Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Commit 2406bf5 (Win32: detect unix socket support at runtime, 2024-04-03) introduced a runtime detection for whether the operating system supports unix sockets for Windows, but a mistake snuck into the tests. When building and testing Git without NO_UNIX_SOCKETS we currently skip t0301-credential-cache on Windows if unix sockets are supported and run the tests if they aren't. Flip that logic to actually work the way it was intended. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The new default of Git is to disable NTLM authentication by default. To help users find the escape hatch of that config setting, should they need it, suggest it when the authentication failed and the server had offered NTLM, i.e. if re-enabling it would fix the problem. Helped-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Accessing the Windows console through the special CONIN$ / CONOUT$ devices doesn't work properly for non-ASCII usernames an passwords. It also doesn't work for terminal emulators that hide the native console window (such as mintty), and 'TERM=xterm*' is not necessarily a reliable indicator for such terminals. The new shell_prompt() function, on the other hand, works fine for both MSys1 and MSys2, in native console windows as well as mintty, and properly supports Unicode. It just needs bash on the path (for 'read -s', which is bash-specific). On Windows, try to use the shell to read from the terminal. If that fails with ENOENT (i.e. bash was not found), use CONIN/OUT as fallback. Note: To test this, create a UTF-8 credential file with non-ASCII chars, e.g. in git-bash: 'echo url=http://täst.com > cred.txt'. Then in git-cmd, 'git credential fill <cred.txt' works (shell version), while calling git without the git-wrapper (i.e. 'mingw64\bin\git credential fill <cred.txt') mangles non-ASCII chars in both console output and input. Signed-off-by: Karsten Blees <blees@dcon.de>
In preparation for making this function a bit more complicated (to allow for special-casing the `ContainerMappedDirectories` in Windows containers, which look like a symbolic link, but are not), let's move it out of the header. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, symbolic links have a type: a "file symlink" must point at a file, and a "directory symlink" must point at a directory. If the type of symlink does not match its target, it doesn't work. Git does not record the type of symlink in the index or in a tree. On checkout it'll guess the type, which only works if the target exists at the time the symlink is created. This may often not be the case, for example when the link points at a directory inside a submodule. By specifying `symlink=file` or `symlink=dir` the user can specify what type of symlink Git should create, so Git doesn't have to rely on unreliable heuristics. Signed-off-by: Bert Belder <bertbelder@gmail.com> 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>
The previous commits disabled NTLM authentication by default due to its cryptographic weaknesses. Users can re-enable it via the config setting http.<url>.allowNTLMAuth, but this requires manual intervention. Credential helpers may have knowledge about which servers are trusted for NTLM authentication (e.g., known on-prem Azure DevOps instances). To allow them to signal this trust, introduce a simple negotiation: when NTLM is suppressed and the server offered it, Git advertises ntlm=suppressed to the credential helper. The helper can respond with ntlm=allow to re-enable NTLM for this request. This happens precisely at the point where we would otherwise warn the user about NTLM being suppressed, ensuring the capability is only advertised when relevant. Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It was already decided in ef22148 (clean: do not traverse mount points, 2018-12-07) that we shouldn't traverse NTFS junctions/bind mounts when using `git clean`, partly because they're sometimes used in worktrees. But the same check wasn't applied to `remove_dir_recurse()` in `dir.c`, which `git worktree remove` uses. So removing a worktree suffers the same problem we had previously with `git clean`. Let's add the same guard from ef22148. Signed-off-by: Maks Kuznia <makskuznia244@gmail.com>
While the currently used way to detect the number of CPU cores on Windows is nice and straight-forward, GetSystemInfo() only gives us access to the number of processors within the current group. [1] While that is usually fine for systems with a single physical CPU, separate physical sockets are typically separate groups. Switch to using GetLogicalProcessorInformationEx() to handle multi-socket systems better. [1] https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-system_info#members This fixes git-for-windows#4766 Co-Authored-by: Herman Semenov <GermanAizek@yandex.ru> Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Add tests exercising the interaction between http.emptyAuth and servers that advertise Negotiate (SPNEGO) authentication. Verify that auto mode gives Negotiate a chance via empty auth (resulting in two 401 responses before falling through to credential_fill with Basic credentials), and that false mode strips Negotiate immediately (only one 401 response). Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com>
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>
Getting started contributing to Git can be difficult on a Windows machine. CONTRIBUTING.md contains a guide to getting started, including detailed steps for setting up build tools, running tests, and submitting patches to upstream. [includes an example by Pratik Karki how to submit v2, v3, v4, etc.] Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
On Windows, the current working directory is pretty much guaranteed to contain a colon. If we feed that path to CVS, it mistakes it for a separator between host and port, though. This has not been a problem so far because Git for Windows uses MSYS2's Bash using a POSIX emulation layer that also pretends that the current directory is a Unix path (at least as long as we're in a shell script). However, that is rather limiting, as Git for Windows also explores other ports of other Unix shells. One of those is BusyBox-w32's ash, which is a native port (i.e. *not* using any POSIX emulation layer, and certainly not emulating Unix paths). So let's just detect if there is a colon in $PWD and punt in that case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and Philip Oakley. Helped-by: Clive Chan <cc@clive.io> Helped-by: Adric Norris <landstander668@gmail.com> Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com> Helped-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Brendan Forster <brendan@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
These are Git for Windows' Git GUI and gitk patches. We will have to decide at some point what to do about them, but that's a little lower priority (as Git GUI seems to be unmaintained for the time being, and the gitk maintainer keeps a very low profile on the Git mailing list, too). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git 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>
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>
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>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
`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>
…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`.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: next
From: 83780fd64c (Turn
git surveyinto a deprecated shim overgit repo structure(git-for-windows#6268), 2026-07-08) (9c06f89fec..83780fd64c)Resolved: d189f7c (README.md: Add a Windows-specific preamble, 2014-01-10)
Resolved by keeping the Git for Windows preamble (patch intent) above the upstream Git README content, replacing upstream's updated CI badges with the GfW-specific badges and build instructions
Range-diff
1: d189f7c ! 1: 573b8ef README.md: Add a Windows-specific preamble
Resolved: 24603af (ci: only run the expensive tests in the Windows tests for now, 2026-06-12)
adapted MSYSTEM guard to use upstream's renamed $CI_EVENT variable instead of $GITHUB_EVENT_NAME
Range-diff
1: 24603af ! 1: 609e5c6 ci: only run the expensive tests in the Windows tests for now
To: 563ad9683b (Turn
git surveyinto a deprecated shim overgit repo structure(git-for-windows#6268), 2026-07-08) (c823a14c19..563ad9683b)Statistics
Range-diff (click to expand)
1: 4840834 < -: ---------- ci(dockerized): reduce the PID limit for private repositories
2: f2417cc = 1: 1ab739d mingw: skip symlink type auto-detection for network share targets
3: 7f27c44 < -: ---------- Merge branch 'fix-ci'
4: e53e8ca = 2: dc22277 unix-socket: avoid leak when initialization fails
5: 3e1e418 = 3: 1d7bb84 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: 7c5f485 = 4: dac47bb grep: prevent
^$false match at end of file7: c70e823 = 5: c2e9d46 Merge branch 'v2.53.0.windows.3'
8: a19627a = 6: 23e6942 Merge branch 'fixes-from-the-git-mailing-list'
18: 0fb17ea = 7: ccaa0cf t9350: point out that refs are not updated correctly
20: 8185af1 = 8: 36c0626 transport-helper: add trailing --
21: 1779a36 = 9: f8129c5 mingw: demonstrate a
git addissue with NTFS junctions23: 5dd02db = 10: 66d1a8d t5505/t5516: allow running without
.git/branches/in the templates24: e7a1ce3 = 11: e109674 remote-helper: check helper status after import/export
25: a2adbce = 12: d3b2d30 strbuf_realpath(): use platform-dependent API if available
30: 963eade = 13: 7f2aa87 mingw: include the Python parts in the build
31: bda5c6c = 14: 3185e76 t5505/t5516: fix white-space around redirectors
26: 727c5f5 = 15: d2c6340 http: use new "best effort" strategy for Secure Channel revoke checking
32: 05234d6 = 16: b8953e2 ci: bump actions/checkout from 6 to 7
33: 4af2a48 = 17: 9a95d3d Always auto-gc after calling a fast-import transport
34: 7d88298 = 18: dde57cb mingw: prevent regressions with "drive-less" absolute paths
35: 232b7d6 = 19: a850cce transport: optionally disable side-band-64k
36: a5dab85 = 20: 456131d mingw: fix fatal error working on mapped network drives on Windows
37: 97c9abc = 21: 0eba222 clink.pl: fix MSVC compile script to handle libcurl-d.lib
38: 6a264dc = 22: 0918704 mingw: implement a platform-specific
strbuf_realpath()51: e7d359b = 23: a45e5d3 windows: skip linking
git-<command>for built-ins52: 93ffb5e = 24: a9b5bea mingw: stop hard-coding
CC = gcc53: 5b5fe87 = 25: daaa905 mingw: drop the -D_USE_32BIT_TIME_T option
54: dcf6dee = 26: 8ccbd4b mingw: only use -Wl,--large-address-aware for 32-bit builds
55: 5e981f8 = 27: da3b49c mingw: avoid over-specifying
--pic-executable56: cc0b11e = 28: 51b8844 mingw: set the prefix and HOST_CPU as per MSYS2's settings
57: f5ae89e = 29: e9a7e84 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
58: 4ab1299 = 30: 223cc22 mingw: rely on MSYS2's metadata instead of hard-coding it
59: 1e8d692 = 31: 8109c7d mingw: always define
ETC_*for MSYS2 environments9: 2f7a790 = 32: 524f012 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
60: 44125ef = 33: 38f0959 max_tree_depth: lower it for clang builds in general on Windows
10: 63f6cb4 = 34: 1c0b194 vcpkg_install: detect lack of Git
61: d5dfd70 = 35: a662ce4 mingw: ensure valid CTYPE
11: 0933ffd = 36: 05f30f9 vcpkg_install: add comment regarding slow network connections
62: fee4b27 = 37: c5086ac mingw: allow
git.exeto be used instead of the "Git wrapper"12: c4f677d = 38: f8f1f87 vcbuild: install ARM64 dependencies when building ARM64 binaries
64: b4e3a80 = 39: b643178 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
13: b394bd4 = 40: 54eeab3 vcbuild: add an option to install individual 'features'
66: ea07edb = 41: c6a2b52 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
14: c13cdcf = 42: 6c82a08 cmake: allow building for Windows/ARM64
68: 78f3be5 = 43: 7338ef5 clink.pl: fix libexpatd.lib link error when using MSVC
15: 7f77939 = 44: f04371e ci(vs-build) also build Windows/ARM64 artifacts
70: 6774415 = 45: bb98d15 Makefile: clean up .ilk files when MSVC=1
16: e7c5fa5 = 46: 958b43d vcbuild: stop hard-coding OpenSSL as a dependency
72: 859a85f = 47: 52e1e3e vcbuild: add support for compiling Windows resource files
17: f7f51b9 = 48: 67b9593 cmake(): allow setting HOST_CPU for cross-compilation
74: 0b4fc85 = 49: cdea8e0 config.mak.uname: add git.rc to MSVC builds
19: 44cc5cc = 50: 2bc0f9d CMake: default Visual Studio generator has changed
78: 877a1ca = 51: 4ae6570 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
22: 41664a6 = 52: 6bb38cd .gitignore: add Visual Studio CMakeSetting.json file
82: 03384c5 = 53: a2c33ea clink.pl: move default linker options for MSVC=1 builds
27: 9d48258 = 54: 1015fe8 subtree: update
contrib/subtreetesttarget28: 0ddfb39 = 55: f2b87ae CMakeLists: add default "x64-windows" arch for Visual Studio
29: db8f629 = 56: 31a2079 setup: properly use "%(prefix)/" when in WSL
86: d6a4ea9 = 57: 288ec17 Add config option
windows.appendAtomically87: aa8593a = 58: 7ff25cd cmake: install headless-git.
75: 997fccc = 59: 1294d08 MinGW: link as terminal server aware
39: d6ceea3 = 60: 8c36736 t3701: verify that we can add lots of files interactively
40: 7f79fef = 61: 06c8d57 commit: accept "scissors" with CR/LF line endings
41: 7d27ca7 = 62: 7bc1471 t0014: fix indentation
42: 707206e = 63: 84d9df3 git-gui: accommodate for intent-to-add files
43: f848ea9 = 64: 3ff10e6 mingw: allow for longer paths in
parse_interpreter()44: 28e2b31 = 65: ffe166d compat/vcbuild: document preferred way to build in Visual Studio
45: b767416 = 66: e50395a http: optionally send SSL client certificate
46: 579d01c = 67: 391f469 ci: run
contrib/subtreetests in CI builds47: 96de4e5 = 68: a50f918 CMake: show Win32 and Generator_platform build-option values
48: 4119fed = 69: e053fb0 compat/mingw.c: do not warn when failing to get owner
49: b38a04a = 70: a9fb350 mingw: $env:TERM="xterm-256color" for newer OSes
50: 3dfaee1 = 71: 8326b1f winansi: check result and Buffer before using Name
91: 76960dd = 72: 02a68ab mingw: change core.fsyncObjectFiles = 1 by default
92: 80033fd = 73: 9fa983d Fix Windows version resources
93: 25e7783 = 74: 6d83ff0 status: fix for old-style submodules with commondir
94: 0784a80 = 75: b27248c git.rc: include winuser.h
63: eb65b76 = 76: 952c24d revision: create mark_trees_uninteresting_dense()
65: d5a730a = 77: 00ddfab survey: stub in new experimental 'git-survey' command
67: a2247c9 = 78: b6b6615 survey: add command line opts to select references
69: b2b3d49 = 79: 603f287 survey: start pretty printing data in table form
119: 2612fe0 = 80: d6d1f05 mingw: Support
git_terminal_promptwith more terminals71: 417eaa9 = 81: 62ea88b survey: add object count summary
121: 29edefb = 82: f6adc8a compat/terminal.c: only use the Windows console if bash 'read -r' fails
73: edd590d = 83: a3777d7 survey: summarize total sizes by object type
123: 205669d = 84: 3989a25 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
76: 0ea38ac = 85: 468e1a0 survey: show progress during object walk
77: c9effa8 = 86: f9bde79 mingw: make sure
errnois set correctly when socket operations fail127: bb6cd67 = 87: c0005e7 t5563: verify that NTLM authentication works
128: 2b03f7c = 88: 636f8d7 mingw: introduce code to detect whether we're inside a Windows container
125: 15481f8 = 89: 15152ae Win32: symlink: move phantom symlink creation to a separate function
79: 605b123 = 90: 92c995e http: optionally load libcurl lazily
80: cf15964 = 91: 49736d9 survey: add ability to track prioritized lists
81: 73656c0 = 92: 21bcdae compat/mingw: handle WSA errors in strerror
131: f4044d4 = 93: f3a4c69 http: disallow NTLM authentication by default
132: 7594bfa = 94: 0842888 mingw: when running in a Windows container, try to rename() harder
129: fcfbcc6 = 95: 9b2be26 Introduce helper to create symlinks that knows about index_state
83: 94370cf = 96: dfd771b http: support lazy-loading libcurl also on Windows
84: 32291a1 = 97: c4114d0 survey: add report of "largest" paths
85: 2099eda = 98: 7b7ccfd compat/mingw: drop outdated comment
135: b10d0fb = 99: b911134 http: warn if might have failed because of NTLM
136: 528351f = 100: 48bd4d9 mingw: move the file_attr_to_st_mode() function definition
133: 3cb68cd = 101: 8b5018a mingw: allow to specify the symlink type in .gitattributes
88: a6fd28d = 102: 9ac38e0 http: when loading libcurl lazily, allow for multiple SSL backends
89: 0fb4f70 = 103: d32c7b5 survey: add --top= option and config
90: 60484b0 = 104: e79660c t0301: actually test credential-cache on Windows
139: c5230d6 = 105: 4ee79c0 credential: advertise NTLM suppression and allow helpers to re-enable
140: 33c88ae = 106: 5084262 mingw: Windows Docker volumes are not symbolic links
137: bd8e701 = 107: 7314c28 Win32: symlink: add test for
symlinkattribute95: 00be1aa = 108: 1c49e40 mingw: do load libcurl dynamically by default
96: d03ad86 = 109: 888a412 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
97: dfd84bf = 110: fc6b097 mingw: suggest
windows.appendAtomicallyin more cases98: 36b802b = 111: 8cedc3d win32: use native ANSI sequence processing, if possible
99: 02f58a1 = 112: 02708fc common-main.c: fflush stdout buffer upon exit
100: 1b907ed = 113: edda452 t5601/t7406(mingw): do run tests with symlink support
101: 9de15b3 = 114: 7df2b7d Fallback to AppData if XDG_CONFIG_HOME is unset
102: 6f74a7e = 115: 70068a5 run-command: be helpful with Git LFS fails on Windows 7
103: 2d241bd = 116: 8efd8a0 survey: clearly note the experimental nature in the output
104: 5913e1b = 117: 178d197 credential-cache: handle ECONNREFUSED gracefully
105: 17ad07c = 118: 58317cb reftable: do make sure to use custom allocators
106: 811071b = 119: a9e7615 check-whitespace: avoid alerts about upstream commits
107: fd0db65 = 120: c8b75f2 t/t5571-prep-push-hook.sh: Add test with writing to stderr
144: 4d0ddbc = 121: fcad71e dir: do not traverse mount points
145: 48001c1 = 122: 59714ab win32: thread-utils: handle multi-socket systems
146: 85b32ba = 123: db41ba5 t5563: add tests for http.emptyAuth with Negotiate
147: 8909c53 = 124: 77fa65a entry: flush fscache after creating directories and writing files
148: df210d2 = 125: aabae99 ci(macos): skip the
git p4tests149: a160f1c = 126: 280defe mingw: work around rename() failing on a read-only file
108: 1b41c30 = 127: c9d5eef diff-delta: widen struct delta_index size fields to size_t
109: 11767ae = 128: 9628951 delta: widen create_delta_index() parameter to size_t
110: 71b5aaa = 129: d71bfb5 pack-objects: widen delta-cache accounting to size_t
111: eef941b = 130: 4d0bb47 pack-objects: widen free_unpacked() return to size_t
112: c80956e = 131: b243150 pack-objects: widen mem_usage and try_delta out-param to size_t
113: 7a353cb = 132: 9eaf355 delta: widen create_delta() and diff_delta() to size_t
114: fbd2022 ! 133: 70cd6f1 packfile, git-zlib: widen use_pack() and zstream avail fields to size_t
115: 4a4d71f = 134: 900e7d4 archive-zip: widen zlib_deflate_raw()'s maxsize local to size_t
116: 62d9b88 = 135: 215ff72 diff: widen deflate_it()'s bound local from int to size_t
117: 09305a1 = 136: 7f43dd9 http-push: widen start_put()'s size local from ssize_t to size_t
118: b429414 = 137: 991810e t/helper/test-pack-deltas: widen do_compress()'s maxsize local to size_t
120: 25ac476 = 138: a7c6eeb git-zlib: widen git_deflate_bound() to size_t
122: 0a57c49 = 139: 08de64a diff: stop truncating the deflated-binary-diff size on Windows
124: f97636d = 140: 370cebb convert: widen gather_convert_stats() helpers to size_t
126: 381eabc = 141: 25f2465 read-cache: stop truncating index blob sizes on Windows
130: 9c9dd4a = 142: d43fe07 xdiff-interface: widen buffer_is_binary() size parameter to size_t
153: d8c61de = 143: 7344bca tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
134: a14d05a = 144: 47ba1c6 combine-diff: stop truncating combined-diff blob sizes on Windows
155: 7654928 = 145: 48642b2 tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
138: f8d0a07 = 146: 9caa9ec diff: widen textconv_object() size out-param to size_t
157: ce59bad = 147: 84fc134 pack-objects: drop the two tree-walk casts in the preferred-base path
141: 8e751db = 148: 27432e1 clean: do not traverse mount points
142: a8912f8 = 149: f7543cf pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
143: e1c964a = 150: 1ba36fe diffcore: widen struct diff_filespec.size to size_t
158: e3cbc94 = 151: b4f429a diff-delta: widen sizeof_delta_index() return to size_t
160: c5527e0 = 152: 997df28 tree: widen struct tree.size and parse_tree_buffer() to size_t
162: 59500a9 = 153: 6f30ad2 commit: widen the commit-buffer API to size_t
164: 2efab4d = 154: 9b23d16 blame: widen find_line_starts() len parameter to size_t
166: f5499e4 = 155: 5ac43ec grep: widen struct grep_source.size and grep_buffer() to size_t
168: ddf73bd = 156: 2b55188 fast-export: drop the export_blob() size cast and widen anonymize_blob()
170: b3a485d = 157: 5638ce0 repo: drop the inflated-size cast in count_objects()
172: 23f7021 = 158: 424462e unpack-objects: widen the size-passing infrastructure to size_t
150: 0c03195 = 159: f341a3f clean: remove mount points when possible
151: 6633312 = 160: 98085ff mingw: optionally enable wsl compability file mode bits
152: 3cf9039 = 161: 43bbf19 Refuse to follow invalid paths in
.gitfiles154: e60325f = 162: 23331c1 Merge branch 'size-t/pack-objects-delta'
156: 1665f64 = 163: 7e41dbb Merge branch 'size-t/pack-bitmap'
159: b51d816 = 164: 236da57 Merge branch 'size-t/diff'
161: accf436 = 165: 109bf25 Merge branch 'size-t/diff-delta-sizeof'
163: a05ca31 = 166: 80161a4 Merge branch 'size-t/tree'
165: 48f5b0d = 167: ab20794 Merge branch 'size-t/commit'
167: 56b11dd = 168: 93f5706 Merge branch 'size-t/blame'
169: 6605b84 = 169: 6bf3872 Merge branch 'size-t/grep'
171: 4604f52 = 170: 49892fa Merge branch 'size-t/fast-export'
173: 9274ef0 = 171: 84e0e05 Merge branch 'size-t/repo'
174: 8e50783 = 172: f761eb3 Merge branch 'size-t/unpack-objects'
175: 91525b4 = 173: ced4e28 Merge branch 'topic/size-t' into size-t-followups
176: 55c9de5 = 174: 6449643 pack-objects: drop cast_size_t_to_ulong shims in get_delta()
177: f4c87e0 = 175: 8452549 pack-objects: drop cast_size_t_to_ulong shims in try_delta()
178: 44f0f01 = 176: 9fb2be5 pack-objects: drop the last size shim in write_no_reuse_object()
179: 3b5f8d7 = 177: dff283a blame: widen struct blame_scoreboard.final_buf_size to size_t
180: d11f162 = 178: 55dad66 fast-import: drop the six size casts in the object-read paths
183: 7bfd463 = 179: bdb36df Merge branch 'bump-ci-actions/checkout-from-6-to-7'
181: 074eaea = 180: f079b0c t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
184: 5eabf70 = 181: bd048f3 Merge 'remote-hg-prerequisites' into HEAD
182: 95e08b8 = 182: e0ba85a Drop the
cast_size_t_to_ulong()helper187: 5171e46 = 183: 73f40dc Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
185: e7717f8 = 184: 3aeef26 Merge branch 'drive-prefix'
189: 2e9b034 = 185: 41acaff Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
190: a268d94 = 186: 00d9414 coverity: skip building with Rust, for now
186: 56757e5 = 187: 860f103 Merge branch 'msys2-python'
188: 391c2dd = 188: 1e47503 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
191: 02b0b8e = 189: a9dd817 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
192: 58702a6 = 190: f83f139 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
193: f4427ca = 191: eba64f3 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction194: 1b8a080 = 192: 1ebc069 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
195: fb222fc = 193: bfc9ab4 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
196: 18b37bb = 194: 14a84bf Merge 'add-p-many-files'
197: 700e7ca = 195: 5165270 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
198: 519e4e1 = 196: 292c0da Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
199: 39a114e = 197: 8a4ebf6 Merge 'git-gui/js/intent-to-add'
200: a5af66c = 198: 47ae3ae Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
201: 75d1a0f = 199: f67a6a4 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
202: c07cb9e = 200: 0da84e4 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
203: 5e5f247 = 201: 380c948 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path204: b707cf2 = 202: dd1c042 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
205: 4ecf037 = 203: d13386c Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
206: 9822f46 = 204: bbe3b02 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests207: f19eab1 = 205: 4973410 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
208: 4333001 = 206: ee8bad4 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory209: e793d55 = 207: 3d65bc8 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
210: c67bb40 = 208: 011a423 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
211: 88597bf = 209: c3e54cc Merge branch 'optionally-dont-append-atomically-on-windows'
212: 2378c9d = 210: 1da721e Merge branch 'fsync-object-files-always'
213: 028c95f = 211: f5158c5 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
214: 7d6ada4 = 212: fdf12ac Fix Windows version resources (Fix Windows version resources git#4092)
215: 8613120 = 213: bf24795 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
216: e2ee697 = 214: d8bf2b3 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)217: b216e90 = 215: ad7c981 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)218: 352075c = 216: 0c52f58 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283219: 88f08b9 = 217: d39b32b Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
220: 5b233d1 = 218: c48c1e5 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
221: 619298d = 219: 5426c95 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
222: 8be1e02 = 220: fda0224 Merge branch 'nano-server'
223: c145fd4 = 221: 5b10262 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
224: edc683b = 222: 772f558 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
225: 3b84d4c = 223: 9e59ad4 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
226: 665e269 = 224: 11f3fef Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
227: ed866e5 = 225: 18ffa84 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
228: de93d40 = 226: 2505a28 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
229: 28be660 = 227: 0d4948e Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
230: 971ef4e = 228: 77e0601 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
231: 0cfbbb3 = 229: 5763be6 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
232: 31c2c3d = 230: 7dfd298 Merge branch 'reftable-vs-custom-allocators'
233: e24eed2 = 231: 288c041 Merge branch 'check-whitespace-only-downstream'
234: 1bf6f31 = 232: 5b7c7e4 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)
235: 21b2b32 = 233: 24f8692 Merge branch 'disallow-ntlm-auth-by-default'
236: fe24dcb = 234: 0bfaf6b Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)237: 15527e9 = 235: 9f1d796 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
238: ea3b5d2 = 236: f54ef63 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
239: 2e97609 = 237: 5e2c1e5 entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
240: ba96ee1 = 238: 24ed743 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)241: ab2142d = 239: fa9fbba Merge branch 'msys2'
242: df73f54 = 240: df40fc6 Merge 'docker-volumes-are-no-symlinks'
243: 7fdda05 = 241: 851fad7 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
244: 97b1884 = 242: 96c63f0 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
245: b3aeb99 = 243: a49acd1 Merge branch 'dont-clean-junctions'
246: dbffecd = 244: 82eadcf Merge branch 'wsl-file-mode-bits'
247: 090224c = 245: 68dc11e Merge branch 'validate-dotgit'
248: 7664591 = 246: 3692e55 Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
249: 12619e2 = 247: dcfd516 Merge branch 'skip-rust-in-the-coverity-builds'
250: 4b12ac6 = 248: db0bb4e Merge branch 'ready-for-upstream'
253: e571273 = 249: e9333b3 Win32: make FILETIME conversion functions public
254: fb117fa = 250: 8411f73 Win32: dirent.c: Move opendir down
255: 51e631d = 251: 6563329 mingw: make the dirent implementation pluggable
256: 4033a2c = 252: 8d23a69 Win32: make the lstat implementation pluggable
257: 4c9af26 = 253: 51fbf59 mingw: add infrastructure for read-only file system level caches
258: 7a7bd23 = 254: 825bfee mingw: add a cache below mingw's lstat and dirent implementations
259: 187c27f = 255: e6c8656 fscache: load directories only once
260: 35df7af = 256: 9a48afa fscache: add key for GIT_TRACE_FSCACHE
261: f2ea83c = 257: 31d61f4 fscache: remember not-found directories
262: 5f0210d = 258: 40909cc fscache: add a test for the dir-not-found optimization
263: dba951b = 259: 62c0f68 add: use preload-index and fscache for performance
264: f39f9b7 = 260: 0967465 dir.c: make add_excludes aware of fscache during status
265: 072e6c3 = 261: 64d1408 fscache: make fscache_enabled() public
266: fca7762 = 262: 6b5aa33 dir.c: regression fix for add_excludes with fscache
267: 869f649 = 263: 8ec94a0 fetch-pack.c: enable fscache for stats under .git/objects
268: de46403 = 264: 768061e checkout.c: enable fscache for checkout again
269: fd95e75 = 265: 97fff8f Enable the filesystem cache (fscache) in refresh_index().
270: 51bcf01 = 266: a352a68 fscache: use FindFirstFileExW to avoid retrieving the short name
271: 7b95792 = 267: 03b3bab fscache: add GIT_TEST_FSCACHE support
272: e2d6c63 = 268: 16e7d49 fscache: add fscache hit statistics
273: 253fb74 = 269: 706733d unpack-trees: enable fscache for sparse-checkout
274: 7c8cdf6 = 270: 159b9b6 status: disable and free fscache at the end of the status command
275: a561fc6 = 271: 46b9a87 mem_pool: add GIT_TRACE_MEMPOOL support
276: 2700fd0 = 272: 614e74b fscache: fscache takes an initial size
251: a8cd36b = 273: 9bac11a git-gui--askyesno: fix funny text wrapping
277: 0869527 = 274: 56a8741 fscache: update fscache to be thread specific instead of global
252: a31531e = 275: 18b9e5a git-gui--askyesno (mingw): use Git for Windows' icon, if available
278: 03dd9c7 = 276: 0534901 fscache: teach fscache to use mempool
279: 72ae60f = 277: c4e2086 fscache: make fscache_enable() thread safe
280: 6536743 = 278: 83d959e fscache: teach fscache to use NtQueryDirectoryFile
281: 3ce947b = 279: bc9732c fscache: remember the reparse tag for each entry
282: c1952fc = 280: e501497 fscache: Windows Docker volumes are not symbolic links
283: 0313709 = 281: d938ad4 fscache: optionally enable wsl compability file mode bits
284: 2fca3e8 = 282: 4cae3f5 Merge branch 'fscache'
285: 0351df4 = 283: e9f2738 fscache: implement an FSCache-aware is_mount_point()
286: 73c83a6 = 284: 7c1e3e0 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
287: c894e2d = 285: 03bcc21 clean: make use of FSCache
288: 0dc474b = 286: d98d2e0 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
289: bcba527 = 287: a00e4f4 Merge branch 'dont-clean-junctions-fscache'
290: 1c37bdd = 288: d05532d pack-objects (mingw): demonstrate a segmentation fault with large deltas
291: 5058e69 = 289: af7a2ac mingw: support long paths
292: 3e75550 = 290: 45c770f win32(long path support): leave drive-less absolute paths intact
293: 53a5916 = 291: 51a3a82 compat/fsmonitor/fsm-*-win32: support long paths
294: aa1d693 = 292: 5182026 clean: suggest using
core.longPathsif paths are too long to remove295: 1a11380 = 293: f3b2aa6 mingw: explicitly specify with which cmd to prefix the cmdline
296: 901c675 = 294: 5ec9fdf mingw: when path_lookup() failed, try BusyBox
297: 8742620 = 295: ee7b850 test-tool: learn to act as a drop-in replacement for
iconv298: 0c020ba = 296: f4b85ee tests(mingw): if
iconvis unavailable, usetest-helper --iconv299: 185a498 = 297: e42182e gitattributes: mark .png files as binary
300: 807b739 = 298: d9aa91d tests: move test PNGs into t/lib-diff/
301: 4c75974 = 299: 0bacc27 tests: only override sort & find if there are usable ones in /usr/bin/
302: a7e9f6e = 300: fe1492f tests: use the correct path separator with BusyBox
303: e97feb1 = 301: c21fa23 mingw: only use Bash-ism
builtin pwd -Wwhen available304: 37c0247 = 302: cd0ddd6 tests (mingw): remove Bash-specific pwd option
305: b4b17d0 = 303: 78c6f89 test-lib: add BUSYBOX prerequisite
306: 306ebf6 = 304: 236f0d6 t5003: use binary file from t/lib-diff/
307: cf1735e = 305: 69dd814 t5532: workaround for BusyBox on Windows
308: 5a0daac = 306: 3e33c7c t5605: special-case hardlink test for BusyBox-w32
309: 8e0d7ce = 307: 6bb0b4a t5813: allow for $PWD to be a Windows path
310: 000dde6 = 308: 4ff9028 t9200: skip tests when $PWD contains a colon
311: 22c1334 = 309: 7eeac2d Describe Git for Windows' architecture
312: 5ecc36f = 310: 7872a9d Add an AGENTS.md file to help with AI-assisted debugging/development
313: f5279bb = 311: a1e5743 Modify the Code of Conduct for Git for Windows
324: 62f9675 = 312: 4c4a12f Add a GitHub workflow to monitor component updates
315: 2cc738a = 313: 6e9088e CONTRIBUTING.md: add guide for first-time contributors
318: 356bfb4 = 314: b19292f Partially un-revert "editor: save and reset terminal after calling EDITOR"
321: f0e402f = 315: 82209e4 reset: reinstate support for the deprecated --stdin option
325: 1518988 = 316: 949173e fsmonitor: reintroduce core.useBuiltinFSMonitor
328: d3c448d = 317: a06ec98 dependabot: help keeping GitHub Actions versions up to date
317: d189f7c ! 318: 573b8ef README.md: Add a Windows-specific preamble
320: 322f634 = 319: a3347e0 Add an issue template
323: b0945fe = 320: 556fe74 Modify the GitHub Pull Request template (to reflect Git for Windows)
327: bed2eda = 321: 921e31c SECURITY.md: document Git for Windows' policies
314: 6dba317 = 322: 2d6351d Merge branch 'gitk-and-git-gui-patches'
316: e77bec1 = 323: 5a3234e Merge branch 'long-paths'
319: c2c6414 = 324: 6c8100a Merge branch 'busybox-w32'
322: 127cc5c = 325: 39971a4 Merge branch 'un-revert-editor-save-and-reset'
326: 3c868cd = 326: d53cea3 Merge branch 'phase-out-reset-stdin'
329: 9b4d8ca = 327: 0dec10f Merge branch 'deprecate-core.useBuiltinFSMonitor'
330: 24603af ! 328: 609e5c6 ci: only run the expensive tests in the Windows tests for now
331: 6f92a8d = 329: 9eb8f64 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
332: 99adcb0 = 330: 268929b Merge 'readme' into HEAD
333: a19411a = 331: 813e4cb build(deps): bump actions/cache from 5 to 6
334: bf79a6d = 332: 8131e0a build(deps): bump actions/cache from 5 to 6 (build(deps): bump actions/cache from 5 to 6 git#6303)
335: 031f148 = 333: 77a2cad repo: split annotated tags out from total tag count in structure
336: 90cf0c8 = 334: 41ae3b8 repo: filter the structure scope via --ref-filter=
337: a8e3ca4 = 335: 08e9404 repo: report top-N paths by count, disk, and inflated size in structure
338: bcc4040 = 336: f9ac40b t1901: cover the --top option of
git repo structure339: a2b4243 = 337: 3845747 repo: read the
--topdefault fromrepo.structure.top340: 7fed964 = 338: e146a73 git-survey: announce the upcoming pivot into
git repo structure341: ddaec6e = 339: ac95d58 survey: turn into a thin shim over
git repo structure342: 83780fd = 340: 563ad96 Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)Truncated; see the full conflict report in the workflow run summary.