Rebase shears/seen: 10 conflict(s) (4 skipped, 6 resolved) (#31064713262) - #355
Open
gitforwindowshelper[bot] wants to merge 318 commits into
Open
Rebase shears/seen: 10 conflict(s) (4 skipped, 6 resolved) (#31064713262)#355gitforwindowshelper[bot] wants to merge 318 commits into
gitforwindowshelper[bot] wants to merge 318 commits into
Conversation
This implements the Windows-specific support code, because everything is slightly different on Windows, even loading shared libraries. Note: I specifically do _not_ use the code from `compat/win32/lazyload.h` here because that code is optimized for loading individual functions from various system DLLs, while we specifically want to load _many_ functions from _one_ DLL here, and distinctly not a system DLL (we expect libcurl to be located outside `C:\Windows\system32`, something `INIT_PROC_ADDR` refuses to work with). Also, the `curl_easy_getinfo()`/`curl_easy_setopt()` functions are declared as vararg functions, which `lazyload.h` cannot handle. Finally, we are about to optionally override the exact file name that is to be loaded, which is a goal contrary to `lazyload.h`'s design. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Since we are already walking our reachable objects using the path-walk API,
let's now collect lists of the paths that contribute most to different
metrics. Specifically, we care about
* Number of versions.
* Total size on disk.
* Total inflated size (no delta or zlib compression).
This information can be critical to discovering which parts of the
repository are causing the most growth, especially on-disk size. Different
packing strategies might help compress data more efficiently, but the toal
inflated size is a representation of the raw size of all snapshots of those
paths. Even when stored efficiently on disk, that size represents how much
information must be processed to complete a command such as 'git blame'.
The exact disk size seems to be not quite robust enough for testing, as
could be seen by the `linux-musl-meson` job consistently failing, possibly
because of zlib-ng deflates differently: t8100.4(git survey
(default)) was failing with a symptom like this:
TOTAL OBJECT SIZES BY TYPE
===============================================
Object Type | Count | Disk Size | Inflated Size
------------+-------+-----------+--------------
- Commits | 10 | 1523 | 2153
+ Commits | 10 | 1528 | 2153
Trees | 10 | 495 | 1706
Blobs | 10 | 191 | 101
- Tags | 4 | 510 | 528
+ Tags | 4 | 547 | 528
This means: the disk size is unlikely something we can verify robustly.
Since zlib-ng seems to increase the disk size of the tags from 528 to
547, we cannot even assume that the disk size is always smaller than the
inflated size. We will most likely want to either skip verifying the
disk size altogether, or go for some kind of fuzzy matching, say, by
replacing `s/ 1[45][0-9][0-9] / ~1.5k /` and `s/ [45][0-9][0-9] / ~½k /`
or something like that.
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This comment has been true for the longest time; The combination of the two preceding commits made it incorrect, so let's drop that comment. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
Although NTLM authentication is considered weak (extending even to
NTLMv2, which purportedly allows brute-forcing reasonably complex
8-character passwords in a matter of days, given ample compute
resources), it _is_ one of the authentication methods supported by
libcurl.
Note: The added test case *cannot* reuse the existing `custom_auth`
facility. The reason is that that facility is backed by an NPH script
("No Parse Headers"), which does not allow handling the 3-phase NTLM
authentication correctly (in my hands, the NPH script would not even be
called upon the Type 3 message, a "200 OK" would be returned, but no
headers, let alone the `git http-backend` output as payload). Having a
separate NTLM authentication script makes the exact workings clearer and
more readable, anyway.
Co-authored-by: Matthew John Cheetham <mjcheetham@outlook.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…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>
Continue the size_t evacuation around large object handling: with deflate_it() and the locals around it widened, the cast_size_t_to_ulong() shim the prior delta_delta() widening had to leave behind in emit_binary_diff_body() goes away. deflate_it() is file-static; the only callers are the two in emit_binary_diff_body() already touched here. emit_diff_symbol() formats the resulting sizes via uintmax_t / %"PRIuMAX", so the diff output is not affected; only the per-process upper bound on a binary patch chunk that this function can address grows beyond 4 GiB on Windows. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Prep for the upcoming read_blob_data_from_index() widening, whose callers in convert.c feed the size they receive straight into these two helpers. Both are file-static, so the change is contained. Also fixes a small pre-existing narrowing on the get_wt_convert_stats_ascii() path, where strbuf.len (size_t) was passed to a unsigned long parameter. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue the size_t evacuation. read_blob_data_from_index() reads the blob through the size_t odb_read_object() API but writes the size back through an unsigned long out-parameter, silently truncating anything past 4 GiB on Windows. Widen the out-parameter, drop the cast_size_t_to_ulong() shim, and move the matching locals in the two convert.c callers and the one in attr.c. Their downstream consumers (gather_convert_stats() widened in the prior commit and read_attr_from_buf() already size_t) take the new type directly. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Prep for the widenings of its callers, where size-receiving locals will become size_t (combine-diff's result_size in the immediately following commit, struct diff_filespec.size in a later topic). Body caps the parameter at 8000 anyway, so the type change is mechanical. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Smallest piece of the tree topic. link_len is only used as strbuf_splice()'s size_t length and as an array index; widening it outright removes the cast_size_t_to_ulong() shim and the bridge local that fed it. odb_read_object() now writes straight into link_len. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This will come in handy in the next commit. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
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>
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`.
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…tact Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is now required by `bc/parse-options-exit-0-on-help`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: seen
From: becdb5ceae (fixup??? survey: stub in new experimental 'git-survey' command, 2026-08-01) (c23defd4b6..becdb5ceae)
Dropped (empty after resolution): d37220c (mingw: include the Python parts in the build, 2015-02-16)
kept HEAD's version; NO_PYTHON= already present, removed ifeq block that upstream deleted
Dropped (empty after resolution): e200133 (windows: skip linking
git-<command>for built-ins, 2023-01-27)kept upstream's
ifneq (,$(MINGW_PREFIX))condition; the patch's actual change (adding SKIP_DASHED_BUILT_INS) was already present in the baseDropped (empty after resolution): 9dc5b8c (mingw: stop hard-coding
CC = gcc, 2025-11-23)resolved by taking HEAD's version which already removed
CC = gccand restructured the MSYSTEM block; kept the simplified COMPAT_CFLAGS lineSkipped (obsolete): 2b32d94 (mingw: drop the -D_USE_32BIT_TIME_T option, 2025-11-21)
Reason: upstream already removed -D_USE_32BIT_TIME_T along with the surrounding ifeq block
Skipped (obsolete): 11312cb (mingw: only use -Wl,--large-address-aware for 32-bit builds, 2025-11-21)
Reason: patch intent (--large-address-aware only for 32-bit) is already implemented in upstream's refactored config.mak.uname
Skipped: 43d746d (mingw: avoid over-specifying
--pic-executable, 2025-11-21)Upstream equivalent: 02b1a9b (mingw: avoid over-specifying
--pic-executable, 2026-08-05)Range-diff
1: 43d746d ! 1: 02b1a9b mingw: avoid over-specifying
--pic-executable@@ Commit message So let's drop the overly-specific definition. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> + Signed-off-by: Junio C Hamano <gitster@pobox.com> ## config.mak.uname ## @@ config.mak.uname: ifeq ($(uname_S),MINGW)Skipped (obsolete): 516e339 (mingw: set the prefix and HOST_CPU as per MSYS2's settings, 2025-11-21)
Reason: patch's intent (use MINGW_PREFIX/MINGW_CHOST) already incorporated in HEAD with additional improvements
Dropped (empty after resolution): 4b705ea (mingw: only enable the MSYS2-specific stuff when compiling in MSYS2, 2025-11-21)
kept HEAD's version which already includes DETECT_MSYS_TTY plus ENSURE_MSYSTEM_IS_SET and MINGW_PREFIX flags
Dropped (empty after resolution): 80e4dc4 (mingw: rely on MSYS2's metadata instead of hard-coding it, 2025-11-21)
dropped upstream-removed 'nanosec' option, kept 'msystem' and 'mingw_prefix' additions
Dropped (empty after resolution): 4cd46af (mingw: ensure valid CTYPE, 2017-02-21)
kept HEAD's PLINK_PROTOCOL and MSYSTEM blocks, appended REBASE_HEAD's LC_CTYPE setenv after them
To: 117db4f375 (fixup??? survey: stub in new experimental 'git-survey' command, 2026-08-01) (e99aee6d61..117db4f375)
Statistics
Range-diff (click to expand)
1: fdae317 = 1: 26977e1 unix-socket: avoid leak when initialization fails
2: 9516e54 = 2: e7f8384 grep: prevent
^$false match at end of file3: 9316ece = 3: b5a2ee4 Merge branch 'fixes-from-the-git-mailing-list'
4: f54a721 = 4: 83fdeb4 t9350: point out that refs are not updated correctly
5: 4b59b9b = 5: ecb7a8d transport-helper: add trailing --
6: bdc1ce0 = 6: e3301e4 remote-helper: check helper status after import/export
7: d37220c < -: ---------- mingw: include the Python parts in the build
9: f4b25cb = 7: 900244d ci: bump actions/checkout from 6 to 7
10: 23240c6 = 8: 2eb5d38 Always auto-gc after calling a fast-import transport
11: 7e4e47f = 9: fc557f7 mingw: prevent regressions with "drive-less" absolute paths
8: 9243c06 = 10: 7ceecb1 mingw: demonstrate a
git addissue with NTFS junctions36: 274191d = 11: c5645cc t5505/t5516: allow running without
.git/branches/in the templates41: bb9faeb = 12: 1145d86 strbuf_realpath(): use platform-dependent API if available
42: 4cce468 = 13: 2de8a1b http: use new "best effort" strategy for Secure Channel revoke checking
39: 4d92d68 = 14: 59251e5 t5505/t5516: fix white-space around redirectors
12: 49b2dce = 15: 6a61f2e transport: optionally disable side-band-64k
13: fc534b1 = 16: 33dc7b8 mingw: fix fatal error working on mapped network drives on Windows
14: 4f85f7e = 17: 0d6158e clink.pl: fix MSVC compile script to handle libcurl-d.lib
15: e200133 < -: ---------- windows: skip linking
git-<command>for built-ins16: 9dc5b8c < -: ---------- mingw: stop hard-coding
CC = gcc50: 2f461de = 18: d940ec2 mingw: implement a platform-specific
strbuf_realpath()17: 1283528 = 19: 103710d ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
18: 2b32d94 < -: ---------- mingw: drop the -D_USE_32BIT_TIME_T option
19: 27b8d3b = 20: 8d6acf8 vcpkg_install: detect lack of Git
20: 11312cb < -: ---------- mingw: only use -Wl,--large-address-aware for 32-bit builds
21: af3d014 = 21: 059a293 vcpkg_install: add comment regarding slow network connections
22: 43d746d < -: ---------- mingw: avoid over-specifying
--pic-executable23: 2e2fbbe = 22: d13e15c vcbuild: install ARM64 dependencies when building ARM64 binaries
24: 516e339 < -: ---------- mingw: set the prefix and HOST_CPU as per MSYS2's settings
25: 98da215 = 23: 646e804 vcbuild: add an option to install individual 'features'
26: 4b705ea < -: ---------- mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
27: 9d10818 = 24: ff79c69 cmake: allow building for Windows/ARM64
28: 80e4dc4 < -: ---------- mingw: rely on MSYS2's metadata instead of hard-coding it
29: 755160d = 25: 3d3f185 ci(vs-build) also build Windows/ARM64 artifacts
30: 57ced0c < -: ---------- mingw: always define
ETC_*for MSYS2 environments31: ba737bd = 26: 862916e vcbuild: stop hard-coding OpenSSL as a dependency
33: c2b6f6a = 27: e7b2532 cmake(): allow setting HOST_CPU for cross-compilation
35: aec4261 = 28: 562d042 CMake: default Visual Studio generator has changed
38: 767e13a = 29: d98aa93 .gitignore: add Visual Studio CMakeSetting.json file
43: 1817fa4 = 30: 7750d73 subtree: update
contrib/subtreetesttarget44: 338469c = 31: 008cb6f CMakeLists: add default "x64-windows" arch for Visual Studio
45: 911967e = 32: 983455c hash-object: add another >4GB/LLP64 test case
46: b00bb0f = 33: a908805 setup: properly use "%(prefix)/" when in WSL
47: cb2e54d = 34: ca73e05 Add config option
windows.appendAtomically49: 49f725c = 35: e96ca9a MinGW: link as terminal server aware
51: c6aadde = 36: 345bf04 t3701: verify that we can add lots of files interactively
52: b8a6db3 = 37: d7c8d55 commit: accept "scissors" with CR/LF line endings
53: a9743dc = 38: 4a716f3 t0014: fix indentation
54: a9b8581 = 39: 1da997f git-gui: accommodate for intent-to-add files
55: 6cae2e1 = 40: 4886c7b mingw: allow for longer paths in
parse_interpreter()56: 838d2b5 = 41: 0d2fe36 compat/vcbuild: document preferred way to build in Visual Studio
57: d5d79fb = 42: d493880 http: optionally send SSL client certificate
58: 8a3e495 = 43: d017d44 ci: run
contrib/subtreetests in CI builds59: 8663c72 = 44: c641211 CMake: show Win32 and Generator_platform build-option values
60: ec15dd8 = 45: cdb0365 hash-object: add a >4GB/LLP64 test case using filtered input
61: cb95fd3 = 46: a162a59 compat/mingw.c: do not warn when failing to get owner
62: abab1c3 = 47: b896561 mingw: $env:TERM="xterm-256color" for newer OSes
63: 1044943 = 48: 29c6a99 winansi: check result and Buffer before using Name
64: bd7d52b = 49: 3c83abe mingw: change core.fsyncObjectFiles = 1 by default
65: 1ef4d9e = 50: 0bba32a Fix Windows version resources
66: bf79de5 = 51: 2288a56 status: fix for old-style submodules with commondir
32: 236129a = 52: fd21352 max_tree_depth: lower it for clang builds in general on Windows
34: 4cd46af < -: ---------- mingw: ensure valid CTYPE
37: a854633 < -: ---------- mingw: allow
git.exeto be used instead of the "Git wrapper"67: 9ac2e5b = 53: dc76212 revision: create mark_trees_uninteresting_dense()
40: 1e068b7 = 54: 8998591 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
68: ec733bb = 55: 4aa674b survey: stub in new experimental 'git-survey' command
48: bc6f066 = 56: 92bd28a Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
69: 523e961 = 57: 8558c03 survey: add command line opts to select references
70: 2a5689c = 58: 4668126 clink.pl: fix libexpatd.lib link error when using MSVC
71: 5b6067c = 59: 14ad451 survey: start pretty printing data in table form
72: f724854 = 60: eff49b3 Makefile: clean up .ilk files when MSVC=1
73: a2f0f0e = 61: 036a737 survey: add object count summary
74: 906353f = 62: 2ad2212 vcbuild: add support for compiling Windows resource files
75: 3ea0aae = 63: 875f58a survey: summarize total sizes by object type
77: 93e042a = 64: 27b5e70 config.mak.uname: add git.rc to MSVC builds
78: f6c4ec2 = 65: c60aa7d survey: show progress during object walk
79: d510b8f = 66: 7bca753 mingw: make sure
errnois set correctly when socket operations fail82: f0371af = 67: 30961b1 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
83: dcbb8fc = 68: ef15234 http: optionally load libcurl lazily
84: 29c804b = 69: 443dc91 survey: add ability to track prioritized lists
85: a2e5c0d = 70: b6ca3fa compat/mingw: handle WSA errors in strerror
88: a2c22e6 = 71: a09ae69 clink.pl: move default linker options for MSVC=1 builds
89: 7d37c9d = 72: effe694 http: support lazy-loading libcurl also on Windows
90: 44da24d = 73: c518ae9 survey: add report of "largest" paths
91: e2df5ad = 74: 1946c78 compat/mingw: drop outdated comment
94: 995f56d = 75: 2ce563b cmake: install headless-git.
95: 5dec3ae = 76: 98226d5 http: when loading libcurl lazily, allow for multiple SSL backends
96: b5a7c08 = 77: 68202ab survey: add --top= option and config
97: 2ba10b3 = 78: 5026182 t0301: actually test credential-cache on Windows
80: f4aa185 = 79: 2cd8cae t5563: verify that NTLM authentication works
100: 2ecf4ae = 80: 17629a8 git.rc: include winuser.h
101: 47f369d = 81: e128f4c mingw: do load libcurl dynamically by default
102: b631fb1 = 82: 898af1d Add a GitHub workflow to verify that Git/Scalar work in Nano Server
103: c9730eb = 83: 85e14e0 mingw: suggest
windows.appendAtomicallyin more cases104: a781cc9 = 84: 88ad4db win32: use native ANSI sequence processing, if possible
105: e240835 = 85: d2d8bc9 common-main.c: fflush stdout buffer upon exit
106: 7439694 = 86: fdce9aa t5601/t7406(mingw): do run tests with symlink support
107: c3fab9d = 87: ab5ae46 Fallback to AppData if XDG_CONFIG_HOME is unset
108: e7c88ef = 88: d4c1b94 survey: clearly note the experimental nature in the output
109: f69023a = 89: f3feb02 credential-cache: handle ECONNREFUSED gracefully
110: eb5fe27 = 90: d5cce7c reftable: do make sure to use custom allocators
111: 2ec4932 = 91: cbbe9ee check-whitespace: avoid alerts about upstream commits
112: 817ed91 = 92: b1c2eb8 t/t5571-prep-push-hook.sh: Add test with writing to stderr
76: b1127c4 = 93: ebbc1c5 mingw: Support
git_terminal_promptwith more terminals81: b9ddb2f = 94: ba7e44d compat/terminal.c: only use the Windows console if bash 'read -r' fails
118: 0bd56fe = 95: 78d076e diff: stop truncating the deflated-binary-diff size on Windows
87: 3e9d58d = 96: b831d59 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
119: 58fff30 = 97: 4080859 convert: widen gather_convert_stats() helpers to size_t
127: ca20769 = 98: 4eccd69 Win32: symlink: move phantom symlink creation to a separate function
120: eea21de = 99: 1266cb7 read-cache: stop truncating index blob sizes on Windows
93: e59076b = 100: d660cda mingw: introduce code to detect whether we're inside a Windows container
131: ecc0ca4 = 101: b843abb Introduce helper to create symlinks that knows about index_state
121: eff34d9 = 102: ae12bf6 xdiff-interface: widen buffer_is_binary() size parameter to size_t
123: adac6f1 = 103: 8f1e4f1 tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
86: 4fd3640 = 104: e6f00ed http: disallow NTLM authentication by default
99: eb9ff4f = 105: 632bdf2 mingw: when running in a Windows container, try to rename() harder
135: 94edd97 = 106: d27c646 mingw: allow to specify the symlink type in .gitattributes
122: b369d92 = 107: 4cf6487 combine-diff: stop truncating combined-diff blob sizes on Windows
128: 8934a7d = 108: a835d3f tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
92: a8dba3a = 109: 989d499 http: warn if might have failed because of NTLM
138: 49474b8 = 110: 2d4234e mingw: move the file_attr_to_st_mode() function definition
139: c9ee3f1 = 111: ab7f683 Win32: symlink: add test for
symlinkattribute124: 98aaf42 = 112: 39d20aa diff: widen textconv_object() size out-param to size_t
132: 2215bd1 = 113: 876ac3f pack-objects: drop the two tree-walk casts in the preferred-base path
98: e45256a = 114: 2a5cb46 credential: advertise NTLM suppression and allow helpers to re-enable
142: 8cd5c80 = 115: e29e404 mingw: Windows Docker volumes are not symbolic links
143: 91a8e66 = 116: 3dabdad clean: do not traverse mount points
125: 3b7badf = 117: 0f65e70 pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
129: 70dba85 = 118: 9e1a25e diffcore: widen struct diff_filespec.size to size_t
136: 054973b = 119: 31cd327 tree: widen struct tree.size and parse_tree_buffer() to size_t
140: 1c609f1 = 120: a5b788f commit: widen the commit-buffer API to size_t
144: ab07420 = 121: 45736da blame: widen find_line_starts() len parameter to size_t
146: 31877e0 = 122: 2e9582a grep: widen struct grep_source.size and grep_buffer() to size_t
147: 7c01205 = 123: 64ac347 fast-export: drop the export_blob() size cast and widen anonymize_blob()
113: 7d42172 = 124: 9290674 dir: do not traverse mount points
114: 9fbbdc1 = 125: acfd46c win32: thread-utils: handle multi-socket systems
115: 890b436 = 126: a1782cc t5563: add tests for http.emptyAuth with Negotiate
116: 97100ee = 127: b50ff36 entry: flush fscache after creating directories and writing files
117: 038dd6a = 128: add9cf4 ci(macos): skip the
git p4tests150: 7c4d17b = 129: db456c9 mingw: work around rename() failing on a read-only file
151: 8a4e67a = 130: dfa004a clean: remove mount points when possible
152: 8e9f9d6 = 131: ea5f470 mingw: optionally enable wsl compability file mode bits
153: 6860b8b = 132: 4baae8b Refuse to follow invalid paths in
.gitfiles126: 8e3922f = 133: 20a3c51 Merge branch 'size-t/pack-objects-delta'
130: a307ece = 134: 0fb1414 Merge branch 'size-t/pack-bitmap'
133: abab772 < -: ---------- diff-delta: widen sizeof_delta_index() return to size_t
134: 7852061 = 135: c9e8138 Merge branch 'size-t/diff'
137: f1d8777 < -: ---------- Merge branch 'size-t/diff-delta-sizeof'
141: eb64baf = 136: 01fac35 Merge branch 'size-t/tree'
145: 2b66e04 = 137: 21ad9fc Merge branch 'size-t/commit'
154: 03dc721 = 138: f43adb5 Merge branch 'size-t/blame'
155: 01fff53 = 139: 63e398a Merge branch 'size-t/grep'
148: 84dce3c = 140: 61625ac repo: drop the inflated-size cast in count_objects()
156: 22d0109 = 141: 88eda24 Merge branch 'size-t/fast-export'
149: dd3ee24 ! 142: 3a74828 unpack-objects: widen the size-passing infrastructure to size_t
@@ builtin/unpack-objects.c: static void added_object(unsigned nr, enum object_type unsigned nr) { void *buf = get_data(size); -@@ builtin/unpack-objects.c: static ssize_t feed_input_zstream(struct odb_write_stream *in_stream, +@@ builtin/unpack-objects.c: static ssize_t zlib_stream_read(struct odb_stream *in_stream, return buf_len - zstream->avail_out; } @@ builtin/unpack-objects.c: static ssize_t feed_input_zstream(struct odb_write_str +static void stream_blob(size_t size, unsigned nr) { git_zstream zstream = { 0 }; - struct input_zstream_data data = { 0 }; + struct zlib_stream in_stream = { @@ builtin/unpack-objects.c: static void stream_blob(unsigned long size, unsigned nr) }158: 668b77b = 143: b94f051 Merge branch 'size-t/repo'
160: f1dd11f = 144: abb97fa Merge branch 'size-t/unpack-objects'
162: 2f9c7e6 = 145: 07f3793 Merge branch 'topic/size-t' into size-t-followups
164: d5e4de5 = 146: 172e092 pack-objects: drop cast_size_t_to_ulong shims in get_delta()
166: f82cb6a = 147: 96a5dbe pack-objects: drop cast_size_t_to_ulong shims in try_delta()
168: 404892d = 148: e0e6749 pack-objects: drop the last size shim in write_no_reuse_object()
170: 9d7e69c = 149: 8f5671b blame: widen struct blame_scoreboard.final_buf_size to size_t
157: 9361446 = 150: 6e538c8 Merge branch 'bump-ci-actions/checkout-from-6-to-7'
172: a5140c9 = 151: 04e8433 fast-import: drop the six size casts in the object-read paths
159: 75f86fc = 152: f2861f6 Merge 'remote-hg-prerequisites' into HEAD
174: dd66734 = 153: d3bf4f8 t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
161: 7777898 = 154: 4f2596e Merge branch 'drive-prefix'
163: 7e91cce < -: ---------- Merge branch 'msys2-python'
176: 7e5a8f1 = 155: f55280f Drop the
cast_size_t_to_ulong()helper177: b4d9e1f = 156: 6fc60e9 Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
165: db84d87 = 157: 4456eed Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
179: 032b1e4 = 158: 4f4814f Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
180: 171d946 = 159: 239566f coverity: skip building with Rust, for now
167: c9e0d32 = 160: 28593e6 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
169: 4ab8fa2 = 161: 58d3b73 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
171: c932bc5 = 162: 1e54851 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction173: afbbb81 = 163: 4797842 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
175: a415ecb = 164: 8944409 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
178: 1b833d2 = 165: 5b5129a Merge 'add-p-many-files'
181: 2431fd4 = 166: 62fcaaa Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
182: a69e7e8 = 167: bc26660 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
183: 867ced9 = 168: a6cbbea Merge 'git-gui/js/intent-to-add'
184: 14f7597 = 169: 4949113 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
185: a9fa19d = 170: 10da93c Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
186: 1ad5584 = 171: f8ca5bf Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
187: 88c8fe0 = 172: 381fd70 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path188: 5037606 = 173: 507de12 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
189: a5d8abb = 174: 392cde2 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
190: cc1707f = 175: e24cc50 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests191: 7b7d9cd = 176: 48f7d31 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
192: b033c4a = 177: 095b508 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t193: 7b062ce = 178: 9643b20 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory194: beb17af = 179: 89b5107 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
195: d0e2d36 = 180: bbbb78e Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
196: 8ba7011 = 181: 87b92ba Merge branch 'optionally-dont-append-atomically-on-windows'
197: fe195e9 = 182: 554d29e Merge branch 'fsync-object-files-always'
198: 98cb4f3 = 183: c3df103 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
199: 1246c2a = 184: 76eb72f Fix Windows version resources (Fix Windows version resources git#4092)
200: 3c50b72 = 185: f19e75a Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
201: 9b92cea < -: ---------- Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)202: a9cb6c6 = 186: 977fb81 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)203: fc675b3 = 187: d2b35bc Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283204: 7088366 = 188: f6f3006 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
205: 34b37a8 = 189: fad7584 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
206: 4fa12bb = 190: 6ab57d4 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
207: 5372786 = 191: da3985e Merge branch 'nano-server'
208: f6aa93e = 192: 2427834 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
209: 1d45fd8 = 193: 9cb6818 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
210: d11c32f = 194: 1468224 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
211: 3086195 = 195: fc85312 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
212: 8b90841 = 196: 82f1ebb Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
213: c5e5bf3 = 197: c4e2d23 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
214: 73c2344 = 198: 17a7121 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
215: 98d8920 = 199: 5b9190c credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
216: 6e967cf = 200: 4bffeac Merge branch 'reftable-vs-custom-allocators'
217: 0fac4a8 = 201: b6af996 Merge branch 'check-whitespace-only-downstream'
218: e6a3837 = 202: ec6201f 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)
219: 9142993 = 203: 7a957f4 Merge branch 'disallow-ntlm-auth-by-default'
220: 7fd3287 = 204: ed42530 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)221: d3f6886 = 205: 5c97913 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
222: cd6c341 = 206: b920f78 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
223: 75314e2 = 207: d41bd32 entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
224: 7d0efdf = 208: ea7deb5 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)225: f7d7f46 = 209: 08dda2f Merge branch 'msys2'
226: a4a683e = 210: b31596b Merge 'docker-volumes-are-no-symlinks'
227: a9a41b6 = 211: 8259624 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
228: 4013105 = 212: 8d36262 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
229: fad6bb5 = 213: 6dd7624 Merge branch 'dont-clean-junctions'
230: ecbc4d1 = 214: 26447a9 Merge branch 'wsl-file-mode-bits'
231: f15dbf0 = 215: e4f33b6 Merge branch 'validate-dotgit'
232: 2ce432b = 216: b8a058d Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
233: 6f3118a = 217: b5d3780 Merge branch 'skip-rust-in-the-coverity-builds'
234: a7359a6 = 218: b08839e Merge branch 'ready-for-upstream'
235: 2d8bb73 = 219: cf437ea Win32: make FILETIME conversion functions public
236: 5d60949 = 220: b263814 Win32: dirent.c: Move opendir down
237: 5b71edb = 221: 3e6d6da mingw: make the dirent implementation pluggable
238: 4b2f120 = 222: 085ee75 Win32: make the lstat implementation pluggable
239: 74efdc9 = 223: 35ad042 mingw: add infrastructure for read-only file system level caches
240: 23c4570 = 224: fe4dbd4 mingw: add a cache below mingw's lstat and dirent implementations
241: 6570ca5 = 225: a04d399 fscache: load directories only once
242: 0e19cdb = 226: d74144c fscache: add key for GIT_TRACE_FSCACHE
243: 81ee007 = 227: ffab122 fscache: remember not-found directories
244: 0932f76 = 228: 027247d fscache: add a test for the dir-not-found optimization
245: 35015dd = 229: 648ad5b add: use preload-index and fscache for performance
246: 9fa4036 = 230: b926ece dir.c: make add_excludes aware of fscache during status
247: 28b6e43 = 231: 05ff7e6 fscache: make fscache_enabled() public
248: 8c48d32 = 232: f94bee5 dir.c: regression fix for add_excludes with fscache
249: ed00b1b = 233: ba20ef8 fetch-pack.c: enable fscache for stats under .git/objects
250: 7a7001f = 234: e922548 checkout.c: enable fscache for checkout again
251: 637e628 = 235: 5ca8a69 Enable the filesystem cache (fscache) in refresh_index().
252: 1d0a10c = 236: bad900d fscache: use FindFirstFileExW to avoid retrieving the short name
253: 65c70d7 = 237: c0c3662 fscache: add GIT_TEST_FSCACHE support
254: d605a7a = 238: 6012117 fscache: add fscache hit statistics
255: 702225b = 239: 8884fcc unpack-trees: enable fscache for sparse-checkout
256: aa7e820 = 240: d5f5dd4 status: disable and free fscache at the end of the status command
257: 7b14ea8 = 241: bccbf62 mem_pool: add GIT_TRACE_MEMPOOL support
258: 9c7ba0a = 242: 38c32eb fscache: fscache takes an initial size
259: f0cbf95 = 243: d213b48 fscache: update fscache to be thread specific instead of global
260: 67191ab = 244: 9b69191 fscache: teach fscache to use mempool
261: 014f802 = 245: dfd9d21 fscache: make fscache_enable() thread safe
262: fc82d45 = 246: 1e86fea git-gui--askyesno: fix funny text wrapping
263: b5699d8 = 247: 226d311 fscache: teach fscache to use NtQueryDirectoryFile
264: db3380c = 248: 87c53a3 git-gui--askyesno (mingw): use Git for Windows' icon, if available
265: 1cd2637 = 249: f127755 fscache: remember the reparse tag for each entry
266: 7da4012 = 250: 114bd2e fscache: Windows Docker volumes are not symbolic links
267: 46271fe = 251: 8c18666 fscache: optionally enable wsl compability file mode bits
268: d26df00 = 252: 0a3e340 Merge branch 'fscache'
269: 0c65a49 = 253: 56c3c85 fscache: implement an FSCache-aware is_mount_point()
270: ad490c0 = 254: ae965a4 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
271: 0f92494 = 255: 7b4f159 clean: make use of FSCache
272: cc021e6 = 256: 504242e Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
273: 1bc622a = 257: 2fb1e44 Merge branch 'dont-clean-junctions-fscache'
274: fc8f5ce = 258: 20c7c48 pack-objects (mingw): demonstrate a segmentation fault with large deltas
275: c1d96db = 259: 1dcec06 mingw: support long paths
276: 8f74f43 = 260: bc0c60c win32(long path support): leave drive-less absolute paths intact
277: ebedfb9 = 261: 959aa04 compat/fsmonitor/fsm-*-win32: support long paths
278: 734f9b1 = 262: 83a5d1f clean: suggest using
core.longPathsif paths are too long to remove279: 9d843b7 = 263: 5ccb427 mingw: explicitly specify with which cmd to prefix the cmdline
280: b506324 = 264: 0473e40 mingw: when path_lookup() failed, try BusyBox
281: db25c32 = 265: 7340226 test-tool: learn to act as a drop-in replacement for
iconv282: e6c0361 = 266: 58cb4a7 tests(mingw): if
iconvis unavailable, usetest-helper --iconv283: c7860c3 = 267: 4149667 gitattributes: mark .png files as binary
284: faeb6a6 = 268: 5c1ea17 tests: move test PNGs into t/lib-diff/
285: 73fa74f = 269: 6e57792 tests: only override sort & find if there are usable ones in /usr/bin/
286: f5e9741 = 270: 7067d9e tests: use the correct path separator with BusyBox
287: 251427b = 271: f6a9a90 mingw: only use Bash-ism
builtin pwd -Wwhen available288: 5a954e8 = 272: a5f1212 tests (mingw): remove Bash-specific pwd option
289: 3ce7400 = 273: eceb9cb test-lib: add BUSYBOX prerequisite
290: 8629979 = 274: b1a025d t5003: use binary file from t/lib-diff/
291: ccd2f25 = 275: 988d59d t5532: workaround for BusyBox on Windows
292: dba9d0d = 276: 59654a9 t5605: special-case hardlink test for BusyBox-w32
293: 57cf23f = 277: fe5c399 t5813: allow for $PWD to be a Windows path
294: 312fff9 = 278: 054c523 t9200: skip tests when $PWD contains a colon
295: aae3174 = 279: 50a8584 Describe Git for Windows' architecture
296: fcd42af = 280: cdd6c02 Add an AGENTS.md file to help with AI-assisted debugging/development
297: 1123195 = 281: 6a6e72d Modify the Code of Conduct for Git for Windows
298: 29bd21a = 282: e09eee4 Merge branch 'gitk-and-git-gui-patches'
299: 559adb5 = 283: 637ab99 CONTRIBUTING.md: add guide for first-time contributors
300: 685eedd = 284: 10bd418 Merge branch 'long-paths'
301: 4e50708 = 285: 358e254 README.md: Add a Windows-specific preamble
302: 3d10d54 = 286: 69a89c2 Partially un-revert "editor: save and reset terminal after calling EDITOR"
303: cdf893b = 287: 469070b Merge branch 'busybox-w32'
304: e2b690b = 288: 8f6724f Add an issue template
305: e51e8c8 = 289: 317b9a3 reset: reinstate support for the deprecated --stdin option
306: 4888cd9 = 290: 8bb2161 Merge branch 'un-revert-editor-save-and-reset'
307: 2e9d0e7 = 291: d54aee0 Modify the GitHub Pull Request template (to reflect Git for Windows)
308: 4fa5f81 = 292: 7edf0f9 Add a GitHub workflow to monitor component updates
309: 5307ebb = 293: e0adcde fsmonitor: reintroduce core.useBuiltinFSMonitor
310: 6f08eba = 294: 0af2179 Merge branch 'phase-out-reset-stdin'
311: fdbf391 = 295: 206cf80 SECURITY.md: document Git for Windows' policies
312: 673acb5 = 296: 4acef2d dependabot: help keeping GitHub Actions versions up to date
313: ef08f67 = 297: d07ef8e Merge branch 'deprecate-core.useBuiltinFSMonitor'
314: a47102a = 298: 19fbaf3 ci: only run the expensive tests in the Windows tests for now
315: 3ff195a = 299: ab4f2af Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
316: ba7665d = 300: df1a3d6 Merge 'readme' into HEAD
317: f6e2281 = 301: 1ec9d8e build(deps): bump actions/cache from 5 to 6
318: d19083f = 302: c5acad0 build(deps): bump actions/cache from 5 to 6 (build(deps): bump actions/cache from 5 to 6 git#6303)
319: 877d881 = 303: e375add repo: split annotated tags out from total tag count in structure
320: 9a7d60c = 304: 773b303 repo: filter the structure scope via --ref-filter=
321: 35f96cb = 305: 862c3f4 repo: report top-N paths by count, disk, and inflated size in structure
322: 9a814b4 = 306: 0c1d11e t1901: cover the --top option of
git repo structure323: 80a6275 = 307: 604757c repo: read the
--topdefault fromrepo.structure.top324: 7a42594 = 308: 74fe489 git-survey: announce the upcoming pivot into
git repo structure325: 9f1ebc3 = 309: c3d629e survey: turn into a thin shim over
git repo structure326: 67e3c87 = 310: 90bd3d8 Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)327: 4dbf5b1 = 311: 5832156 fixup??? repo: filter the structure scope via --ref-filter=
328: caf643d = 312: 8879b0e fixup??? t1901: cover the --top option of
git repo structure329: b1f8971 = 313: c85c3be fixup??? repo: read the
--topdefault fromrepo.structure.top330: f2040a7 = 314: a60ada1 fixup??? mingw: support long paths
331: b9a3dd8 = 315: 7c4fede fixup??? win32(long path support): leave drive-less absolute paths intact
332: b850df0 = 316: eae4518 fixup??? survey: stub in new experimental 'git-survey' command
333: 8aef78f = 317: d935935 fixup??? survey: turn into a thin shim over
git repo structure334: becdb5c = 318: 117db4f fixup??? survey: stub in new experimental 'git-survey' command
Truncated; see the full conflict report in the workflow run summary.