Repository navigation
Rebase shears/seen: 12 conflict(s) (10 skipped, 2 resolved) (#34822048245) - #452
Open
gitforwindowshelper[bot] wants to merge 322 commits into
Open
gitforwindowshelper[bot] wants to merge 322 commits into
gitforwindowshelper[bot] wants to merge 322 commits into
Conversation
When 'git survey' provides information to the user, this will be presented in one of two formats: plaintext and JSON. The JSON implementation will be delayed until the functionality is complete for the plaintext format. The most important parts of the plaintext format are headers specifying the different sections of the report and tables providing concreted data. Create a custom table data structure that allows specifying a list of strings for the row values. When printing the table, check each column for the maximum width so we can create a table of the correct size from the start. The table structure is designed to be flexible to the different kinds of output that will be implemented in future changes. Signed-off-by: Derrick Stolee <stolee@gmail.com>
At the moment, nothing is obvious about the reason for the use of the
path-walk API, but this will become more prevelant in future iterations. For
now, use the path-walk API to sum up the counts of each kind of object.
For example, this is the reachable object summary output for my local repo:
REACHABLE OBJECT SUMMARY
========================
Object Type | Count
------------+-------
Tags | 1343
Commits | 179344
Trees | 314350
Blobs | 184030
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Now that we have explored objects by count, we can expand that a bit more to summarize the data for the on-disk and inflated size of those objects. This information is helpful for diagnosing both why disk space (and perhaps clone or fetch times) is growing but also why certain operations are slow because the inflated size of the abstract objects that must be processed is so large. Note: zlib-ng is slightly more efficient even at those small sizes. Even between zlib versions, there are slight differences in compression. To accommodate for that in the tests, not the exact numbers but some rough approximations are validated (the test should validate `git survey`, after all, not zlib). Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
The winsock2 library provides functions that work on different data types than file descriptors, therefore we wrap them. But that is not the only difference: they also do not set `errno` but expect the callers to enquire about errors via `WSAGetLastError()`. Let's translate that into appropriate `errno` values whenever the socket operations fail so that Git's code base does not have to change its expectations. This closes git-for-windows#2404 Helped-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In future changes, we will make use of these methods. The intention is to keep track of the top contributors according to some metric. We don't want to store all of the entries and do a sort at the end, so track a constant-size table and remove rows that get pushed out depending on the chosen sorting algorithm. Co-authored-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by; Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
We map WSAGetLastError() errors to errno errors in winsock_error_to_errno(), but the MSVC strerror() implementation only produces "Unknown error" for most of them. Produce some more meaningful error messages in these cases. Our builds for ARM64 link against the newer UCRT strerror() that does know these errors, so we won't change the strerror() used there. The wording of the messages is copied from glibc strerror() messages. Reported-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>
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>
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>
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>
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>
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>
Continue the size_t evacuation. With buffer_is_binary() widened in the prior commit, every consumer that the size flows into in combine-diff.c is size_t-ready, so widen grab_blob()'s out-param outright and move the matching locals at its three call sites together. grab_blob()'s body collapses to a direct odb_read_object(&size) since the bridge variable is no longer needed. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Prep for dropping the cast_size_t_to_ulong() shim in add_preferred_base() (pack-objects.c), and aligns the public API with the size_t shape the rest of the tree topic is moving toward. struct tree_desc.size stays unsigned int -- the on-disk tree format hard-caps each tree at 4 GiB, so the field is intentionally narrow and the assignment in init_tree_desc_internal() already truncated unsigned long inputs the same way it now truncates size_t inputs. The widening is purely about the call-side type-correctness; the internal cap is unchanged. All 30+ callers pass values that promote cleanly (unsigned long, size_t, or smaller integer types). Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue the size_t evacuation. textconv_object() fills its out-parameter from fill_textconv()'s size_t return through an unsigned long*; widen the API to match, then take advantage of the new shape where callers can. cat-file's 'c' and batch-mode 'c' branches lose their size_ul bridge variables (one site becomes a direct call, the other collapses an if/else into a single negated condition that reads as "try textconv, fall back to a raw read"). blame.c likewise drops the file_size_st bridge in fill_origin_blob() and hoists final_buf_size_st to bracket both branches in setup_scoreboard(). The latter keeps a cast_size_t_to_ulong() shim because struct blame_scoreboard.final_buf_size is still unsigned long; that field is its own topic. log.c just widens its local from unsigned long to size_t. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Same theme as the preceding pack-objects series: get_size_by_pos() returns an unsigned long but reads its size out of packed_object_info() / odb_read_object_info_extended() via a size_t out-parameter, so on Windows it would silently truncate the very sizes filter_bitmap_blob_limit() then compares against the --filter=blob:limit threshold to decide which blobs to elide from the bitmap-backed traversal. Drop the cast_size_t_to_ulong() and return size_t directly. The two callers' limit comparison promotes to size_t cleanly. limit itself stays unsigned long; it is part of a filter API ripple of its own. Assisted-by: Opus 4.7 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>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git repo structure` walks every reference enumerated by `refs_for_each_ref()` and feeds each reference's tip into the path walk that produces the object counts. There is no way to scope the inquiry to a subset of refs, even though that is the most common need when an operator is investigating what part of the history is driving cost: only branches, only release tags, only one remote's view, etc. Add a single `--ref-filter=<pattern>` option that, when given, restricts both the reference count and the object walk to refs whose full name matches one of the patterns. The option is repeatable; multiple patterns form a union, so `--ref-filter='refs/heads/*' --ref-filter='refs/tags/v*'` includes local branches and tags whose short name starts with `v`. Patterns use `wildmatch()` with `WM_PATHNAME` semantics so a `*` does not cross `/`, matching the convention used by `git for-each-ref` positional arguments. Choosing a single flexible filter, rather than a proliferation of per-kind flags like `--branches`, `--tags`, `--remotes`, keeps the option surface small and lets the same mechanism express narrow selections the per-kind flags could not, such as "only release tags" (`'refs/tags/v*'`) or "only one remote's branches" (`'refs/remotes/origin/*'`). Without `--ref-filter`, behaviour is unchanged: every ref `refs_for_each_ref()` enumerates contributes. Both the reference counter and the path-walk seeding (via `add_pending_oid()`) sit on the same callback, so an early return when no pattern matches naturally excludes a ref from both. No separate object-walk machinery is needed. Cover the two interesting code paths with tests in t1901: a single filter narrowing to branches, and two filters unioning to include both branches and tags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and Philip Oakley. Helped-by: Clive Chan <cc@clive.io> Helped-by: Adric Norris <landstander668@gmail.com> Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com> Helped-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Brendan Forster <brendan@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git 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>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
`git survey` exposes its `--top` default via `survey.top` so that a site or per-repository operator can switch the detail tables on once and have every subsequent invocation include them. Mirror that ergonomics for `git repo structure` so that, as `git survey`'s functionality is folded into `git repo structure`, the configuration side of the migration story stays equivalent. Add a small `git_config_int` callback bound to `repo.structure.top` and invoke it before `parse_options()`, so a `--top=<N>` on the command line cleanly overrides the configured default (including `--top=0` to opt out of the detail tables when configuration enables them). Reject negative configured values with the same wording as the command-line guard, since `git_config_int()` happily returns negative integers. Document the new variable in a fresh `Documentation/config/repo.adoc` and wire it into the alphabetical includes in `Documentation/config.adoc` between `repack.adoc` and `rerere.adoc`. Cover the precedence behaviour with a t1901 test: a configured value enables the tables by default, and a command-line `--top=0` suppresses them again. Note that the reported paths respect the `core.quotePath` setting. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
`git survey` started life as an experimental scale-measurement tool; the preceding commits give `git repo structure` the path-level detail tables and ref-scoping mechanism that were `git survey`'s main draw, so the two now overlap substantially. Plan the migration explicitly: add a short notice at the top of the description making clear which of `git survey`'s knobs map to which `git repo structure` option, and state that a future release will turn `git survey` into a thin shim over `git repo structure`. Putting the notice in the description (rather than only the synopsis) ensures it shows up in `git help survey` rendering before the reader sees any option specifics, so an operator skimming the page learns about the replacement before adopting any survey-specific flags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v5...v6) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` was an experimental scale-measurement tool whose
distinctive features (ref-kind filters, top-N path tables) are now
all available in `git repo structure`. With the path-level reporting
in place (commits "repo: filter the structure scope via
--ref-filter=<pattern>" and "repo: report top-N paths by count, disk,
and inflated size in structure"), there is no functionality `git
survey` provides that `git repo structure` cannot.
Replace the 764-line `git survey` implementation with a roughly
hundred-line shim that:
* Accepts the existing `git survey` command line so callers in
scripts continue to parse without changes.
* Emits a deprecation warning naming the replacement command, so
interactive users learn about the migration target.
* Translates the survey-specific knobs into the equivalent
`git repo structure` invocation and re-execs the canonical
command via `execv_git_cmd()`. Per-kind ref selectors fan out
into the corresponding `refs/heads/*`, `refs/tags/*`, etc.
`--ref-filter` patterns; `--top=<N>` is forwarded directly;
`--all-refs` becomes the absence of any `--ref-filter`.
Two survey options have no `git repo structure` counterpart:
`--verbose` controlled per-step trace output the new command does
not emit, and `--detached` selected the detached HEAD which
`git repo structure` does not enumerate separately. Both are
silently accepted and produce a single warning each, so old
invocations keep working while the absence of these knobs in `git
repo structure` is made visible.
Rewrite t8100 to assert the shim's contract: the deprecation
warning is printed, the output is byte-identical to a corresponding
`git repo structure` invocation, and the per-kind selector
translation produces the right `--ref-filter` pattern. The
preceding survey-specific output assertions (the multi-column
plaintext tables) no longer apply, since `git repo structure`'s
output format is now the canonical one and is covered by t1901.
The `survey.*` configuration keys (`survey.top`, `survey.progress`,
`survey.verbose`) are no longer honored by the shim. They were
mirrored by the preceding `repo.structure.top` work for the most
useful knob; users with `survey.top` set in config should migrate
to `repo.structure.top`. This is a backward-incompatible removal
documented by the deprecation notice in `git-survey.adoc`.
Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/actions/cache/releases">actions/cache's releases</a>.</em></p> <blockquote> <h2>v6.0.0</h2> <h2>What's Changed</h2> <ul> <li>Update packages, migrate to ESM by <a href="https://github.com/Samirat"><code>@Samirat</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1760">actions/cache#1760</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v6.0.0">https://github.com/actions/cache/compare/v5...v6.0.0</a></p> <h2>v5.1.0</h2> <h2>What's Changed</h2> <ul> <li>Bump <code>@actions/cache</code> to v5.1.0 - handle read-only cache access by <a href="https://github.com/jasongin"><code>@jasongin</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1775">actions/cache#1775</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.1.0">https://github.com/actions/cache/compare/v5...v5.1.0</a></p> <h2>v5.0.5</h2> <h2>What's Changed</h2> <ul> <li>Update ts-http-runtime dependency by <a href="https://github.com/yacaovsnc"><code>@yacaovsnc</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1747">actions/cache#1747</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.0.5">https://github.com/actions/cache/compare/v5...v5.0.5</a></p> <h2>v5.0.4</h2> <h2>What's Changed</h2> <ul> <li>Add release instructions and update maintainer docs by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1696">actions/cache#1696</a></li> <li>Potential fix for code scanning alert no. 52: Workflow does not contain permissions by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1697">actions/cache#1697</a></li> <li>Fix workflow permissions and cleanup workflow names / formatting by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1699">actions/cache#1699</a></li> <li>docs: Update examples to use the latest version by <a href="https://github.com/XZTDean"><code>@XZTDean</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1690">actions/cache#1690</a></li> <li>Fix proxy integration tests by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1701">actions/cache#1701</a></li> <li>Fix cache key in examples.md for bun.lock by <a href="https://github.com/RyPeck"><code>@RyPeck</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1722">actions/cache#1722</a></li> <li>Update dependencies & patch security vulnerabilities by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1738">actions/cache#1738</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/XZTDean"><code>@XZTDean</code></a> made their first contribution in <a href="https://redirect.github.com/actions/cache/pull/1690">actions/cache#1690</a></li> <li><a href="https://github.com/RyPeck"><code>@RyPeck</code></a> made their first contribution in <a href="https://redirect.github.com/actions/cache/pull/1722">actions/cache#1722</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.0.4">https://github.com/actions/cache/compare/v5...v5.0.4</a></p> <h2>v5.0.3</h2> <h2>What's Changed</h2> <ul> <li>Bump <code>@actions/cache</code> to v5.0.5 (Resolves: <a href="https://github.com/actions/cache/security/dependabot/33">https://github.com/actions/cache/security/dependabot/33</a>)</li> <li>Bump <code>@actions/core</code> to v2.0.3</li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.0.3">https://github.com/actions/cache/compare/v5...v5.0.3</a></p> <h2>v.5.0.2</h2> <h1>v5.0.2</h1> <h2>What's Changed</h2> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/actions/cache/blob/main/RELEASES.md">actions/cache's changelog</a>.</em></p> <blockquote> <h1>Releases</h1> <h2>How to prepare a release</h2> <blockquote> <p>[!NOTE] Relevant for maintainers with write access only.</p> </blockquote> <ol> <li>Switch to a new branch from <code>main</code>.</li> <li>Run <code>npm test</code> to ensure all tests are passing.</li> <li>Update the version in <a href="https://github.com/actions/cache/blob/main/package.json"><code>https://github.com/actions/cache/blob/main/package.json</code></a>.</li> <li>Run <code>npm run build</code> to update the compiled files.</li> <li>Update this <a href="https://github.com/actions/cache/blob/main/RELEASES.md"><code>https://github.com/actions/cache/blob/main/RELEASES.md</code></a> with the new version and changes in the <code>## Changelog</code> section.</li> <li>Run <code>licensed cache</code> to update the license report.</li> <li>Run <code>licensed status</code> and resolve any warnings by updating the <a href="https://github.com/actions/cache/blob/main/.licensed.yml"><code>https://github.com/actions/cache/blob/main/.licensed.yml</code></a> file with the exceptions.</li> <li>Commit your changes and push your branch upstream.</li> <li>Open a pull request against <code>main</code> and get it reviewed and merged.</li> <li>Draft a new release <a href="https://github.com/actions/cache/releases">https://github.com/actions/cache/releases</a> use the same version number used in <code>package.json</code> <ol> <li>Create a new tag with the version number.</li> <li>Auto generate release notes and update them to match the changes you made in <code>RELEASES.md</code>.</li> <li>Toggle the set as the latest release option.</li> <li>Publish the release.</li> </ol> </li> <li>Navigate to <a href="https://github.com/actions/cache/actions/workflows/release-new-action-version.yml">https://github.com/actions/cache/actions/workflows/release-new-action-version.yml</a> <ol> <li>There should be a workflow run queued with the same version number.</li> <li>Approve the run to publish the new version and update the major tags for this action.</li> </ol> </li> </ol> <h2>Changelog</h2> <h3>6.1.0</h3> <ul> <li>Bump <code>@actions/cache</code> to v6.1.0 to pick up <a href="https://redirect.github.com/actions/toolkit/pull/2435">actions/toolkit#2435 Handle cache write error due to read-only token</a></li> <li>Switch redundant "Cache save failed" warning to debug log in save-only</li> </ul> <h3>6.0.0</h3> <ul> <li>Updated <code>@actions/cache</code> to ^6.0.1, <code>@actions/core</code> to ^3.0.1, <code>@actions/exec</code> to ^3.0.0, <code>@actions/io</code> to ^3.0.2</li> <li>Migrated to ESM module system</li> <li>Upgraded Jest to v30 and test infrastructure to be ESM compatible</li> </ul> <h3>5.0.4</h3> <ul> <li>Bump <code>minimatch</code> to v3.1.5 (fixes ReDoS via globstar patterns)</li> <li>Bump <code>undici</code> to v6.24.1 (WebSocket decompression bomb protection, header validation fixes)</li> <li>Bump <code>fast-xml-parser</code> to v5.5.6</li> </ul> <h3>5.0.3</h3> <ul> <li>Bump <code>@actions/cache</code> to v5.0.5 (Resolves: <a href="https://github.com/actions/cache/security/dependabot/33">https://github.com/actions/cache/security/dependabot/33</a>)</li> <li>Bump <code>@actions/core</code> to v2.0.3</li> </ul> <h3>5.0.2</h3> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/actions/cache/commit/55cc8345863c7cc4c66a329aec7e433d2d1c52a9"><code>55cc834</code></a> Merge pull request <a href="https://redirect.github.com/actions/cache/issues/1768">#1768</a> from jasongin/readonly-cache</li> <li><a href="https://github.com/actions/cache/commit/d8cd72f230726cdf4457ebb61ec1b593a8d12337"><code>d8cd72f</code></a> Bump <code>@actions/cache</code> to v6.1.0 - handle cache write error due to RO token</li> <li><a href="https://github.com/actions/cache/commit/2c8a9bd7457de244a408f35966fab2fb45fda9c8"><code>2c8a9bd</code></a> Merge pull request <a href="https://redirect.github.com/actions/cache/issues/1760">#1760</a> from actions/samirat/esm_migration_and_package_update</li> <li><a href="https://github.com/actions/cache/commit/e9b91fdc3fea7d79165fceb79042ef45c2d51023"><code>e9b91fd</code></a> Prettier fixes</li> <li><a href="https://github.com/actions/cache/commit/e4884b8ff7f92ef6b52c79eda480bbc86e685adb"><code>e4884b8</code></a> Rebuild dist</li> <li><a href="https://github.com/actions/cache/commit/10baf0191a3c426ea0fa4a3253a5c04233b6e18f"><code>10baf01</code></a> Fixed licenses</li> <li><a href="https://github.com/actions/cache/commit/e39b386c9004d72a15d864ade8c0b3a702d47a37"><code>e39b386</code></a> Fix test mock return order</li> <li><a href="https://github.com/actions/cache/commit/b6928203372a8571ff984c0c883ef3a1adfb0c06"><code>b692820</code></a> PR feedback</li> <li><a href="https://github.com/actions/cache/commit/60749128a44d25d3c520a489e576380cf00ff3f1"><code>6074912</code></a> Rebuild dist bundles as ESM to match type:module</li> <li><a href="https://github.com/actions/cache/commit/5a912e8b4af820fa082a0e75cfd2c782f8fbfe0e"><code>5a912e8</code></a> Fix lint and jest issues</li> <li>Additional commits viewable in <a href="https://github.com/actions/cache/compare/v5...v6">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
This is yet another set of `unsigned long` declarations that should have been `size_t` ones. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Servers may advertise bundle URIs that are not HTTP(S); copy_uri_to_file() then opens it as a local path. On Windows that can be a UNC path like `//attacker/share/x`, i.e. a clone can be manipulated into making an outbound SMB connection that leaks NTLM credentials (CVE-2026-62960). Subject advertised URIs to the usual protocol allow-list (`protocol.*.allow`), which drops "file" (and bare/UNC paths) by default but keeps http/https/git/ssh. Do it in fetch_bundle_list(), the clone/fetch consume path, so ls-remote still lists everything; each skipped URI is reported. A user-supplied `--bundle-uri` is unaffected, and `protocol.file.allow=always` re-enables an advertised file URI. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…it-for-windows#6268) `git survey` was always experimental, and I never got around to upstreaming it to make it non-experimental. In the meantime, the `git repo structure` command was upstreamed upstream, which covers most of the same ground with a cleaner option surface and a stable output contract. This PR closes the remaining gap (annotated-tag breakdown, ref scoping, top-N paths by count/disk/inflated, and the corresponding configuration knob) and then turns `git survey` into a thin shim that warns about deprecation, translates its old command line into the equivalent `git repo structure` invocation, and re-execs the canonical command. Net result: one user-facing tool to maintain and to teach instead of two. The intent is that scripts pinned to `git survey` keep working (a warning aside), and that operators have a single answer when they ask "how do I see what's making my repository large?". The `survey.*` configuration keys are intentionally dropped; the only one that mattered, `survey.top`, has a direct replacement in `repo.structure.top`.
... and yet another round of `unsigned long` -> `size_t` transmogrifications. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Prepare a new Git for Windows release with the rebuilt Bash package that no longer carries the expired Authenticode signature. Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com>
Git for Windows v2.55.0(4)
Changes since Git for Windows v2.55.0(3) (July 14th 2026):
Following the MSYS2 project, on which Git for Windows is based, Windows
8.1 support will be dropped after Git for Windows v2.55.
This is a security fix release, addressing CVE-2026-62960.
* CVE-2026-62960, Git for Windows: Attacker-controlled servers may
advertise bundle URIs that point to network shares, causing Windows
to transparently perform NTLM authentication and disclose the
user's NTLMv2 hash. Since NTLM hashing is weak, the captured hash
can potentially be brute-forced to recover the user's credentials.
This is addressed by limiting the bundle URIs that git clone
respects by the same protocol.<name>.allow rules as usual, which
excludes file:// URIs by default.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
I should have added this test as soon as git-for-windows#6012 was opened. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows v2.55.0(5)
Changes since Git for Windows v2.55.0(4) (August 11th 2026)
Following the MSYS2 project, on which Git for Windows is based, Windows
8.1 support will be dropped after Git for Windows v2.55.
New Features
* The experimental git survey command (which was never upstreamed to
the core Git project) was deprecated and converted into a small
shim on top of git repo structure. In the future, git repo
structure should be used instead, as the git survey command will be
retired eventually.
* Git for Windows' installer is now a 64-bit executable (x64 instead
of 86).
* Comes with the MSYS2 runtime (Git for Windows flavor) based on
Cygwin v3.6.10.
* Comes with OpenSSH v10.5.P1.
Bug Fixes
* The long-standing bug where Git Bash's screen was cleared after
git.exe called vim (e.g. to edit a commit message) was fixed.
* The Bash executables in the 64-bit and ARM64 distributions no
longer carry an invalid Authenticode signature.
Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com>
When I merged the massive amount of work in git-for-windows#6289, I thought that that was the end of it. But simply staging and unpacking loose blobs that are 4GB or larger _still_ does not work. This PR addresses that. This fixes git-for-windows#6012
We need to be very careful _not_ to read the config too early. The reason is that some Git commands want to delay reading the config until they configured something beforehand. For example, `cmd_commit()` sets the `warn_on_auto_comment_char = true` before reading the config, implicitly telling the function `check_auto_comment_char_config()` to warn (once) when encountering the corresponding, deprecated construct. If `mingw_open()` reads the config already at the point when the gitdir is discovered, i.e. way before `cmd_commit()` can do its thing, that global flag will still be `false` when the warning should be produced. Earlier, we already had to fiddle with the condition, to ensure that the commondir is already initialized (and therefore it should be safe to read the config). That was still not enough, apparently. The symptom is that both t3404.86 (rebase -i respects core.commentchar=auto) and t7502.85 (core.commentChar=auto is rejected) will fail. The good news is that the config setting we want to read in `mingw_open()` concerns itself with _appending to files_, something we will never do before reaching `cmd_commit()`. Therefore, simply extending the guard around config reading makes this logic "delayed enough" so that aforementioned test cases pass successfully. 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: 13e7ca3fef (fixup! Add config option
windows.appendAtomically, 2026-09-11) (6aa4d9577b..13e7ca3fef)Skipped: 5c9d8ea (mingw: include the Python parts in the build, 2015-02-16)
Upstream equivalent: b721ade (mingw: include the Python parts in the build, 2026-09-10)
Range-diff
1: 5c9d8ea ! 1: b721ade mingw: include the Python parts in the build
@@ Commit message bandwidth), MSYS2 provides very fine Python interpreters that users can easily take advantage of, by using Git for Windows within its SDK. + Helped-by: Johannes Sixt <j6t@kdbg.org> 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: bc44196 (windows: skip linking
git-<command>for built-ins, 2023-01-27)Upstream equivalent: 0d5ce13 (windows: skip linking
git-<command>for built-ins, 2026-09-10)Range-diff
1: bc44196 ! 1: 0d5ce13 windows: skip linking
git-<command>for built-ins@@ Commit message This deprecation was never finalized by skipping these hard-links, but we can start the process now, in Git for Windows. + Helped-by: Johannes Sixt <j6t@kdbg.org> 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),Windows)Skipped: 171d7de (mingw: stop hard-coding
CC = gcc, 2025-11-23)Upstream equivalent: e0e94cc (mingw: stop hard-coding
CC = gcc, 2026-09-10)Range-diff
1: 171d7de ! 1: e0e94cc mingw: stop hard-coding
CC = gcc@@ Commit message This is no longer true in general, not with supporting Clang out of the box. + Helped-by: Johannes Sixt <j6t@kdbg.org> 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: 03737fa (mingw: drop the -D_USE_32BIT_TIME_T option, 2025-11-21)
Upstream equivalent: 2de7b82 (mingw: drop the -D_USE_32BIT_TIME_T option, 2026-09-10)
Range-diff
1: 03737fa ! 1: 2de7b82 mingw: drop the -D_USE_32BIT_TIME_T option
@@ Commit message So let's send that option into its well-deserved retirement. + Helped-by: Johannes Sixt <j6t@kdbg.org> 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: a8165e8 (mingw: only use -Wl,--large-address-aware for 32-bit builds, 2025-11-21)
Upstream equivalent: 59d4514 (mingw: only use -Wl,--large-address-aware for 32-bit builds, 2026-09-10)
Range-diff
1: a8165e8 ! 1: 59d4514 mingw: only use -Wl,--large-address-aware for 32-bit builds
@@ Commit message those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. + Helped-by: Johannes Sixt <j6t@kdbg.org> 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: fbd9602 (mingw: avoid over-specifying
--pic-executable, 2025-11-21)Upstream equivalent: f243cc3 (mingw: avoid over-specifying
--pic-executable, 2026-09-10)Range-diff
1: fbd9602 ! 1: f243cc3 mingw: avoid over-specifying
--pic-executable@@ Commit message So let's drop the overly-specific definition. + Helped-by: Johannes Sixt <j6t@kdbg.org> 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: f178073 (mingw: set the prefix and HOST_CPU as per MSYS2's settings, 2025-11-21)
Upstream equivalent: 59ab0a5 (mingw: set the prefix and HOST_CPU as per MSYS2's settings, 2026-09-10)
Range-diff
1: f178073 ! 1: 59ab0a5 mingw: set the prefix and HOST_CPU as per MSYS2's settings
@@ Commit message can use those to infer the installation location as well as the CPU. No need for hard-coding ;-) + Helped-by: Johannes Sixt <j6t@kdbg.org> 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: 22a9970 (mingw: only enable the MSYS2-specific stuff when compiling in MSYS2, 2025-11-21)
Upstream equivalent: 843047f (mingw: only enable the MSYS2-specific stuff when compiling in MSYS2, 2026-09-10)
Range-diff
1: 22a9970 ! 1: 843047f mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
@@ Commit message course. In that case, we want to ensure that `MSYSTEM` is set when running `git.exe`, and also enable the magic MSYS2 tty detection. + Helped-by: Johannes Sixt <j6t@kdbg.org> 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: 5da2a33 (mingw: rely on MSYS2's metadata instead of hard-coding it, 2025-11-21)
Upstream equivalent: d69ec48 (mingw: rely on MSYS2's metadata instead of hard-coding it, 2026-09-10)
Range-diff
1: 5da2a33 ! 1: d69ec48 mingw: rely on MSYS2's metadata instead of hard-coding it
@@ Commit message Incidentally, this also broadens the support to all the configurations supported by the MSYS2 project, i.e. clang64 & ucrt64, too. - Note: This keeps the same, hard-coded MSYSTEM platform support for CMake - as before, but drops it for Meson (because it is unclear how Meson could - do this in a more flexible manner). - + Helped-by: Johannes Sixt <j6t@kdbg.org> + Helped-by: Junio C Hamano <gitster@pobox.com> 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),Windows) @@ config.mak.uname: ifeq ($(uname_S),MINGW) prefix = $(MINGW_PREFIX) HOST_CPU = $(patsubst %-w64-mingw32,%,$(MINGW_CHOST)) BASIC_LDFLAGS += -Wl,--pic-executable - - ## contrib/buildsystems/CMakeLists.txt ## -@@ contrib/buildsystems/CMakeLists.txt: if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - _CONSOLE DETECT_MSYS_TTY STRIP_EXTENSION=".exe" NO_SYMLINK_HEAD UNRELIABLE_FSTAT - NOGDI OBJECT_CREATION_MODE=1 __USE_MINGW_ANSI_STDIO=0 - OVERRIDE_STRDUP MMAP_PREVENTS_DELETE USE_WIN32_MMAP -- HAVE_WPGMPTR ENSURE_MSYSTEM_IS_SET HAVE_RTLGENRANDOM) -+ HAVE_WPGMPTR HAVE_RTLGENRANDOM) -+ if(CMAKE_GENERATOR_PLATFORM STREQUAL "x64") -+ add_compile_definitions(ENSURE_MSYSTEM_IS_SET="UCRT64" MINGW_PREFIX="ucrt64") -+ elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "arm64") -+ add_compile_definitions(ENSURE_MSYSTEM_IS_SET="CLANGARM64" MINGW_PREFIX="clangarm64") -+ elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "x86") -+ add_compile_definitions(ENSURE_MSYSTEM_IS_SET="MINGW32" MINGW_PREFIX="mingw32") -+ endif() - list(APPEND compat_SOURCES - compat/mingw.c - compat/winansi.c - - ## meson.build ## -@@ meson.build: elif host_machine.system() == 'windows' - - libgit_c_args += [ - '-DDETECT_MSYS_TTY', -- '-DENSURE_MSYSTEM_IS_SET', - '-DNATIVE_CRLF', - '-DNOGDI', - '-DNO_POSIX_GOODIES', -@@ meson.build: elif host_machine.system() == 'windows' - '-D__USE_MINGW_ANSI_STDIO=0', - ] - -+ msystem = get_option('msystem') -+ if msystem != '' -+ mingw_prefix = get_option('mingw_prefix') -+ if mingw_prefix == '' -+ mingw_prefix = '/' + msystem.to_lower() -+ endif -+ libgit_c_args += [ -+ '-DENSURE_MSYSTEM_IS_SET="' + msystem + '"', -+ '-DMINGW_PREFIX="' + mingw_prefix + '"' -+ ] -+ endif -+ - libgit_dependencies += compiler.find_library('ntdll') - libgit_include_directories += 'compat/win32' - if compiler.get_id() == 'msvc' - - ## meson_options.txt ## -@@ meson_options.txt: option('runtime_prefix', type: 'boolean', value: false, - description: 'Resolve ancillary tooling and support files relative to the location of the runtime binary instead of hard-coding them into the binary.') - option('sane_tool_path', type: 'array', value: [], - description: 'An array of paths to pick up tools from in case the normal tools are broken or lacking.') -+option('msystem', type: 'string', value: '', -+ description: 'Fall-back on Windows when MSYSTEM is not set.') -+option('mingw_prefix', type: 'string', value: '', -+ description: 'Fall-back on Windows when MINGW_PREFIX is not set.') - - # Build information compiled into Git and other parts like documentation. - option('build_date', type: 'string', value: '',Skipped: f685fa8 (mingw: ensure valid CTYPE, 2017-02-21)
Upstream equivalent: 7904764 (mingw: ensure valid CTYPE, 2026-09-10)
Range-diff
1: f685fa8 ! 1: 7904764 mingw: ensure valid CTYPE
@@ Commit message This fixes https://github.com/git-for-windows/git/issues/1036 + Helped-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> + Signed-off-by: Junio C Hamano <gitster@pobox.com> ## compat/mingw.c ## @@ compat/mingw.c: static void setup_windows_environment(void)Resolved: 6a87007 (Fallback to AppData if XDG_CONFIG_HOME is unset, 2024-07-02)
preserved the AppData fallback and applied upstream Windows slash conversion to the selected path
Range-diff
1: 6a87007 ! 1: 343e506 Fallback to AppData if XDG_CONFIG_HOME is unset
Resolved: a77615d (mingw: support long paths, 2015-07-28)
preserved upstream mingw_utimensat logic and applied long-path conversion to its path argument
Range-diff
1: a77615d ! 1: 6645e43 mingw: support long paths
To: 9222386dc2 (fixup! Add config option
windows.appendAtomically, 2026-09-11) (de48d28732..9222386dc2)Statistics
Range-diff (click to expand)
1: 2031e9b = 1: 7bd9c70 unix-socket: avoid leak when initialization fails
2: 05fc73a = 2: ec86477 grep: prevent
^$false match at end of file3: 6e2f0dc = 3: a9d2829 Merge branch 'fixes-from-the-git-mailing-list'
4: 34d98b7 = 4: 0f72fb5 t9350: point out that refs are not updated correctly
5: e12d548 = 5: dabc8ed transport-helper: add trailing --
10: 478b9ab ! 6: 3762ee2 ci: bump actions/checkout from 6 to 7
@@ .github/workflows/main.yml: jobs: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - uses: git-for-windows/setup-git-for-windows-sdk@v2 - - name: build + - name: Install GCC-compatible Rust target shell: bash @@ .github/workflows/main.yml: jobs: group: vs-build-${{ github.ref }}7: 8e4f413 = 7: 7961ca0 remote-helper: check helper status after import/export
11: 8f45949 = 8: fbaf15f Always auto-gc after calling a fast-import transport
12: 23ea886 = 9: dfda48f mingw: prevent regressions with "drive-less" absolute paths
16: 601ba12 = 10: 51b50cb ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
17: 36d639b = 11: 1c1473c vcpkg_install: detect lack of Git
18: 1fcc875 = 12: 879847b vcpkg_install: add comment regarding slow network connections
21: 7d44d68 = 13: 76d3f3d vcbuild: install ARM64 dependencies when building ARM64 binaries
24: b8c9e97 = 14: bf730cc vcbuild: add an option to install individual 'features'
26: d13971c = 15: a82a32c cmake: allow building for Windows/ARM64
28: a173ae0 = 16: e22f5f9 ci(vs-build) also build Windows/ARM64 artifacts
6: 47c0906 = 17: e487c27 mingw: demonstrate a
git addissue with NTFS junctions30: 761bfb7 = 18: d8ea3f0 vcbuild: stop hard-coding OpenSSL as a dependency
19: 2a58fb1 = 19: f84d991 t5505/t5516: allow running without
.git/branches/in the templates8: 66c6b36 = 20: 33b75b1 strbuf_realpath(): use platform-dependent API if available
43: bbf69fb = 21: a2fe0ab http: use new "best effort" strategy for Secure Channel revoke checking
32: 1d0f4af = 22: 1490168 cmake(): allow setting HOST_CPU for cross-compilation
22: c96a76b = 23: 0309400 t5505/t5516: fix white-space around redirectors
13: 1ed46ef ! 24: 030275e transport: optionally disable side-band-64k
14: 8740a69 = 25: 190b277 mingw: fix fatal error working on mapped network drives on Windows
15: d060ce7 = 26: 5a48f34 clink.pl: fix MSVC compile script to handle libcurl-d.lib
52: 6654304 = 27: 49f4bf8 mingw: implement a platform-specific
strbuf_realpath()53: 07546a1 = 28: 06fcddd t3701: verify that we can add lots of files interactively
54: 8ff492b = 29: 1b522c7 commit: accept "scissors" with CR/LF line endings
55: e69e25b = 30: c73e681 t0014: fix indentation
56: 3d19bcc = 31: 019e7ea git-gui: accommodate for intent-to-add files
57: 234c6c5 = 32: 50fd43a mingw: allow for longer paths in
parse_interpreter()58: 12c2116 = 33: 1d7b732 compat/vcbuild: document preferred way to build in Visual Studio
59: 727da6d = 34: ed79c9a http: optionally send SSL client certificate
35: 3bfa13f = 35: ce2d69d CMake: default Visual Studio generator has changed
39: 739e385 ! 36: 8217bcc .gitignore: add Visual Studio CMakeSetting.json file
@@ .gitignore: Release/ +CMakeSettings.json /contrib/libgit-rs/target /contrib/libgit-sys/target - /rust/target44: 48cb9e8 = 37: 6cf3f85 subtree: update
contrib/subtreetesttarget45: e72438d = 38: 67b4a47 CMakeLists: add default "x64-windows" arch for Visual Studio
47: 81ca96f = 39: 377f80c setup: properly use "%(prefix)/" when in WSL
48: 6f94125 = 40: f744574 Add config option
windows.appendAtomically34: 8fafa30 = 41: 4ad218d MinGW: link as terminal server aware
60: d39ec6c = 42: 429243e ci: run
contrib/subtreetests in CI builds61: f3a7344 = 43: d15757c CMake: show Win32 and Generator_platform build-option values
-: ---------- > 44: 8f2ca7e Merge branch 'fixes-from-the-git-mailing-list'
63: 2a584c7 = 45: f2baccc compat/mingw.c: do not warn when failing to get owner
64: a1e17e7 = 46: 4cf9e2b mingw: $env:TERM="xterm-256color" for newer OSes
65: 4475c7d = 47: 38dae7b winansi: check result and Buffer before using Name
66: 210db7f = 48: 2ec84ff mingw: change core.fsyncObjectFiles = 1 by default
67: 5a57dcd = 49: fa2484b Fix Windows version resources
68: ef5ed80 = 50: 49d4722 status: fix for old-style submodules with commondir
20: c2f9913 = 51: 732f038 max_tree_depth: lower it for clang builds in general on Windows
23: 1ebb520 = 52: 9cc5d67 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
25: 33394fa = 53: f183a85 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
27: e5d65d2 = 54: fdb1b2e clink.pl: fix libexpatd.lib link error when using MSVC
29: bafa3c9 = 55: 5a20a3d Makefile: clean up .ilk files when MSVC=1
31: 97c0982 ! 56: 90c3fcf vcbuild: add support for compiling Windows resource files
33: c3d948e ! 57: b44518e config.mak.uname: add git.rc to MSVC builds
36: 5c7aa04 = 58: bb8a2f1 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
37: 7c5c83f = 59: 2953876 http: optionally load libcurl lazily
40: f38d8c5 = 60: 5ae6b20 clink.pl: move default linker options for MSVC=1 builds
41: 69908bb = 61: 544ad67 http: support lazy-loading libcurl also on Windows
49: 8a0e557 = 62: 5b9cc9a cmake: install headless-git.
50: d743534 = 63: f4014db http: when loading libcurl lazily, allow for multiple SSL backends
69: 361b12e = 64: 37980a2 git.rc: include winuser.h
70: bdfa1dc = 65: aeec185 mingw: do load libcurl dynamically by default
71: 040b638 = 66: c935c2a Add a GitHub workflow to verify that Git/Scalar work in Nano Server
72: 910a61c = 67: 3a55239 mingw: suggest
windows.appendAtomicallyin more cases73: 30028b9 = 68: bdc4f7d win32: use native ANSI sequence processing, if possible
74: 2a5e9e1 = 69: 3086b91 common-main.c: fflush stdout buffer upon exit
75: fe9cd3d = 70: 411289a t5601/t7406(mingw): do run tests with symlink support
38: a2a7a57 = 71: 5ed2076 revision: create mark_trees_uninteresting_dense()
42: 1a6746e ! 72: f649404 survey: stub in new experimental 'git-survey' command
51: 0d06194 ! 73: b2ceb53 survey: add command line opts to select references
78: 5b5366f = 74: 878d510 survey: start pretty printing data in table form
81: 78c72e3 = 75: 1861bb6 survey: add object count summary
84: 13b02ae = 76: 2874d2d survey: summarize total sizes by object type
87: 4d00aaa = 77: 7fd2b3b survey: show progress during object walk
88: 90f2d95 = 78: 06744a6 mingw: make sure
errnois set correctly when socket operations fail94: 87157ab = 79: e713e66 survey: add ability to track prioritized lists
95: f32c445 = 80: 52f6994 compat/mingw: handle WSA errors in strerror
101: 79c17f2 = 81: e5b225e survey: add report of "largest" paths
102: 47b8339 = 82: a0ab1e4 compat/mingw: drop outdated comment
89: cc85ec8 = 83: f30292e t5563: verify that NTLM authentication works
108: 90d4113 = 84: e5a208b survey: add --top= option and config
109: 4e12aac = 85: 6327f16 t0301: actually test credential-cache on Windows
96: 103bcfd = 86: cda0371 http: disallow NTLM authentication by default
-: ---------- > 87: 343e506 Fallback to AppData if XDG_CONFIG_HOME is unset
122: 0f43e6a = 88: fe53eb7 survey: clearly note the experimental nature in the output
123: 720e29b = 89: f405f79 credential-cache: handle ECONNREFUSED gracefully
124: 7f5965a = 90: f68454c reftable: do make sure to use custom allocators
125: cd6d4c6 = 91: 2e2455e check-whitespace: avoid alerts about upstream commits
126: c8829f2 = 92: 345d0fe t/t5571-prep-push-hook.sh: Add test with writing to stderr
80: 109c534 = 93: 7281d55 diff: stop truncating the deflated-binary-diff size on Windows
77: 75930b4 = 94: 9f45ed2 mingw: Support
git_terminal_promptwith more terminals83: 7cfa8b1 = 95: 052a2f8 convert: widen gather_convert_stats() helpers to size_t
79: ab0120f = 96: bb48004 compat/terminal.c: only use the Windows console if bash 'read -r' fails
86: dd35116 = 97: 7112005 read-cache: stop truncating index blob sizes on Windows
82: 0c74691 = 98: 8e89fc2 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
92: 18040ce = 99: 6c3884e xdiff-interface: widen buffer_is_binary() size parameter to size_t
85: dc28ad6 = 100: c1e2a67 Win32: symlink: move phantom symlink creation to a separate function
93: b58a5ad = 101: 2787ec0 tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
99: eb6197c = 102: f1b483f combine-diff: stop truncating combined-diff blob sizes on Windows
90: 14c5efb = 103: 62d0d03 mingw: introduce code to detect whether we're inside a Windows container
91: f51ef80 = 104: 11d8ee0 Introduce helper to create symlinks that knows about index_state
100: 3537224 = 105: 204cfe9 tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
106: 74140f6 = 106: 3be5247 diff: widen textconv_object() size out-param to size_t
113: 25c9362 = 107: 557e781 pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
136: 7b812e9 = 108: 055ac2a Merge branch 'size-t/pack-objects-delta'
97: 6eb4c99 = 109: 54579ee mingw: when running in a Windows container, try to rename() harder
98: d2720c2 = 110: 081a775 mingw: allow to specify the symlink type in .gitattributes
107: 87c4552 = 111: 68c7220 pack-objects: drop the two tree-walk casts in the preferred-base path
114: c780c5b = 112: 87ae261 diffcore: widen struct diff_filespec.size to size_t
137: 31588d6 = 113: 072a04d Merge branch 'size-t/pack-bitmap'
103: ebdb1c3 = 114: 39eec55 http: warn if might have failed because of NTLM
104: eaf8e13 = 115: f690409 mingw: move the file_attr_to_st_mode() function definition
105: cb35b5f = 116: d9645ea Win32: symlink: add test for
symlinkattribute115: dd1184a = 117: c35e427 tree: widen struct tree.size and parse_tree_buffer() to size_t
138: 5d3f9be = 118: 69ecc37 Merge branch 'size-t/diff'
110: 0ee28e9 = 119: 96cf2de credential: advertise NTLM suppression and allow helpers to re-enable
111: ec4c3f0 = 120: d5e1a8a mingw: Windows Docker volumes are not symbolic links
112: d2f69da = 121: 7f86e48 clean: do not traverse mount points
116: 1f80e5e = 122: 147ef16 commit: widen the commit-buffer API to size_t
139: c103c0b = 123: c32adbf Merge branch 'size-t/tree'
117: 7727a4a = 124: f8e9351 blame: widen find_line_starts() len parameter to size_t
118: b4a4662 = 125: 0c6f786 grep: widen struct grep_source.size and grep_buffer() to size_t
119: 683e0d4 = 126: 1edf4f0 fast-export: drop the export_blob() size cast and widen anonymize_blob()
120: f5cf20e = 127: 21a3e24 repo: drop the inflated-size cast in count_objects()
121: 87d704d = 128: 91c45d8 unpack-objects: widen the size-passing infrastructure to size_t
127: 339876a = 129: ddc8214 dir: do not traverse mount points
128: aecced7 = 130: 705c371 win32: thread-utils: handle multi-socket systems
129: 041b9b1 = 131: 9edd62a t5563: add tests for http.emptyAuth with Negotiate
130: 05a395b = 132: 239bb5e entry: flush fscache after creating directories and writing files
131: 7dc8174 = 133: aeec0a6 ci(macos): skip the
git p4tests132: db00a87 = 134: 54caa37 mingw: work around rename() failing on a read-only file
133: a4ecb61 = 135: 897911d clean: remove mount points when possible
134: 4c25d04 = 136: ce486c4 mingw: optionally enable wsl compability file mode bits
135: f075860 ! 137: faa4d73 Refuse to follow invalid paths in
.gitfiles143: 2aaee86 = 138: 97f18ff Merge branch 'bump-ci-actions/checkout-from-6-to-7'
145: eb8e29b = 139: dd5d968 Merge 'remote-hg-prerequisites' into HEAD
147: 5b5021c = 140: 8f07689 Merge branch 'drive-prefix'
149: 846676d = 141: 73e4651 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
140: bfd17b9 = 142: c3d5be3 Merge branch 'size-t/commit'
151: 088cf70 = 143: 5dab260 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
142: a6ccca5 = 144: ef65a21 Merge branch 'size-t/blame'
153: d7de177 = 145: 9a3bee0 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
144: 08352a7 = 146: 154e425 Merge branch 'size-t/grep'
155: 0b11647 = 147: 5afb405 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction146: 37e66c8 = 148: 22469fa Merge branch 'size-t/fast-export'
157: 3b22c05 = 149: f47d3a1 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
148: 5c75d95 = 150: a4f221a Merge branch 'size-t/repo'
159: b8f4671 = 151: a21cca2 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
150: 98c10fc = 152: 7336f0e Merge branch 'size-t/unpack-objects'
161: 5f4a298 = 153: 66b7d1f Merge 'add-p-many-files'
152: dc4adc6 = 154: ec565d6 Merge branch 'topic/size-t' into size-t-followups
163: ddebb84 = 155: eaf1453 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
154: e756a7f = 156: 929ee81 pack-objects: drop cast_size_t_to_ulong shims in get_delta()
165: 5a51fa0 = 157: 7fe1dfd Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
156: 3be33d4 = 158: 0bbe5b0 pack-objects: drop cast_size_t_to_ulong shims in try_delta()
168: 941155a = 159: 79a0e11 Merge 'git-gui/js/intent-to-add'
158: f5066af = 160: 27accf1 pack-objects: drop the last size shim in write_no_reuse_object()
171: 0d126e4 = 161: 104bd09 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
160: bb9ba82 = 162: 47541dd blame: widen struct blame_scoreboard.final_buf_size to size_t
172: c143478 = 163: 87e00c7 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
162: 719c4b8 = 164: 2347336 fast-import: drop the six size casts in the object-read paths
173: bdd4e90 = 165: 8ebdd81 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
164: 7faf1e3 = 166: aa3df60 t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
174: 0c2e8f6 = 167: 434ae61 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path166: aaec882 = 168: 83771c9 Drop the
cast_size_t_to_ulong()helper167: 9bdf07d = 169: 6d6721c Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
175: a32dada = 170: 21edaba Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
169: 7726cec = 171: 80246dc Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
170: eddf658 = 172: d74a17a coverity: skip building with Rust, for now
176: d930fab = 173: 11faf06 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
177: 17f41b6 = 174: 98119f8 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests178: c68dde8 = 175: 3216524 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
179: 37cf480 = 176: a9d694d Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t180: 1836f72 = 177: 0a59ff7 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory181: 8b4c67e = 178: 7def028 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
182: 756520e = 179: 3e280ec Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
183: 729de30 = 180: 67b4d23 Merge branch 'optionally-dont-append-atomically-on-windows'
184: e3abe1f = 181: f715f7c Merge branch 'fsync-object-files-always'
185: ff17b94 = 182: 4d7708f Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
186: 30f2c62 = 183: 9771db1 Fix Windows version resources (Fix Windows version resources git#4092)
187: 2035a33 = 184: bd41ac3 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
188: ae9cdcc = 185: 296eb47 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)189: 45fb3f4 = 186: 73def13 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283190: aa3c21d = 187: 5d90958 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
191: 1bf3076 = 188: bc488b0 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
192: 9ec4827 = 189: 9324e67 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
193: a0f160d = 190: 1f80c05 Merge branch 'nano-server'
194: 6abe335 = 191: e4024a6 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
195: 1b7e0ea = 192: 293cf3b win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
196: 1d7c032 = 193: 97f3a35 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
197: fc20ba3 = 194: 42f1fbf Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
198: b7dd61a = 195: cec6aba Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
199: 06a1ebb = 196: 9f590e5 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
200: c497bce = 197: 83ceef8 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
201: 7143583 = 198: cb37ba2 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
202: fa55e82 = 199: 9f17f42 Merge branch 'reftable-vs-custom-allocators'
203: 4ac2574 = 200: 3447efb Merge branch 'check-whitespace-only-downstream'
204: 34944c4 = 201: 706bd7c t/t5571-prep-push-hook.sh: Add test with writing to stderr (t/t5571-prep-push-hook.sh: Add test with writing to stderr git#6063)
205: 0c5c218 = 202: 5ef2c86 Merge branch 'disallow-ntlm-auth-by-default'
206: 635a6dd = 203: 0820b19 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)207: c589bb9 = 204: ca19fc0 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
208: dd33bfd = 205: 7614066 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
209: b25b720 = 206: e8a3183 entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
210: 2bdf3ce = 207: 99aa8bd ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)211: 98dc559 = 208: 7591043 Merge branch 'msys2'
212: 61287ea = 209: 8d7a43c Merge 'docker-volumes-are-no-symlinks'
213: f1b2570 = 210: b33ebbc mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
214: c80ceae = 211: 907f963 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
215: eb895d7 = 212: 625f8f7 Merge branch 'dont-clean-junctions'
216: 2695382 = 213: aede4ed Merge branch 'wsl-file-mode-bits'
217: 5ecbcab = 214: 8e8b55b Merge branch 'validate-dotgit'
218: 10c1cd8 = 215: e0b88ec Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
219: 9524c3c = 216: 133a78d Merge branch 'skip-rust-in-the-coverity-builds'
220: 5853024 = 217: c34c1b7 Merge branch 'ready-for-upstream'
221: 53cc68c = 218: 6621097 Win32: make FILETIME conversion functions public
222: a209f50 = 219: d8ffaee Win32: dirent.c: Move opendir down
223: 92242b8 = 220: c4251a7 mingw: make the dirent implementation pluggable
224: 852d188 = 221: 8a0be9c Win32: make the lstat implementation pluggable
225: d458404 = 222: 2c04aa1 mingw: add infrastructure for read-only file system level caches
226: 423b44a ! 223: 3371dca mingw: add a cache below mingw's lstat and dirent implementations
227: 1ac4d4e = 224: 250ccf4 fscache: load directories only once
228: f42f373 = 225: 58b59b0 fscache: add key for GIT_TRACE_FSCACHE
229: 5e6d857 = 226: e21bab2 fscache: remember not-found directories
230: 98ee2e2 = 227: 7bac5b2 fscache: add a test for the dir-not-found optimization
231: fcf36d9 = 228: 84eb9bf add: use preload-index and fscache for performance
232: 92b3bcc ! 229: efe96b0 dir.c: make add_excludes aware of fscache during status
233: 1ee374b = 230: 5ea2238 fscache: make fscache_enabled() public
234: 1197080 = 231: 18e0d9e dir.c: regression fix for add_excludes with fscache
235: 4a766e8 = 232: e4e658b fetch-pack.c: enable fscache for stats under .git/objects
236: 733b6c8 = 233: 80fac36 checkout.c: enable fscache for checkout again
237: 990e3d2 = 234: 31f1148 Enable the filesystem cache (fscache) in refresh_index().
238: c1376fe = 235: baedd6d fscache: use FindFirstFileExW to avoid retrieving the short name
239: 831b218 = 236: 7e38e85 fscache: add GIT_TEST_FSCACHE support
240: d59dd5f = 237: 5aa143c fscache: add fscache hit statistics
241: 832d006 = 238: d822079 unpack-trees: enable fscache for sparse-checkout
242: d987a02 = 239: 7b61b7f status: disable and free fscache at the end of the status command
243: 110092a = 240: 106a186 mem_pool: add GIT_TRACE_MEMPOOL support
245: 831ea02 ! 241: 3b41f82 fscache: fscache takes an initial size
247: 52cea60 = 242: d304246 fscache: update fscache to be thread specific instead of global
248: 092722d = 243: 8daffe1 fscache: teach fscache to use mempool
249: 1fadcb7 = 244: c87337f fscache: make fscache_enable() thread safe
250: 261923f = 245: 9c0e868 fscache: teach fscache to use NtQueryDirectoryFile
244: 1de55ec = 246: 2ee1ee9 git-gui--askyesno: fix funny text wrapping
251: d61a986 = 247: d39885b fscache: remember the reparse tag for each entry
246: 045f7d9 = 248: ef4fc35 git-gui--askyesno (mingw): use Git for Windows' icon, if available
252: 6a12b7f = 249: 59e6a79 fscache: Windows Docker volumes are not symbolic links
253: c1175cb = 250: 39ed129 fscache: optionally enable wsl compability file mode bits
255: 5d4a8f3 = 251: 7b201d7 fscache: implement an FSCache-aware is_mount_point()
257: 8f1fcea = 252: 358adc9 clean: make use of FSCache
254: 3ebfe8b = 253: d417537 Merge branch 'fscache'
-: ---------- > 254: 760cc09 compat/poll: do not collect more handles than the wait supports
256: 5ef9672 = 255: 2ad8067 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
-: ---------- > 256: 6786dbc parallel-checkout: limit worker count to what poll() can wait on
258: c661225 = 257: 1616427 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
-: ---------- > 258: 2c4eb58 run-command: limit concurrent children to what poll() can wait on
259: 97ddc4b = 259: 955571f Merge branch 'dont-clean-junctions-fscache'
-: ---------- > 260: bbbb006 parallel-checkout: fix stack buffer overflow in Windows poll() with many workers (parallel-checkout: fix stack buffer overflow in Windows poll() with many workers git#6395)
260: acfe085 = 261: 031c198 pack-objects (mingw): demonstrate a segmentation fault with large deltas
261: 5882b1e ! 262: 6645e43 mingw: support long paths
262: c8a8d5f ! 263: 3651f4b win32(long path support): leave drive-less absolute paths intact
263: d6d591f = 264: e70624a compat/fsmonitor/fsm-*-win32: support long paths
264: 60357df ! 265: d265ccc clean: suggest using
core.longPathsif paths are too long to remove265: 812e173 = 266: f1490a7 mingw: explicitly specify with which cmd to prefix the cmdline
266: 06483b2 = 267: 10141e4 mingw: when path_lookup() failed, try BusyBox
267: 52a2a66 = 268: 1a26753 test-tool: learn to act as a drop-in replacement for
iconv268: a579fe5 = 269: e80cbec tests(mingw): if
iconvis unavailable, usetest-helper --iconv269: eb9a4ee = 270: e1ee42c gitattributes: mark .png files as binary
270: 8c49c99 = 271: f0d5987 tests: move test PNGs into t/lib-diff/
271: 96bce85 = 272: 9d12d30 tests: only override sort & find if there are usable ones in /usr/bin/
272: 5f69ed6 = 273: 45770a6 tests: use the correct path separator with BusyBox
273: 0473b80 = 274: 069d459 mingw: only use Bash-ism
builtin pwd -Wwhen available274: 6c77de4 = 275: c3b1635 tests (mingw): remove Bash-specific pwd option
275: c12cb1e = 276: b360ce9 test-lib: add BUSYBOX prerequisite
276: 53a4474 = 277: ba7785e t5003: use binary file from t/lib-diff/
277: 82bf3be = 278: 03f2a7c t5532: workaround for BusyBox on Windows
278: af7de8a = 279: c937ea3 t5605: special-case hardlink test for BusyBox-w32
279: ad00891 = 280: 5ee30f8 t5813: allow for $PWD to be a Windows path
280: 7c17d9c = 281: fc1eaf6 t9200: skip tests when $PWD contains a colon
292: 12acbc7 ! 282: 03df90e Add a GitHub workflow to monitor component updates
290: b61eaac = 283: f278aa1 Partially un-revert "editor: save and reset terminal after calling EDITOR"
294: 5f898d0 = 284: a623ae3 reset: reinstate support for the deprecated --stdin option
296: be36f7e ! 285: 50330be fsmonitor: reintroduce core.useBuiltinFSMonitor
297: dd69e4b = 286: f15ab38 dependabot: help keeping GitHub Actions versions up to date
281: e270744 = 287: 209b934 Describe Git for Windows' architecture
282: ccf2084 = 288: 23be00a Add an AGENTS.md file to help with AI-assisted debugging/development
283: c0b4707 = 289: b4d6c39 Modify the Code of Conduct for Git for Windows
286: 1122496 = 290: 73a36c6 Merge branch 'gitk-and-git-gui-patches'
284: e36e97f = 291: f3ab25c CONTRIBUTING.md: add guide for first-time contributors
288: 4e0b8e7 = 292: 3c60d0e Merge branch 'long-paths'
285: c74da5c = 293: 14593c7 README.md: Add a Windows-specific preamble
291: 82707a2 = 294: 7690d80 Merge branch 'busybox-w32'
287: a1cb627 = 295: 4ee10a8 Add an issue template
295: aa3035b = 296: 44e5238 Merge branch 'un-revert-editor-save-and-reset'
289: dde6170 = 297: 39d7cf7 Modify the GitHub Pull Request template (to reflect Git for Windows)
299: 5704a59 = 298: 8ec31e4 Merge branch 'phase-out-reset-stdin'
293: 6f61297 = 299: 6c12079 SECURITY.md: document Git for Windows' policies
300: 9a93789 = 300: 67a49ed Merge branch 'deprecate-core.useBuiltinFSMonitor'
298: f8dda43 = 301: 1059a64 ci: only run the expensive tests in the Windows tests for now
301: 0c6f28d = 302: 8ba4ea7 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
302: 422d206 = 303: 81ca3c4 Merge 'readme' into HEAD
303: 772d3fd = 304: cf7bf0f build(deps): bump actions/cache from 5 to 6
304: 4498a04 = 305: f09f3d4 build(deps): bump actions/cache from 5 to 6 (build(deps): bump actions/cache from 5 to 6 git#6303)
305: bc0f045 = 306: 5f9fb42 repo: split annotated tags out from total tag count in structure
306: f3ef0bd ! 307: 257bc8c repo: filter the structure scope via --ref-filter=
307: cda8af7 = 308: 6a1b348 repo: report top-N paths by count, disk, and inflated size in structure
308: 459f66f ! 309: a277a1e t1901: cover the --top option of
git repo structure309: 089bc34 ! 310: 38b1df9 repo: read the
--topdefault fromrepo.structure.top@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> ## Documentation/config.adoc ## -@@ Documentation/config.adoc: include::config/remotes.adoc[] +@@ Documentation/config.adoc: include::config/repack.adoc[] - include::config/repack.adoc[] + include::config/replay.adoc[] +include::config/repo.adoc[] + - include::config/replay.adoc[] - include::config/rerere.adoc[] + + include::config/revert.adoc[] ## Documentation/config/repo.adoc (new) ## @@ @@ t/t1901-repo-structure.sh: test_expect_success '--top rejects negative values' ' + + git -c repo.structure.top=2 \ + repo structure --format=lines >with-config && -+ grep "^objects.blobs.top.by_count.1.path=" with-config && ++ test_grep "^objects.blobs.top.by_count.1.path=" with-config && + + git -c repo.structure.top=2 \ + repo structure --format=lines --top=0 >cli-override && -+ ! grep "\.top\." cli-override ++ test_grep ! "\.top\." cli-override + ) +' +310: 829bc9d = 311: d0b2d8e git-survey: announce the upcoming pivot into
git repo structure311: dd79281 ! 312: b424042 survey: turn into a thin shim over
git repo structure312: 2f79edd = 313: 9093f18 Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)-: ---------- > 314: 2483a1c mingw: handle staging 4GB+ files correctly
9: 4088718 = 315: 0ac7ea8 bundle-uri: refuse advertised URIs by protocol
46: 9c11855 < -: ---------- hash-object: add another >4GB/LLP64 test case
62: a838da3 < -: ---------- hash-object: add a >4GB/LLP64 test case using filtered input
76: e5cd018 < -: ---------- Fallback to AppData if XDG_CONFIG_HOME is unset
-: ---------- > 316: 905e39b mingw: support unpacking loose 4GB+ objects
-: ---------- > 317: db75a97 git-for-windows: prepare for 2.55.0(5)
141: 01cfbc9 = 318: 90518bf Merge tag 'v2.55.0.windows.4'
313: b737764 < -: ---------- fixup??? repo: filter the structure scope via --ref-filter=
314: f8f25f7 < -: ---------- fixup??? t1901: cover the --top option of
git repo structure315: 551abaf < -: ---------- fixup??? repo: read the
--topdefault fromrepo.structure.top316: dbd21af < -: ---------- fixup??? mingw: support long paths
317: 3642c11 < -: ---------- fixup??? win32(long path support): leave drive-less absolute paths intact
318: 0877835 < -: ---------- fixup??? survey: stub in new experimental 'git-survey' command
319: 43b8627 < -: ---------- fixup??? survey: turn into a thin shim over
git repo structure320: 2e7dcb2 < -: ---------- fixup??? survey: stub in new experimental 'git-survey' command
321: a025a5c < -: ---------- Merge tag 'v2.55.0.windows.5'
322: b8d68fe < -: ---------- Support loose 4GB+ objects (Support loose 4GB+ objects git#6353)
323: 72ec11d < -: ---------- ci: bump debian-11 job to debian-12 (ci: bump debian-11 job to debian-12 git#6401)
-: ---------- > 319: 8fc5bd3 t: add an expensive test to verify that 4GB+ blobs can be staged/read
-: ---------- > 320: a65c1fd Merge tag 'v2.55.0.windows.5'
-: ---------- > 321: f913d29 Support loose 4GB+ objects (Support loose 4GB+ objects git#6353)
-: ---------- > 322: 9222386 fixup! Add config option
windows.appendAtomicallyTruncated; see the full conflict report in the workflow run summary.