Rebase shears/next: 3 conflict(s) (2 skipped, 1 resolved) (#32086430878) - #381
Open
gitforwindowshelper[bot] wants to merge 331 commits into
Open
Rebase shears/next: 3 conflict(s) (2 skipped, 1 resolved) (#32086430878)#381gitforwindowshelper[bot] wants to merge 331 commits into
gitforwindowshelper[bot] wants to merge 331 commits into
Conversation
Since we are already walking our reachable objects using the path-walk API,
let's now collect lists of the paths that contribute most to different
metrics. Specifically, we care about
* Number of versions.
* Total size on disk.
* Total inflated size (no delta or zlib compression).
This information can be critical to discovering which parts of the
repository are causing the most growth, especially on-disk size. Different
packing strategies might help compress data more efficiently, but the toal
inflated size is a representation of the raw size of all snapshots of those
paths. Even when stored efficiently on disk, that size represents how much
information must be processed to complete a command such as 'git blame'.
The exact disk size seems to be not quite robust enough for testing, as
could be seen by the `linux-musl-meson` job consistently failing, possibly
because of zlib-ng deflates differently: t8100.4(git survey
(default)) was failing with a symptom like this:
TOTAL OBJECT SIZES BY TYPE
===============================================
Object Type | Count | Disk Size | Inflated Size
------------+-------+-----------+--------------
- Commits | 10 | 1523 | 2153
+ Commits | 10 | 1528 | 2153
Trees | 10 | 495 | 1706
Blobs | 10 | 191 | 101
- Tags | 4 | 510 | 528
+ Tags | 4 | 547 | 528
This means: the disk size is unlikely something we can verify robustly.
Since zlib-ng seems to increase the disk size of the tags from 528 to
547, we cannot even assume that the disk size is always smaller than the
inflated size. We will most likely want to either skip verifying the
disk size altogether, or go for some kind of fuzzy matching, say, by
replacing `s/ 1[45][0-9][0-9] / ~1.5k /` and `s/ [45][0-9][0-9] / ~½k /`
or something like that.
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This comment has been true for the longest time; The combination of the two preceding commits made it incorrect, so let's drop that comment. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NTLM authentication is relatively weak. This is the case even with the
default setting of modern Windows versions, where NTLMv1 and LanManager
are disabled and only NTLMv2 is enabled: NTLMv2 hashes of even
reasonably complex 8-character passwords can be broken in a matter of
days, given enough compute resources.
Even worse: On Windows, NTLM authentication uses Security Support
Provider Interface ("SSPI"), which provides the credentials without
requiring the user to type them in.
Which means that an attacker could talk an unsuspecting user into
cloning from a server that is under the attacker's control and extracts
the user's NTLMv2 hash without their knowledge.
For that reason, let's disallow NTLM authentication by default.
NTLM authentication is quite simple to set up, though, and therefore
there are still some on-prem Azure DevOps setups out there whose users
and/or automation rely on this type of authentication. To give them an
escape hatch, introduce the `http.<url>.allowNTLMAuth` config setting
that can be set to `true` to opt back into using NTLM for a specific
remote repository.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Move the default `-ENTRY` and `-SUBSYSTEM` arguments for MSVC=1 builds from `config.mak.uname` into `clink.pl`. These args are constant for console-mode executables. Add support to `clink.pl` for generating a Win32 GUI application using the `-mwindows` argument (to match how GCC does it). This changes the `-ENTRY` and `-SUBSYSTEM` arguments accordingly. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
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>
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>
…ctory Internally, Git expects the environment variable `HOME` to be set, and to point to the current user's home directory. This environment variable is not set by default on Windows, and therefore Git tries its best to construct one if it finds `HOME` unset. There are actually two different approaches Git tries: first, it looks at `HOMEDRIVE`/`HOMEPATH` because this is widely used in corporate environments with roaming profiles, and a user generally wants their global Git settings to be in a roaming profile. Only when `HOMEDRIVE`/`HOMEPATH` is either unset or does not point to a valid location, Git will fall back to using `USERPROFILE` instead. However, starting with Windows Vista, for secondary logons and services, the environment variables `HOMEDRIVE`/`HOMEPATH` point to Windows' system directory (usually `C:\Windows\system32`). That is undesirable, and that location is usually write-protected anyway. So let's verify that the `HOMEDRIVE`/`HOMEPATH` combo does not point to Windows' system directory before using it, falling back to `USERPROFILE` if it does. This fixes git-for-windows#2709 Initial-Path-by: Ivan Pozdeev <vano@mail.mipt.ru> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
headless-git is a git executable without opening a console window. It is useful when other GUI executables want to call git. We should install it together with git on Windows. Signed-off-by: Yuyi Wang <Strawberry_Str@hotmail.com>
winuser.h contains the definition of RT_MANIFEST that our LLVM based toolchain needs to understand that we want to embed compat/win32/git.manifest as an application manifest. It currently just embeds it as additional data that Windows doesn't understand. This also helps our GCC based toolchain understand that we only want one copy embedded. It currently embeds one working assembly manifest and one nearly identical, but useless copy as additional data. This also teaches our Visual Studio based buildsystems to pick up the manifest file from git.rc. This means we don't have to explicitly specify it in contrib/buildsystems/Generators/Vcxproj.pm anymore. Slightly counter-intuitively this also means we have to explicitly tell Cmake not to embed a default manifest. This fixes git-for-windows#4707 Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
This will help with Git for Windows' maintenance going forward: It allows Git for Windows to switch its primary libcurl to a variant without the OpenSSL backend, while still loading an alternate when setting `http.sslBackend = openssl`. This is necessary to avoid maintenance headaches with upgrading OpenSSL: its major version name is encoded in the shared library's file name and hence major version updates (temporarily) break libraries that are linked against the OpenSSL library. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In Git for Windows v2.39.0, we fixed a regression where `git.exe` would no longer work in Windows Nano Server (frequently used in Docker containers). This GitHub workflow can be used to verify manually that the Git/Scalar executables work in Nano Server. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When running Git for Windows on a remote APFS filesystem, it would appear that the `mingw_open_append()`/`write()` combination would fail almost exactly like on some CIFS-mounted shares as had been reported in git-for-windows#2753, albeit with a different `errno` value. Let's handle that `errno` value just the same, by suggesting to set `windows.appendAtomically=false`. Signed-off-by: David Lomas <dl3@pale-eds.co.uk> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Windows 10 version 1511 (also known as Anniversary Update), according to https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences introduced native support for ANSI sequence processing. This allows using colors from the entire 24-bit color range. All we need to do is test whether the console's "virtual processing support" can be enabled. If it can, we do not even need to start the `console_thread` to handle ANSI sequences. Or, almost all we need to do: When `console_thread()` does its work, it uses the Unicode-aware `write_console()` function to write to the Win32 Console, which supports Git for Windows' implicit convention that all text that is written is encoded in UTF-8. The same is not necessarily true if native ANSI sequence processing is used, as the output is then subject to the current code page. Let's ensure that the code page is set to `CP_UTF8` as long as Git writes to it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
By default, the buffer type of Windows' `stdout` is unbuffered (_IONBF), and there is no need to manually fflush `stdout`. But some programs, such as the Windows Filtering Platform driver provided by the security software, may change the buffer type of `stdout` to full buffering. This nees `fflush(stdout)` to be called manually, otherwise there will be no output to `stdout`. Signed-off-by: MinarKotonoha <chengzhuo5@qq.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A long time ago, we decided to run tests in Git for Windows' SDK with the default `winsymlinks` mode: copying instead of linking. This is still the default mode of MSYS2 to this day. However, this is not how most users run Git for Windows: As the majority of Git for Windows' users seem to be on Windows 10 and newer, likely having enabled Developer Mode (which allows creating symbolic links without administrator privileges), they will run with symlink support enabled. This is the reason why it is crucial to get the fixes for CVE-2024-? to the users, and also why it is crucial to ensure that the test suite exercises the related test cases. This commit ensures the latter. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In order to be a better Windows citizenship, Git should save its configuration files on AppData folder. This can enables git configuration files be replicated between machines using the same Microsoft account logon which would reduce the friction of setting up Git on new systems. Therefore, if %APPDATA%\Git\config exists, we use it; otherwise $HOME/.config/git/config is used. Signed-off-by: Ariel Lourenco <ariellourenco@users.noreply.github.com>
The sparse tree walk algorithm was created in d5d2e93 (revision: implement sparse algorithm, 2019-01-16) and involves using the mark_trees_uninteresting_sparse() method. This method takes a repository and an oidset of tree IDs, some of which have the UNINTERESTING flag and some of which do not. Create a method that has an equivalent set of preconditions but uses a "dense" walk (recursively visits all reachable trees, as long as they have not previously been marked UNINTERESTING). This is an important difference from mark_tree_uninteresting(), which short-circuits if the given tree has the UNINTERESTING flag. A use of this method will be added in a later change, with a condition set whether the sparse or dense approach should be used. Signed-off-by: Derrick Stolee <stolee@gmail.com>
While this command is definitely something we _want_, chances are that upstreaming this will require substantial changes. We still want to be able to experiment with this before that, to focus on what we need out of this command: To assist with diagnosing issues with large repositories, as well as to help monitoring the growth and the associated painpoints of such repositories. To that end, we are about to integrate this command into `microsoft/git`, to get the tool into the hands of users who need it most, with the idea to iterate in close collaboration between these users and the developers familar with Git's internals. However, we will definitely want to avoid letting anybody have the impression that this command, its exact inner workings, as well as its output format, are anywhere close to stable. To make that fact utterly clear (and thereby protect the freedom to iterate and innovate freely before upstreaming the command), let's mark its output as experimental in all-caps, as the first thing we do. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In 245670c (credential-cache: check for windows specific errors, 2021-09-14) we concluded that on Windows we would always encounter ENETDOWN where we would expect ECONNREFUSED on POSIX systems, when connecting to unix sockets. As reported in [1], we do encounter ECONNREFUSED on Windows if the socket file doesn't exist, but the containing directory does and ENETDOWN if neither exists. We should handle this case like we do on non-windows systems. [1] git-for-windows#4762 (comment) This fixes git-for-windows#5314 Helped-by: M Hickford <mirth.hickford@gmail.com> Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
When checkout.workers > 1 and core.fscache is enabled on Windows, 'git checkout <tree> -- <pathspec>' fails when restoring files into directories that do not yet exist on disk. Two failure modes occur: 1. create_directories(): the fscache returns a stale directory listing that does not include a just-created directory. has_dirs_only_path() reports it as non-existent, triggering the unlink+mkdir recovery path which fails with 'cannot create directory: Directory not empty'. 2. write_pc_item(): after writing and closing a file, lstat() cannot see it through the stale fscache, failing with 'unable to stat just-written file'. With workers=1, write_entry() calls flush_fscache() after each file, keeping the cache in sync. With workers>1, enqueue_checkout() defers the write (and the flush), leaving the cache stale for subsequent entries. Fix both by adding flush_fscache() calls after mkdir() in create_directories() and before lstat() in write_pc_item(). On non-Windows platforms flush_fscache() is a no-op. Assisted-by: Claude Opus 4.6 Signed-off-by: Tyrie Vella <tyrielv@gmail.com>
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>
These are Git for Windows' Git GUI and gitk patches. We will have to decide at some point what to do about them, but that's a little lower priority (as Git GUI seems to be unmaintained for the time being, and the gitk maintainer keeps a very low profile on the Git mailing list, too). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v5...v6) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Mirror what git survey already reports: lightweight tags (pointing straight at a commit/tree/blob) and annotated tags (pointing at an OBJ_TAG that is itself stored as a separate object) are different things in many monorepo contexts, and one of the differences git survey users routinely care about. Add an annotated_tags counter to struct ref_stats, populate it in count_references() by peeking at the ref OID's object type, and expose it as a sub-row under Tags in the table output and as references.tags.annotated.count in the machine-readable formats. Step toward pivoting the standalone git survey command onto git repo structure; this fills the first of the four feature gaps documented in the assessment. Tests in t1901 widened to assert the new row and key. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git repo structure` walks every reference enumerated by `refs_for_each_ref()` and feeds each reference's tip into the path walk that produces the object counts. There is no way to scope the inquiry to a subset of refs, even though that is the most common need when an operator is investigating what part of the history is driving cost: only branches, only release tags, only one remote's view, etc. Add a single `--ref-filter=<pattern>` option that, when given, restricts both the reference count and the object walk to refs whose full name matches one of the patterns. The option is repeatable; multiple patterns form a union, so `--ref-filter='refs/heads/*' --ref-filter='refs/tags/v*'` includes local branches and tags whose short name starts with `v`. Patterns use `wildmatch()` with `WM_PATHNAME` semantics so a `*` does not cross `/`, matching the convention used by `git for-each-ref` positional arguments. Choosing a single flexible filter, rather than a proliferation of per-kind flags like `--branches`, `--tags`, `--remotes`, keeps the option surface small and lets the same mechanism express narrow selections the per-kind flags could not, such as "only release tags" (`'refs/tags/v*'`) or "only one remote's branches" (`'refs/remotes/origin/*'`). Without `--ref-filter`, behaviour is unchanged: every ref `refs_for_each_ref()` enumerates contributes. Both the reference counter and the path-walk seeding (via `add_pending_oid()`) sit on the same callback, so an early return when no pattern matches naturally excludes a ref from both. No separate object-walk machinery is needed. Cover the two interesting code paths with tests in t1901: a single filter narrowing to branches, and two filters unioning to include both branches and tags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` distinguishes itself from `git repo structure` largely by its path-level reporting: in addition to whole-repo totals it lists the paths whose object histories dominate the repository, ranked by raw count, on-disk size, and inflated size, separately for trees and blobs. That is often the most actionable output from `git survey`, since it points an operator at the directories and files that should be reviewed for cleanup, sparse-checkout exclusion, or rewriting. `git repo structure` already drives the same path-walk traversal that `git survey` uses to gather its per-path numbers; the callback simply discards the path. Aggregate per-(path, type) summaries inside that existing callback and add a bounded, descending-sorted "top-N" table keyed by each of the three axes. Gate the feature behind a new `--top=<n>` option, defaulting to 0, so unadorned invocations are unaffected and pay no extra work for the top-N tracking. Mirror the sort and eviction strategy from `builtin/survey.c`: keep an array of at most N entries sorted from largest to smallest, walk it from the bottom on each candidate, and shift entries down when a new one belongs. Compared to `builtin/survey.c`, drop the void-pointer indirection in the table data, type the comparator's arguments, and fold the trivial comparators into the `(a > b) - (a < b)` idiom. For the human-readable `table` output, extend the existing nested bullet layout with two new top-level sections, `* Top trees` and `* Top blobs`, each containing three sub-tables (`Top by count`, `Top by disk size`, `Top by inflated size`). The path becomes the row name and the relevant scalar becomes the value, reusing `stats_table_count_addf` and `stats_table_size_addf` so units and column alignment match the rest of the table. For the `lines`/`nul` key-value formats, emit one `objects.<type>.top.by_<axis>.<rank>.path=<path>` entry alongside an `objects.<type>.top.by_<axis>.<rank>.<axis>=<value>` entry per ranked path, so consumers can dispatch by axis without parsing the schema. The root tree's path is the empty string as produced by the path-walk machinery; preserve that as-is to stay faithful to the upstream representation rather than fabricating a placeholder. This is the first piece of folding `git survey`'s functionality into `git repo structure`. Subsequent commits will add the corresponding configuration knob and, eventually, turn `git survey` into a thin deprecated shim over `git repo structure`. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The preceding commit added `--top=<n>` to `git repo structure`,
reporting the top-N paths per type ranked by count, on-disk size, and
inflated size. Cover the three behaviors that matter for that option:
* Without `--top`, the key-value output emits no `top.*` keys, so
existing parsers stay unaffected.
* `--top=N` produces exactly N ranked entries on each of the six
`objects.<type>.top.by_<axis>` axes (count/disk_size/inflated_size
crossed with trees/blobs), and a constructed input where one blob
is several orders of magnitude bigger than the other lets us
assert the ordering on the disk-size and inflated-size axes.
* A negative `--top` is rejected with a non-zero exit and a message
naming the constraint, so a typo cannot silently degrade into the
default zero.
Avoid grep patterns starting with `--`; grep would parse the leading
double dash as an option terminator.
Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` exposes its `--top` default via `survey.top` so that a site or per-repository operator can switch the detail tables on once and have every subsequent invocation include them. Mirror that ergonomics for `git repo structure` so that, as `git survey`'s functionality is folded into `git repo structure`, the configuration side of the migration story stays equivalent. Add a small `git_config_int` callback bound to `repo.structure.top` and invoke it before `parse_options()`, so a `--top=<N>` on the command line cleanly overrides the configured default (including `--top=0` to opt out of the detail tables when configuration enables them). Reject negative configured values with the same wording as the command-line guard, since `git_config_int()` happily returns negative integers. Document the new variable in a fresh `Documentation/config/repo.adoc` and wire it into the alphabetical includes in `Documentation/config.adoc` between `repack.adoc` and `rerere.adoc`. Cover the precedence behaviour with a t1901 test: a configured value enables the tables by default, and a command-line `--top=0` suppresses them again. Note that the reported paths respect the `core.quotePath` setting. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` started life as an experimental scale-measurement tool; the preceding commits give `git repo structure` the path-level detail tables and ref-scoping mechanism that were `git survey`'s main draw, so the two now overlap substantially. Plan the migration explicitly: add a short notice at the top of the description making clear which of `git survey`'s knobs map to which `git repo structure` option, and state that a future release will turn `git survey` into a thin shim over `git repo structure`. Putting the notice in the description (rather than only the synopsis) ensures it shows up in `git help survey` rendering before the reader sees any option specifics, so an operator skimming the page learns about the replacement before adopting any survey-specific flags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` was an experimental scale-measurement tool whose
distinctive features (ref-kind filters, top-N path tables) are now
all available in `git repo structure`. With the path-level reporting
in place (commits "repo: filter the structure scope via
--ref-filter=<pattern>" and "repo: report top-N paths by count, disk,
and inflated size in structure"), there is no functionality `git
survey` provides that `git repo structure` cannot.
Replace the 764-line `git survey` implementation with a roughly
hundred-line shim that:
* Accepts the existing `git survey` command line so callers in
scripts continue to parse without changes.
* Emits a deprecation warning naming the replacement command, so
interactive users learn about the migration target.
* Translates the survey-specific knobs into the equivalent
`git repo structure` invocation and re-execs the canonical
command via `execv_git_cmd()`. Per-kind ref selectors fan out
into the corresponding `refs/heads/*`, `refs/tags/*`, etc.
`--ref-filter` patterns; `--top=<N>` is forwarded directly;
`--all-refs` becomes the absence of any `--ref-filter`.
Two survey options have no `git repo structure` counterpart:
`--verbose` controlled per-step trace output the new command does
not emit, and `--detached` selected the detached HEAD which
`git repo structure` does not enumerate separately. Both are
silently accepted and produce a single warning each, so old
invocations keep working while the absence of these knobs in `git
repo structure` is made visible.
Rewrite t8100 to assert the shim's contract: the deprecation
warning is printed, the output is byte-identical to a corresponding
`git repo structure` invocation, and the per-kind selector
translation produces the right `--ref-filter` pattern. The
preceding survey-specific output assertions (the multi-column
plaintext tables) no longer apply, since `git repo structure`'s
output format is now the canonical one and is covered by t1901.
The `survey.*` configuration keys (`survey.top`, `survey.progress`,
`survey.verbose`) are no longer honored by the shim. They were
mirrored by the preceding `repo.structure.top` work for the most
useful knob; users with `survey.top` set in config should migrate
to `repo.structure.top`. This is a backward-incompatible removal
documented by the deprecation notice in `git-survey.adoc`.
Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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`.
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…tact Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is now required by `bc/parse-options-exit-0-on-help`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: next
From: 1a498fdcd5 (fixup??? survey: stub in new experimental 'git-survey' command, 2026-08-01) (0179ff0de5..1a498fdcd5)
Skipped: 94faddf (delta: widen create_delta() and diff_delta() to size_t, 2026-06-05)
Upstream equivalent: 9efb6d5 (delta: widen
create_delta()anddiff_delta()tosize_t, 2026-08-13)Range-diff
1: 94faddf ! 1: 9efb6d5 delta: widen create_delta() and diff_delta() to size_t
Skipped: 9a6f260 (packfile, git-zlib: widen use_pack() and zstream avail fields to size_t, 2026-06-05)
Upstream equivalent: 4211a2b (packfile, git-zlib: widen
use_pack()and zstream avail fields tosize_t, 2026-08-13)Range-diff
1: 9a6f260 ! 1: 4211a2b packfile, git-zlib: widen use_pack() and zstream avail fields to size_t
Resolved: 17cb45a (fast-import: drop the six size casts in the object-read paths, 2026-06-05)
Resolved both conflicts: changed
unsigned longtosize_tfor hdrlen/deltalen (patch intent), and removed the intermediatedeltalen_stvariable that HEAD had kept but the patch eliminates.Range-diff
1: 17cb45a ! 1: 1cc9df0 fast-import: drop the six size casts in the object-read paths
To: 7e0a32f76d (fixup??? survey: stub in new experimental 'git-survey' command, 2026-08-01) (ea0a75e919..7e0a32f76d)
Statistics
Range-diff (click to expand)
1: 1cbe158 = 1: d31fd1f unix-socket: avoid leak when initialization fails
2: a1e31f6 = 2: ff21965 grep: prevent
^$false match at end of file3: 11c711e = 3: 07edbd4 Merge branch 'fixes-from-the-git-mailing-list'
4: 96728c0 = 4: 5151431 t9350: point out that refs are not updated correctly
5: d09c046 = 5: ff76225 transport-helper: add trailing --
6: e5e983d = 6: 33a05ae remote-helper: check helper status after import/export
12: b396cab = 7: 4f043e6 mingw: include the Python parts in the build
7: e51a7c3 = 8: 25dfefd bundle-uri: refuse advertised URIs by protocol
8: b8521e0 = 9: 33a1e20 ci: bump actions/checkout from 6 to 7
9: ebbc75e = 10: 6cb6e65 Always auto-gc after calling a fast-import transport
42: 5d01ad3 = 11: 43fd6b8 mingw: prevent regressions with "drive-less" absolute paths
10: 622e6e6 = 12: d115359 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
14: fd121c0 = 13: bc82fdd windows: skip linking
git-<command>for built-ins11: 4454da3 = 14: 1c8a28c vcpkg_install: detect lack of Git
16: 699d714 = 15: 7b292dc mingw: stop hard-coding
CC = gcc13: dbc30f6 = 16: 38b9a18 vcpkg_install: add comment regarding slow network connections
18: bef4b55 = 17: e8c34d5 mingw: drop the -D_USE_32BIT_TIME_T option
15: 2874e6b = 18: 82080a2 vcbuild: install ARM64 dependencies when building ARM64 binaries
20: d29f04d = 19: 6548fa9 mingw: only use -Wl,--large-address-aware for 32-bit builds
17: f65bfea = 20: cbf021d vcbuild: add an option to install individual 'features'
22: 2bbad1d = 21: 1162a77 mingw: avoid over-specifying
--pic-executable19: be1e95a = 22: bca4687 cmake: allow building for Windows/ARM64
24: 9d4910e = 23: d0c90f5 mingw: set the prefix and HOST_CPU as per MSYS2's settings
21: d432afe = 24: 2c151e2 ci(vs-build) also build Windows/ARM64 artifacts
26: cfb0d2a = 25: c17cd7a mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
23: b95fe76 = 26: 852925d vcbuild: stop hard-coding OpenSSL as a dependency
28: 35cfbc4 = 27: 72cee08 mingw: rely on MSYS2's metadata instead of hard-coding it
25: e6caf7a = 28: e601b2f cmake(): allow setting HOST_CPU for cross-compilation
31: 3b9863b = 29: 2950005 mingw: always define
ETC_*for MSYS2 environments27: 543fbc4 = 30: 8cc8392 CMake: default Visual Studio generator has changed
39: e243d31 = 31: 48bd673 max_tree_depth: lower it for clang builds in general on Windows
29: ef2cdd7 = 32: 69c4540 mingw: demonstrate a
git addissue with NTFS junctions30: 0a3bc52 = 33: 5a3ffbb .gitignore: add Visual Studio CMakeSetting.json file
62: f846763 = 34: 378bf26 mingw: ensure valid CTYPE
32: e853d13 = 35: 63f5162 t5505/t5516: allow running without
.git/branches/in the templates33: 5fadf5a = 36: fb81476 strbuf_realpath(): use platform-dependent API if available
34: 660dc9d = 37: dfc224f http: use new "best effort" strategy for Secure Channel revoke checking
35: 1a40222 = 38: 854aa7b subtree: update
contrib/subtreetesttarget36: c9fb78e = 39: da2d3ef CMakeLists: add default "x64-windows" arch for Visual Studio
37: f668658 = 40: 021a15e setup: properly use "%(prefix)/" when in WSL
38: 8636cca = 41: ce13cc6 Add config option
windows.appendAtomically63: 9ab4130 = 42: 5636a12 mingw: allow
git.exeto be used instead of the "Git wrapper"40: a5e0108 = 43: 79d2b23 t5505/t5516: fix white-space around redirectors
41: 028782b = 44: 5e377d3 MinGW: link as terminal server aware
43: f948b5a = 45: 4527098 transport: optionally disable side-band-64k
44: b2cd465 = 46: 2a38a3b mingw: fix fatal error working on mapped network drives on Windows
45: e4a1898 = 47: 7b5d3b3 clink.pl: fix MSVC compile script to handle libcurl-d.lib
46: 475bc08 = 48: b75737f mingw: implement a platform-specific
strbuf_realpath()47: c422c4e = 49: a50d9ef t3701: verify that we can add lots of files interactively
48: 313da4f = 50: 3e0e0ed commit: accept "scissors" with CR/LF line endings
49: 940e3e6 = 51: b1d16b7 t0014: fix indentation
50: 80e9269 = 52: e3fad19 git-gui: accommodate for intent-to-add files
51: fe2a674 = 53: a783c53 mingw: allow for longer paths in
parse_interpreter()52: 0279fd8 = 54: ae2cf3d compat/vcbuild: document preferred way to build in Visual Studio
53: 7cd4fed = 55: dc42049 http: optionally send SSL client certificate
54: e65f6d5 = 56: d261255 ci: run
contrib/subtreetests in CI builds55: 4cba3dc = 57: 8edae02 CMake: show Win32 and Generator_platform build-option values
56: be14671 = 58: 438649b compat/mingw.c: do not warn when failing to get owner
57: c299b27 = 59: 282e169 mingw: $env:TERM="xterm-256color" for newer OSes
58: ba1a762 = 60: b8546f0 winansi: check result and Buffer before using Name
59: f8ba4c1 = 61: d5c7bb1 mingw: change core.fsyncObjectFiles = 1 by default
60: 1a250ed = 62: 4ad288c Fix Windows version resources
61: d60094f = 63: c3845c8 status: fix for old-style submodules with commondir
64: c2a6037 = 64: 1c0d699 revision: create mark_trees_uninteresting_dense()
65: 4f2a49a = 65: 43d8f36 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
66: 4906f7d = 66: 9373290 survey: stub in new experimental 'git-survey' command
67: fc282ba = 67: 6fcb851 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
68: 9df80be = 68: 4ab75c7 survey: add command line opts to select references
69: 701b1bc = 69: 3c9e125 clink.pl: fix libexpatd.lib link error when using MSVC
70: f8c6758 = 70: 76ef273 survey: start pretty printing data in table form
71: 2ee6bb3 = 71: 59177db Makefile: clean up .ilk files when MSVC=1
72: 5e66660 = 72: 42f850d survey: add object count summary
73: 69dc3ae = 73: af04ae3 vcbuild: add support for compiling Windows resource files
74: f81f610 = 74: cf3f773 survey: summarize total sizes by object type
75: 660e470 = 75: 7b5b36c config.mak.uname: add git.rc to MSVC builds
76: 69da40e = 76: 2c7ba36 survey: show progress during object walk
77: b0e209f = 77: 4ac3932 mingw: make sure
errnois set correctly when socket operations fail78: 394077c = 78: ae4cbdb t5563: verify that NTLM authentication works
79: 9f007e3 = 79: 7407857 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
80: 86a3c38 = 80: 985b788 http: optionally load libcurl lazily
81: 4049e5b = 81: 5a7f654 survey: add ability to track prioritized lists
82: 3efc0c0 = 82: 314ffe9 compat/mingw: handle WSA errors in strerror
83: 55a9df2 = 83: efa6b03 http: disallow NTLM authentication by default
84: dd10d9f = 84: 30365fb clink.pl: move default linker options for MSVC=1 builds
85: 239d5b4 = 85: 3ce0863 http: support lazy-loading libcurl also on Windows
86: d89318c = 86: 1eca140 survey: add report of "largest" paths
87: 65d4296 = 87: 9afffbe compat/mingw: drop outdated comment
88: e476a9c = 88: c92eb46 http: warn if might have failed because of NTLM
89: fd73d9f = 89: eb47c07 cmake: install headless-git.
90: f04002f = 90: 77c9597 http: when loading libcurl lazily, allow for multiple SSL backends
91: aacd8e1 = 91: 18d9d85 survey: add --top= option and config
92: 78bc832 = 92: d29785e t0301: actually test credential-cache on Windows
93: 12b33ba = 93: 037db5c credential: advertise NTLM suppression and allow helpers to re-enable
123: 1ab23bb = 94: 095207f mingw: Support
git_terminal_promptwith more terminals94: d382b98 = 95: 81926a5 git.rc: include winuser.h
95: 418a23f = 96: 82dd5d9 mingw: do load libcurl dynamically by default
96: 2a60881 = 97: c14e669 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
97: c15ac67 = 98: 32831dc mingw: suggest
windows.appendAtomicallyin more cases98: 672873d = 99: aead973 win32: use native ANSI sequence processing, if possible
99: b4f23a9 = 100: 7231ad3 common-main.c: fflush stdout buffer upon exit
100: 50e88fe = 101: 15aa1d6 t5601/t7406(mingw): do run tests with symlink support
101: 86dd1e6 = 102: 7c53db9 Fallback to AppData if XDG_CONFIG_HOME is unset
102: 3270dbe = 103: 6634458 survey: clearly note the experimental nature in the output
103: b4ffea5 = 104: ed72ad8 credential-cache: handle ECONNREFUSED gracefully
104: d0d7311 = 105: 2d80016 reftable: do make sure to use custom allocators
105: e2ba8e1 = 106: a0c2c9b check-whitespace: avoid alerts about upstream commits
106: 7ebde34 = 107: b1a5963 t/t5571-prep-push-hook.sh: Add test with writing to stderr
107: 56ec0b1 = 108: 714a55f dir: do not traverse mount points
108: 8ff37d4 = 109: 0494933 win32: thread-utils: handle multi-socket systems
109: 6c687de = 110: f318381 t5563: add tests for http.emptyAuth with Negotiate
110: 6dbc6b2 = 111: fbfa564 entry: flush fscache after creating directories and writing files
111: 35b4edd = 112: 42eae47 ci(macos): skip the
git p4tests112: c319b7a < -: ---------- diff-delta: widen struct delta_index size fields to size_t
113: 5919d8c < -: ---------- delta: widen create_delta_index() parameter to size_t
114: 321cb13 < -: ---------- pack-objects: widen delta-cache accounting to size_t
115: 5c6494e < -: ---------- pack-objects: widen free_unpacked() return to size_t
116: 3df7862 < -: ---------- pack-objects: widen mem_usage and try_delta out-param to size_t
117: 94faddf < -: ---------- delta: widen create_delta() and diff_delta() to size_t
118: 9a6f260 < -: ---------- packfile, git-zlib: widen use_pack() and zstream avail fields to size_t
119: 941b457 < -: ---------- archive-zip: widen zlib_deflate_raw()'s maxsize local to size_t
120: c689313 < -: ---------- diff: widen deflate_it()'s bound local from int to size_t
121: 2c96644 < -: ---------- http-push: widen start_put()'s size local from ssize_t to size_t
122: 60d73bf < -: ---------- t/helper/test-pack-deltas: widen do_compress()'s maxsize local to size_t
124: 7e9fbc2 < -: ---------- git-zlib: widen git_deflate_bound() to size_t
125: 174e3e9 = 113: 819e86f compat/terminal.c: only use the Windows console if bash 'read -r' fails
127: 99e589e = 114: 7ee7c29 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
129: a706857 = 115: 137a524 Win32: symlink: move phantom symlink creation to a separate function
131: cfb0490 = 116: 98f5ec8 mingw: introduce code to detect whether we're inside a Windows container
132: 5854785 = 117: cb45c6a Introduce helper to create symlinks that knows about index_state
135: 1dcf39e = 118: bae402d mingw: when running in a Windows container, try to rename() harder
136: e08a067 = 119: 82c444b mingw: allow to specify the symlink type in .gitattributes
139: 1b4d46e = 120: d34012a mingw: move the file_attr_to_st_mode() function definition
140: 77da435 = 121: da113d9 Win32: symlink: add test for
symlinkattribute143: a895ab5 = 122: e5b9a34 mingw: Windows Docker volumes are not symbolic links
144: b9cb94f = 123: 5f365fd clean: do not traverse mount points
151: 6e68852 = 124: c166893 mingw: work around rename() failing on a read-only file
152: 372611d = 125: 34183cf clean: remove mount points when possible
153: 6d567dd = 126: 87657bf mingw: optionally enable wsl compability file mode bits
154: d4c0321 = 127: 4e6e5fe Refuse to follow invalid paths in
.gitfiles145: b839281 = 128: c060ef1 pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
126: 7849cd7 = 129: 07269a8 diff: stop truncating the deflated-binary-diff size on Windows
128: c4799b1 = 130: d8a70e6 convert: widen gather_convert_stats() helpers to size_t
130: c18b5c7 = 131: 315e0df read-cache: stop truncating index blob sizes on Windows
133: 086ad8f = 132: dbc7932 xdiff-interface: widen buffer_is_binary() size parameter to size_t
134: 7e116ae = 133: a2bd157 tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
137: b0971c8 = 134: 29cb071 combine-diff: stop truncating combined-diff blob sizes on Windows
138: 1d952b4 = 135: 3f8f007 tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
141: 6714d4c = 136: db2b292 diff: widen textconv_object() size out-param to size_t
155: de385d5 = 137: e8e51cc Merge branch 'size-t/pack-objects-delta'
142: 0bb1b93 = 138: 526bd33 pack-objects: drop the two tree-walk casts in the preferred-base path
146: 842ea08 = 139: 32d9ef0 diffcore: widen struct diff_filespec.size to size_t
147: 916b579 < -: ---------- diff-delta: widen sizeof_delta_index() return to size_t
156: 776cdd3 = 140: 8941f7a Merge branch 'size-t/pack-bitmap'
148: 910133c = 141: 51349c1 tree: widen struct tree.size and parse_tree_buffer() to size_t
157: 5fbd516 = 142: 5e8a77b Merge branch 'size-t/diff'
149: 61b7e00 = 143: 12eb05b commit: widen the commit-buffer API to size_t
159: 898e4f0 = 144: 9345f44 Merge branch 'size-t/tree'
150: ce84a7c = 145: 7c5fc25 blame: widen find_line_starts() len parameter to size_t
158: 502cd1e < -: ---------- Merge branch 'size-t/diff-delta-sizeof'
160: a022eca = 146: c0da69c Merge branch 'size-t/commit'
161: a546589 = 147: a140164 grep: widen struct grep_source.size and grep_buffer() to size_t
162: 6b5bcd5 = 148: 82966e1 Merge branch 'size-t/blame'
163: d37e9f1 = 149: 435fe41 fast-export: drop the export_blob() size cast and widen anonymize_blob()
164: 07b1a8f = 150: 8d432a4 Merge branch 'size-t/grep'
165: 0c8d649 = 151: e5dda1e repo: drop the inflated-size cast in count_objects()
166: 261d964 = 152: b2f4c94 Merge branch 'size-t/fast-export'
167: e04e025 = 153: fc36c88 unpack-objects: widen the size-passing infrastructure to size_t
168: a34fca2 = 154: 957b7eb Merge branch 'size-t/repo'
169: 4bd07e5 = 155: 4cc3fe2 Merge branch 'size-t/unpack-objects'
170: 12bcb75 = 156: a087c61 Merge branch 'topic/size-t' into size-t-followups
171: 59984a8 = 157: ea1994b pack-objects: drop cast_size_t_to_ulong shims in get_delta()
172: a755eb6 = 158: f488db5 pack-objects: drop cast_size_t_to_ulong shims in try_delta()
173: 67573cb = 159: 1903d5c pack-objects: drop the last size shim in write_no_reuse_object()
174: 73305d7 = 160: 16c24d1 blame: widen struct blame_scoreboard.final_buf_size to size_t
178: 719149f = 161: f25a1e7 Merge tag 'v2.55.0.windows.4'
179: a8a7c67 = 162: 41b2c36 Merge branch 'bump-ci-actions/checkout-from-6-to-7'
181: 53d2045 = 163: f668a03 Merge 'remote-hg-prerequisites' into HEAD
184: 74f28a1 = 164: 907f5d0 Merge branch 'drive-prefix'
175: 17cb45a ! 165: 1cc9df0 fast-import: drop the six size casts in the object-read paths
185: ab3998b = 166: 5845437 Merge branch 'msys2-python'
176: dfb1ebb = 167: 4edd288 t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
186: 77d8a1a = 168: 6e23073 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
177: 4a54655 = 169: bde02d6 Drop the
cast_size_t_to_ulong()helper180: 72bdf18 = 170: 784f099 Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
187: 478c02c = 171: 892301a Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
182: 8a4c3db = 172: 85d4ddc Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
183: be57b63 = 173: 10817e0 coverity: skip building with Rust, for now
188: 754378c = 174: d0d6d6b Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
189: 89c9b8f = 175: c03907d Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction190: 122b494 = 176: 3c6a203 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
191: c9fd362 = 177: 9da8a59 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
192: fb10f9a = 178: db0e49a Merge 'add-p-many-files'
193: cf83cad = 179: 21fd015 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
194: 75dcd23 = 180: 05121dd Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
195: 2f10e0d = 181: 77c9763 Merge 'git-gui/js/intent-to-add'
196: 7a917ca = 182: af0114a Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
197: 1ce1c66 = 183: 1e4a78c Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
198: 4ace422 = 184: 6b29f0d Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
199: 116120d = 185: 08ef031 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path200: ce61c50 = 186: 19d0572 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
201: 4d5e55e = 187: 6a7b395 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
202: ecb0940 = 188: 832d866 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests203: 82a9372 = 189: 1179b67 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
204: 6f4486d = 190: 535c114 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory205: 67dc965 = 191: cf32796 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
206: 84a630d = 192: 87d8355 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
207: 5b89917 = 193: f1df499 Merge branch 'optionally-dont-append-atomically-on-windows'
208: 1e389ad = 194: 0097f89 Merge branch 'fsync-object-files-always'
209: 63d7058 = 195: 60d4ae0 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
210: 62fb95b = 196: e760bdf Fix Windows version resources (Fix Windows version resources git#4092)
211: 3352e57 = 197: c177c22 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
212: 5afe866 = 198: cf5b3dc Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)213: ddd96bc = 199: 10b76ea Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)214: aaedd71 = 200: 7cc31ab Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283215: 0f7d3e4 = 201: 47a6c74 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
216: f856d19 = 202: 7d0a4f0 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
217: f7895e0 = 203: 2dee67e Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
218: ee39447 = 204: 548df91 Merge branch 'nano-server'
219: 2cc0e8e = 205: 79150f2 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
220: 7c9a2cd = 206: 8a1c0af win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
221: 5dd174a = 207: fcc5a10 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
222: f3b6669 = 208: d839033 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
223: 109a365 = 209: 8317cae Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
224: 531cece = 210: bd0eb53 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
225: 7a094a8 = 211: 2bcd2ad Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
226: 276e5b9 = 212: 24ed70a credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
227: 91b948f = 213: 831d8dd Merge branch 'reftable-vs-custom-allocators'
228: 15d1579 = 214: dab37d4 Merge branch 'check-whitespace-only-downstream'
229: 29a7d31 = 215: 1e578da 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)
230: fbb3103 = 216: b2b8434 Merge branch 'disallow-ntlm-auth-by-default'
231: 1185aa5 = 217: 8a56a65 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)232: ac4a3b8 = 218: 7edd3ba Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
233: 3925528 = 219: 1f40570 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
234: 6c94bda = 220: 12632a6 entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
235: f773219 = 221: ec566aa ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)236: 3283d41 = 222: 00a1975 Merge branch 'msys2'
237: 9ef5c97 = 223: d436fa4 Merge 'docker-volumes-are-no-symlinks'
238: df0981d = 224: af13f11 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
239: c8165da = 225: 18c4ada Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
240: c344d48 = 226: 4d1a5ea Merge branch 'dont-clean-junctions'
241: f20b6d0 = 227: 38c76f5 Merge branch 'wsl-file-mode-bits'
242: 07792ab = 228: b1678e7 Merge branch 'validate-dotgit'
243: 6d10254 = 229: d33aa96 Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
244: 0e787ef = 230: 0890724 Merge branch 'skip-rust-in-the-coverity-builds'
245: a63c19c = 231: b5df23d Merge branch 'ready-for-upstream'
246: 7f7605d = 232: 276fb3e git-gui--askyesno: fix funny text wrapping
247: 8894f52 = 233: 830501f git-gui--askyesno (mingw): use Git for Windows' icon, if available
248: d5e2f45 = 234: 7449fc0 Win32: make FILETIME conversion functions public
249: b8568e4 = 235: d742329 Win32: dirent.c: Move opendir down
250: 4f2f9c7 = 236: bf1a338 mingw: make the dirent implementation pluggable
251: 383d5f7 = 237: 7e7c544 Win32: make the lstat implementation pluggable
252: 5e1dfee = 238: af7be2c mingw: add infrastructure for read-only file system level caches
253: 3bd9865 = 239: 65e908c mingw: add a cache below mingw's lstat and dirent implementations
254: 45bdb46 = 240: 50723c2 fscache: load directories only once
255: 631795f = 241: d3944eb fscache: add key for GIT_TRACE_FSCACHE
256: f52b9d4 = 242: bc88a81 fscache: remember not-found directories
257: 0cb5fd8 = 243: 4b0f641 fscache: add a test for the dir-not-found optimization
258: fa4a87a = 244: 1fca85c add: use preload-index and fscache for performance
259: eb6505f = 245: c61bd1d dir.c: make add_excludes aware of fscache during status
260: 6d99378 = 246: 639d795 fscache: make fscache_enabled() public
261: a54da46 = 247: c36769f dir.c: regression fix for add_excludes with fscache
262: 5d2e742 = 248: 4167d89 fetch-pack.c: enable fscache for stats under .git/objects
263: ca4709f = 249: 18628ce checkout.c: enable fscache for checkout again
264: 4445506 = 250: 1d8823f Enable the filesystem cache (fscache) in refresh_index().
265: d594642 = 251: 6b14778 fscache: use FindFirstFileExW to avoid retrieving the short name
266: 6f5ecab = 252: 202d2e5 fscache: add GIT_TEST_FSCACHE support
267: de6e8bc = 253: 67bb962 fscache: add fscache hit statistics
268: 63375c5 = 254: 2068ad8 unpack-trees: enable fscache for sparse-checkout
269: 6229640 = 255: 7511cb8 status: disable and free fscache at the end of the status command
270: 8bf3974 = 256: 1511cfe mem_pool: add GIT_TRACE_MEMPOOL support
271: 8c5ec64 = 257: 8da12db fscache: fscache takes an initial size
272: b9c41ef = 258: 2fcfb34 fscache: update fscache to be thread specific instead of global
273: b02c713 = 259: 3a8492e fscache: teach fscache to use mempool
274: 3f1603b = 260: 0b467f5 fscache: make fscache_enable() thread safe
275: 28a86a4 = 261: 5d83686 fscache: teach fscache to use NtQueryDirectoryFile
276: dee5af6 = 262: a574249 fscache: remember the reparse tag for each entry
277: 59349be = 263: c3ce5cc fscache: Windows Docker volumes are not symbolic links
278: ccd39c3 = 264: f96df75 fscache: optionally enable wsl compability file mode bits
279: aa1242d = 265: 2930173 Merge branch 'fscache'
280: 4722363 = 266: 34943ea fscache: implement an FSCache-aware is_mount_point()
281: f70875f = 267: ef42a6d Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
282: 77280f1 = 268: 1954c9a clean: make use of FSCache
283: 7ef5ffd = 269: 41147f9 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
284: 77585c0 = 270: c3d0879 Merge branch 'dont-clean-junctions-fscache'
285: d629f8c = 271: a331511 pack-objects (mingw): demonstrate a segmentation fault with large deltas
286: 360f56a = 272: 8274ff4 mingw: support long paths
287: d6d61f1 = 273: 08ec3c8 win32(long path support): leave drive-less absolute paths intact
288: 49f9b74 = 274: a1eb646 compat/fsmonitor/fsm-*-win32: support long paths
289: 4e9c0ba = 275: e5a43b7 clean: suggest using
core.longPathsif paths are too long to remove290: 9bbd68a = 276: 9a78fa5 mingw: explicitly specify with which cmd to prefix the cmdline
291: 9cdf2eb = 277: 87f7bc3 mingw: when path_lookup() failed, try BusyBox
292: 3f06028 = 278: 8748735 test-tool: learn to act as a drop-in replacement for
iconv293: 3527554 = 279: 7621262 tests(mingw): if
iconvis unavailable, usetest-helper --iconv294: 3337c18 = 280: 81b049e gitattributes: mark .png files as binary
295: 7269245 = 281: 966aa09 tests: move test PNGs into t/lib-diff/
296: 18178a3 = 282: c87c367 tests: only override sort & find if there are usable ones in /usr/bin/
297: 179611e = 283: 94e1dff tests: use the correct path separator with BusyBox
298: 16faccc = 284: f512b5f mingw: only use Bash-ism
builtin pwd -Wwhen available299: 0fe47d6 = 285: 93a31a4 tests (mingw): remove Bash-specific pwd option
300: 29c2a33 = 286: a1b1c2c test-lib: add BUSYBOX prerequisite
301: 9a008cf = 287: fece6be t5003: use binary file from t/lib-diff/
302: f5fc233 = 288: 362ca07 t5532: workaround for BusyBox on Windows
303: 1e96e02 = 289: 79dd72d t5605: special-case hardlink test for BusyBox-w32
304: 51a6e81 = 290: b90317a t5813: allow for $PWD to be a Windows path
305: d00f800 = 291: 31b8384 t9200: skip tests when $PWD contains a colon
306: cb4c428 = 292: ee82ddc Describe Git for Windows' architecture
307: 28ebe48 = 293: e0c0850 Add an AGENTS.md file to help with AI-assisted debugging/development
308: 12ca060 = 294: 1ee180b Modify the Code of Conduct for Git for Windows
309: 446c460 = 295: 0607999 CONTRIBUTING.md: add guide for first-time contributors
311: 8a51090 = 296: 9571973 README.md: Add a Windows-specific preamble
319: 0b51519 = 297: 1188d6e Add an issue template
310: 10fa763 = 298: 4a76de4 Add a GitHub workflow to monitor component updates
312: e70f0ee = 299: 7b98150 Partially un-revert "editor: save and reset terminal after calling EDITOR"
313: 18605e2 = 300: bf39e31 reset: reinstate support for the deprecated --stdin option
321: b6f04cc = 301: 1a56d76 Modify the GitHub Pull Request template (to reflect Git for Windows)
314: 3f0d110 = 302: 1a66a2c fsmonitor: reintroduce core.useBuiltinFSMonitor
315: 9da4831 = 303: 1c9114b dependabot: help keeping GitHub Actions versions up to date
316: 0b26bb8 = 304: f523794 Merge branch 'gitk-and-git-gui-patches'
317: f26a2ea = 305: 3b0deb4 Merge branch 'long-paths'
318: 7dac440 = 306: c1266ec Merge branch 'busybox-w32'
320: 4f7e3b4 = 307: 45c7e8c Merge branch 'un-revert-editor-save-and-reset'
322: eae5374 = 308: b6e231b Merge branch 'phase-out-reset-stdin'
323: 855cdfe = 309: 37c273d SECURITY.md: document Git for Windows' policies
324: 20b45a8 = 310: fa0ac55 Merge branch 'deprecate-core.useBuiltinFSMonitor'
325: ede89ca = 311: 20a5946 ci: only run the expensive tests in the Windows tests for now
326: 2ca98e7 = 312: 6698342 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
327: 5efb066 = 313: 3df10ed Merge 'readme' into HEAD
328: 638350d = 314: 39d54f2 build(deps): bump actions/cache from 5 to 6
329: f00e0ec = 315: 27da75a build(deps): bump actions/cache from 5 to 6 (build(deps): bump actions/cache from 5 to 6 git#6303)
330: e68d193 = 316: c0edfd0 repo: split annotated tags out from total tag count in structure
331: 61f2a43 = 317: 600f665 repo: filter the structure scope via --ref-filter=
332: ce9c30e = 318: f5cf8a5 repo: report top-N paths by count, disk, and inflated size in structure
333: 806b24b = 319: cd35774 t1901: cover the --top option of
git repo structure334: fa08938 = 320: fa52095 repo: read the
--topdefault fromrepo.structure.top335: deb3982 = 321: affd2a2 git-survey: announce the upcoming pivot into
git repo structure336: 11754cc = 322: 034bb90 survey: turn into a thin shim over
git repo structure337: d66fed9 = 323: edb0d33 Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)338: 549728b = 324: e7a0e04 fixup??? repo: filter the structure scope via --ref-filter=
339: e8041c7 = 325: b6514c3 fixup??? t1901: cover the --top option of
git repo structure340: 8456d58 = 326: f3e5f79 fixup??? repo: read the
--topdefault fromrepo.structure.top341: 27fa4df = 327: 45e9e14 fixup??? mingw: support long paths
342: 0a1bde9 = 328: 61bf7ae fixup??? win32(long path support): leave drive-less absolute paths intact
343: 7d50548 = 329: 21365cc fixup??? survey: stub in new experimental 'git-survey' command
344: 2bf23f6 = 330: 6968698 fixup??? survey: turn into a thin shim over
git repo structure345: 1a498fd = 331: 7e0a32f fixup??? survey: stub in new experimental 'git-survey' command
Truncated; see the full conflict report in the workflow run summary.