Repository navigation
Rebase shears/next: 10 conflict(s) (10 skipped, 0 resolved) (#34822048245) - #453
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
This will come in handy in the next commit. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Bert Belder <bertbelder@gmail.com>
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>
Since we are already walking our reachable objects using the path-walk API,
let's now collect lists of the paths that contribute most to different
metrics. Specifically, we care about
* Number of versions.
* Total size on disk.
* Total inflated size (no delta or zlib compression).
This information can be critical to discovering which parts of the
repository are causing the most growth, especially on-disk size. Different
packing strategies might help compress data more efficiently, but the toal
inflated size is a representation of the raw size of all snapshots of those
paths. Even when stored efficiently on disk, that size represents how much
information must be processed to complete a command such as 'git blame'.
The exact disk size seems to be not quite robust enough for testing, as
could be seen by the `linux-musl-meson` job consistently failing, possibly
because of zlib-ng deflates differently: t8100.4(git survey
(default)) was failing with a symptom like this:
TOTAL OBJECT SIZES BY TYPE
===============================================
Object Type | Count | Disk Size | Inflated Size
------------+-------+-----------+--------------
- Commits | 10 | 1523 | 2153
+ Commits | 10 | 1528 | 2153
Trees | 10 | 495 | 1706
Blobs | 10 | 191 | 101
- Tags | 4 | 510 | 528
+ Tags | 4 | 547 | 528
This means: the disk size is unlikely something we can verify robustly.
Since zlib-ng seems to increase the disk size of the tags from 528 to
547, we cannot even assume that the disk size is always smaller than the
inflated size. We will most likely want to either skip verifying the
disk size altogether, or go for some kind of fuzzy matching, say, by
replacing `s/ 1[45][0-9][0-9] / ~1.5k /` and `s/ [45][0-9][0-9] / ~½k /`
or something like that.
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This comment has been true for the longest time; The combination of the two preceding commits made it incorrect, so let's drop that comment. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NTLM authentication is relatively weak. This is the case even with the
default setting of modern Windows versions, where NTLMv1 and LanManager
are disabled and only NTLMv2 is enabled: NTLMv2 hashes of even
reasonably complex 8-character passwords can be broken in a matter of
days, given enough compute resources.
Even worse: On Windows, NTLM authentication uses Security Support
Provider Interface ("SSPI"), which provides the credentials without
requiring the user to type them in.
Which means that an attacker could talk an unsuspecting user into
cloning from a server that is under the attacker's control and extracts
the user's NTLMv2 hash without their knowledge.
For that reason, let's disallow NTLM authentication by default.
NTLM authentication is quite simple to set up, though, and therefore
there are still some on-prem Azure DevOps setups out there whose users
and/or automation rely on this type of authentication. To give them an
escape hatch, introduce the `http.<url>.allowNTLMAuth` config setting
that can be set to `true` to opt back into using NTLM for a specific
remote repository.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `git_terminal_prompt()` function expects the terminal window to be attached to a Win32 Console. However, this is not the case with terminal windows other than `cmd.exe`'s, e.g. with MSys2's own `mintty`. Non-cmd terminals such as `mintty` still have to have a Win32 Console to be proper console programs, but have to hide the Win32 Console to be able to provide more flexibility (such as being resizeable not only vertically but also horizontally). By writing to that Win32 Console, `git_terminal_prompt()` manages only to send the prompt to nowhere and to wait for input from a Console to which the user has no access. This commit introduces a function specifically to support `mintty` -- or other terminals that are compatible with MSys2's `/dev/tty` emulation. We use the `TERM` environment variable as an indicator for that: if the value starts with "xterm" (such as `mintty`'s "xterm_256color"), we prefer to let `xterm_prompt()` handle the user interaction. The most prominent user of `git_terminal_prompt()` is certainly `git-remote-https.exe`. It is an interesting use case because both `stdin` and `stdout` are redirected when Git calls said executable, yet it still wants to access the terminal. When running inside a `mintty`, the terminal is not accessible to the `git-remote-https.exe` program, though, because it is a MinGW program and the `mintty` terminal is not backed by a Win32 console. To solve that problem, we simply call out to the shell -- which is an *MSys2* program and can therefore access `/dev/tty`. Helped-by: nalla <nalla@hamal.uberspace.de> Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is a known issue that a rename() can fail with an "Access denied" error at times, when copying followed by deleting the original file works. Let's just fall back to that behavior. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, symbolic links actually have a type depending on the target: it can be a file or a directory. In certain circumstances, this poses problems, e.g. when a symbolic link is supposed to point into a submodule that is not checked out, so there is no way for Git to auto-detect the type. To help with that, we will add support over the course of the next commits to specify that symlink type via the Git attributes. This requires an index_state, though, something that Git for Windows' `symlink()` replacement cannot know about because the function signature is defined by the POSIX standard and not ours to change. So let's introduce a helper function to create symbolic links that *does* know about the index_state. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
With init_tree_desc() widened in the prior commit, the size_t-returning odb_read_object_peeled() call in add_preferred_base() and odb_read_object() call in pbase_tree_get() can both flow straight through to init_tree_desc() and into the pbase_tree_cache. Widen pbase_tree_cache.tree_size and the two local size variables to size_t, drop the size_st bridges, and drop the two cast_size_t_to_ulong() shims. This was the last pair of cast_size_t_to_ulong() call sites in builtin/pack-objects.c, completing the >4 GiB-objects work in that file that this branch and its predecessors have been pursuing. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The 'git survey' builtin provides several detail tables, such as "top files by on-disk size". The size of these tables defaults to 10, currently. Allow the user to specify this number via a new --top=<N> option or the new survey.top config key. Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Commit 2406bf5 (Win32: detect unix socket support at runtime, 2024-04-03) introduced a runtime detection for whether the operating system supports unix sockets for Windows, but a mistake snuck into the tests. When building and testing Git without NO_UNIX_SOCKETS we currently skip t0301-credential-cache on Windows if unix sockets are supported and run the tests if they aren't. Flip that logic to actually work the way it was intended. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The new default of Git is to disable NTLM authentication by default. To help users find the escape hatch of that config setting, should they need it, suggest it when the authentication failed and the server had offered NTLM, i.e. if re-enabling it would fix the problem. Helped-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Accessing the Windows console through the special CONIN$ / CONOUT$ devices doesn't work properly for non-ASCII usernames an passwords. It also doesn't work for terminal emulators that hide the native console window (such as mintty), and 'TERM=xterm*' is not necessarily a reliable indicator for such terminals. The new shell_prompt() function, on the other hand, works fine for both MSys1 and MSys2, in native console windows as well as mintty, and properly supports Unicode. It just needs bash on the path (for 'read -s', which is bash-specific). On Windows, try to use the shell to read from the terminal. If that fails with ENOENT (i.e. bash was not found), use CONIN/OUT as fallback. Note: To test this, create a UTF-8 credential file with non-ASCII chars, e.g. in git-bash: 'echo url=http://täst.com > cred.txt'. Then in git-cmd, 'git credential fill <cred.txt' works (shell version), while calling git without the git-wrapper (i.e. 'mingw64\bin\git credential fill <cred.txt') mangles non-ASCII chars in both console output and input. Signed-off-by: Karsten Blees <blees@dcon.de>
In preparation for making this function a bit more complicated (to allow for special-casing the `ContainerMappedDirectories` in Windows containers, which look like a symbolic link, but are not), let's move it out of the header. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Mirror what git survey already reports: lightweight tags (pointing straight at a commit/tree/blob) and annotated tags (pointing at an OBJ_TAG that is itself stored as a separate object) are different things in many monorepo contexts, and one of the differences git survey users routinely care about. Add an annotated_tags counter to struct ref_stats, populate it in count_references() by peeking at the ref OID's object type, and expose it as a sub-row under Tags in the table output and as references.tags.annotated.count in the machine-readable formats. Step toward pivoting the standalone git survey command onto git repo structure; this fills the first of the four feature gaps documented in the assessment. Tests in t1901 widened to assert the new row and key. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git repo structure` walks every reference enumerated by `refs_for_each_ref()` and feeds each reference's tip into the path walk that produces the object counts. There is no way to scope the inquiry to a subset of refs, even though that is the most common need when an operator is investigating what part of the history is driving cost: only branches, only release tags, only one remote's view, etc. Add a single `--ref-filter=<pattern>` option that, when given, restricts both the reference count and the object walk to refs whose full name matches one of the patterns. The option is repeatable; multiple patterns form a union, so `--ref-filter='refs/heads/*' --ref-filter='refs/tags/v*'` includes local branches and tags whose short name starts with `v`. Patterns use `wildmatch()` with `WM_PATHNAME` semantics so a `*` does not cross `/`, matching the convention used by `git for-each-ref` positional arguments. Choosing a single flexible filter, rather than a proliferation of per-kind flags like `--branches`, `--tags`, `--remotes`, keeps the option surface small and lets the same mechanism express narrow selections the per-kind flags could not, such as "only release tags" (`'refs/tags/v*'`) or "only one remote's branches" (`'refs/remotes/origin/*'`). Without `--ref-filter`, behaviour is unchanged: every ref `refs_for_each_ref()` enumerates contributes. Both the reference counter and the path-walk seeding (via `add_pending_oid()`) sit on the same callback, so an early return when no pattern matches naturally excludes a ref from both. No separate object-walk machinery is needed. Cover the two interesting code paths with tests in t1901: a single filter narrowing to branches, and two filters unioning to include both branches and tags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` distinguishes itself from `git repo structure` largely by its path-level reporting: in addition to whole-repo totals it lists the paths whose object histories dominate the repository, ranked by raw count, on-disk size, and inflated size, separately for trees and blobs. That is often the most actionable output from `git survey`, since it points an operator at the directories and files that should be reviewed for cleanup, sparse-checkout exclusion, or rewriting. `git repo structure` already drives the same path-walk traversal that `git survey` uses to gather its per-path numbers; the callback simply discards the path. Aggregate per-(path, type) summaries inside that existing callback and add a bounded, descending-sorted "top-N" table keyed by each of the three axes. Gate the feature behind a new `--top=<n>` option, defaulting to 0, so unadorned invocations are unaffected and pay no extra work for the top-N tracking. Mirror the sort and eviction strategy from `builtin/survey.c`: keep an array of at most N entries sorted from largest to smallest, walk it from the bottom on each candidate, and shift entries down when a new one belongs. Compared to `builtin/survey.c`, drop the void-pointer indirection in the table data, type the comparator's arguments, and fold the trivial comparators into the `(a > b) - (a < b)` idiom. For the human-readable `table` output, extend the existing nested bullet layout with two new top-level sections, `* Top trees` and `* Top blobs`, each containing three sub-tables (`Top by count`, `Top by disk size`, `Top by inflated size`). The path becomes the row name and the relevant scalar becomes the value, reusing `stats_table_count_addf` and `stats_table_size_addf` so units and column alignment match the rest of the table. For the `lines`/`nul` key-value formats, emit one `objects.<type>.top.by_<axis>.<rank>.path=<path>` entry alongside an `objects.<type>.top.by_<axis>.<rank>.<axis>=<value>` entry per ranked path, so consumers can dispatch by axis without parsing the schema. The root tree's path is the empty string as produced by the path-walk machinery; preserve that as-is to stay faithful to the upstream representation rather than fabricating a placeholder. This is the first piece of folding `git survey`'s functionality into `git repo structure`. Subsequent commits will add the corresponding configuration knob and, eventually, turn `git survey` into a thin deprecated shim over `git repo structure`. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The preceding commit added `--top=<n>` to `git repo structure`,
reporting the top-N paths per type ranked by count, on-disk size, and
inflated size. Cover the three behaviors that matter for that option:
* Without `--top`, the key-value output emits no `top.*` keys, so
existing parsers stay unaffected.
* `--top=N` produces exactly N ranked entries on each of the six
`objects.<type>.top.by_<axis>` axes (count/disk_size/inflated_size
crossed with trees/blobs), and a constructed input where one blob
is several orders of magnitude bigger than the other lets us
assert the ordering on the disk-size and inflated-size axes.
* A negative `--top` is rejected with a non-zero exit and a message
naming the constraint, so a typo cannot silently degrade into the
default zero.
Avoid grep patterns starting with `--`; grep would parse the leading
double dash as an option terminator.
Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` exposes its `--top` default via `survey.top` so that a site or per-repository operator can switch the detail tables on once and have every subsequent invocation include them. Mirror that ergonomics for `git repo structure` so that, as `git survey`'s functionality is folded into `git repo structure`, the configuration side of the migration story stays equivalent. Add a small `git_config_int` callback bound to `repo.structure.top` and invoke it before `parse_options()`, so a `--top=<N>` on the command line cleanly overrides the configured default (including `--top=0` to opt out of the detail tables when configuration enables them). Reject negative configured values with the same wording as the command-line guard, since `git_config_int()` happily returns negative integers. Document the new variable in a fresh `Documentation/config/repo.adoc` and wire it into the alphabetical includes in `Documentation/config.adoc` between `repack.adoc` and `rerere.adoc`. Cover the precedence behaviour with a t1901 test: a configured value enables the tables by default, and a command-line `--top=0` suppresses them again. Note that the reported paths respect the `core.quotePath` setting. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…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: next
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)To: add6a4a27e (fixup! Add config option
windows.appendAtomically, 2026-09-11) (65aa0323c6..add6a4a27e)Statistics
Range-diff (click to expand)
1: d426db2 = 1: 4faf3cd unix-socket: avoid leak when initialization fails
2: 2ab55ba = 2: 74a5327 grep: prevent
^$false match at end of file3: f653c66 = 3: 6131d76 Merge branch 'fixes-from-the-git-mailing-list'
4: d6f3c21 = 4: d04d92c t9350: point out that refs are not updated correctly
5: 74e1840 = 5: bf1f955 transport-helper: add trailing --
8: 39dfdfc = 6: 0227bda remote-helper: check helper status after import/export
14: 7b98105 = 7: d47c429 ci: bump actions/checkout from 6 to 7
15: cfeda2d = 8: 4829801 Always auto-gc after calling a fast-import transport
16: 5ec0f28 = 9: 429afd2 mingw: prevent regressions with "drive-less" absolute paths
6: f51e098 = 10: e5eea1b mingw: demonstrate a
git addissue with NTFS junctions7: b4feae7 = 11: 6c17e2b t5505/t5516: allow running without
.git/branches/in the templates9: db5d886 = 12: 8448a8e strbuf_realpath(): use platform-dependent API if available
10: fd193f3 < -: ---------- mingw: include the Python parts in the build
34: 5705158 = 13: 5bde827 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
12: e2b30b3 = 14: 170c026 http: use new "best effort" strategy for Secure Channel revoke checking
11: c7eb8cf = 15: 48319a0 t5505/t5516: fix white-space around redirectors
17: 783e1a8 = 16: a2290d8 transport: optionally disable side-band-64k
18: 341cfb2 = 17: 2c48d9d mingw: fix fatal error working on mapped network drives on Windows
19: 5022ad5 = 18: 504681b clink.pl: fix MSVC compile script to handle libcurl-d.lib
20: 2e66b1d = 19: 23a30d5 mingw: implement a platform-specific
strbuf_realpath()21: 5a9576c = 20: a361363 t3701: verify that we can add lots of files interactively
22: afa7654 = 21: f766a32 commit: accept "scissors" with CR/LF line endings
23: 16fcfce = 22: f170e35 t0014: fix indentation
24: 2c59212 = 23: d18bc30 git-gui: accommodate for intent-to-add files
36: 8d82869 = 24: 46ae1e6 vcpkg_install: detect lack of Git
38: b1c195a = 25: c8b683c vcpkg_install: add comment regarding slow network connections
41: 00c2a70 = 26: fab1466 vcbuild: install ARM64 dependencies when building ARM64 binaries
44: 1ae8f53 = 27: 34abf37 vcbuild: add an option to install individual 'features'
47: 225616e = 28: 8f38f92 cmake: allow building for Windows/ARM64
50: 93a0224 = 29: a7d26b5 ci(vs-build) also build Windows/ARM64 artifacts
53: 57ad3b0 = 30: 4a85b2c vcbuild: stop hard-coding OpenSSL as a dependency
56: 15d85a2 = 31: 4a83982 cmake(): allow setting HOST_CPU for cross-compilation
61: d059648 = 32: edd3b65 CMake: default Visual Studio generator has changed
66: 0228e6a = 33: 4d7bc98 .gitignore: add Visual Studio CMakeSetting.json file
71: 41e2e5b = 34: 77f7e3e subtree: update
contrib/subtreetesttarget72: 2cb2abf = 35: 1c33151 CMakeLists: add default "x64-windows" arch for Visual Studio
73: 85b0626 = 36: 9011e11 setup: properly use "%(prefix)/" when in WSL
74: f6c6580 = 37: 6aaa6b3 Add config option
windows.appendAtomically58: c48538b = 38: de7fe0b MinGW: link as terminal server aware
79: a87f056 = 39: 0eb4868 mingw: allow for longer paths in
parse_interpreter()80: a353e34 = 40: f02db68 compat/vcbuild: document preferred way to build in Visual Studio
81: 359ff61 = 41: 07dfdee http: optionally send SSL client certificate
82: b738dc3 = 42: 97fe331 ci: run
contrib/subtreetests in CI builds83: da7f275 = 43: 52c3806 CMake: show Win32 and Generator_platform build-option values
-: ---------- > 44: 3727117 Merge branch 'fixes-from-the-git-mailing-list'
84: 45f402c = 45: f70edf1 compat/mingw.c: do not warn when failing to get owner
85: 817e60f = 46: 624f190 mingw: $env:TERM="xterm-256color" for newer OSes
86: 7593939 = 47: 1588cdb winansi: check result and Buffer before using Name
87: 7ece54b = 48: ca7fc7d mingw: change core.fsyncObjectFiles = 1 by default
88: d8fbf5e = 49: 5231037 Fix Windows version resources
89: be33904 = 50: b34da43 status: fix for old-style submodules with commondir
35: 73b0916 = 51: d65f355 max_tree_depth: lower it for clang builds in general on Windows
42: af1913d = 52: cb71527 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
45: 2900889 = 53: 3b5b260 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
48: 1db971c = 54: 3707150 clink.pl: fix libexpatd.lib link error when using MSVC
51: 68d9b94 = 55: 85ccb23 Makefile: clean up .ilk files when MSVC=1
54: 82dc995 = 56: 2d02446 vcbuild: add support for compiling Windows resource files
57: 7eee88d = 57: e486900 config.mak.uname: add git.rc to MSVC builds
62: 3b0c0ce = 58: 683638b clink.pl: ignore no-stack-protector arg on MSVC=1 builds
63: 96fe326 = 59: 8824686 http: optionally load libcurl lazily
67: 82678de = 60: 082ee34 clink.pl: move default linker options for MSVC=1 builds
68: 3803366 = 61: dfea9f4 http: support lazy-loading libcurl also on Windows
75: 0e5790c = 62: f5c300a cmake: install headless-git.
76: 5552862 = 63: 7bf470d http: when loading libcurl lazily, allow for multiple SSL backends
90: 6bee98f = 64: 500b870 git.rc: include winuser.h
91: 01fc1a8 = 65: 2b722c3 mingw: do load libcurl dynamically by default
92: 4613e6e = 66: 3120918 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
93: df88213 = 67: 65aa218 mingw: suggest
windows.appendAtomicallyin more cases94: fd49a44 = 68: 415dbe1 win32: use native ANSI sequence processing, if possible
95: d5eac98 = 69: 265ce22 common-main.c: fflush stdout buffer upon exit
96: 223f454 = 70: 9037938 t5601/t7406(mingw): do run tests with symlink support
40: 48e30df = 71: 833650c revision: create mark_trees_uninteresting_dense()
43: 165f5c3 ! 72: 5ea3278 survey: stub in new experimental 'git-survey' command
46: d0b5729 ! 73: 43c5699 survey: add command line opts to select references
116: d5234cf = 74: 735f66a mingw: Support
git_terminal_promptwith more terminals49: f4da394 = 75: 1a010d6 survey: start pretty printing data in table form
119: 901c8f5 = 76: 7318031 compat/terminal.c: only use the Windows console if bash 'read -r' fails
103: 6bf432d = 77: 9167c91 diff: stop truncating the deflated-binary-diff size on Windows
52: b5b99bf = 78: 0559d35 survey: add object count summary
122: fa0b7ef = 79: 288a0fe mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
104: edefb72 = 80: f8b7df3 convert: widen gather_convert_stats() helpers to size_t
55: b1846b2 = 81: 6ed55fe survey: summarize total sizes by object type
125: e26e680 = 82: e5e6440 Win32: symlink: move phantom symlink creation to a separate function
105: 4dd9bc4 = 83: 364f4af read-cache: stop truncating index blob sizes on Windows
59: 9e6374d = 84: e17db0c survey: show progress during object walk
60: 2ee32a3 = 85: cb1674b mingw: make sure
errnois set correctly when socket operations fail128: 98a593e = 86: ab0056b t5563: verify that NTLM authentication works
129: 27ed11a = 87: 2e48484 mingw: introduce code to detect whether we're inside a Windows container
130: ccbbdc5 = 88: 9e763f2 Introduce helper to create symlinks that knows about index_state
106: 7967a50 = 89: 64fcb6e xdiff-interface: widen buffer_is_binary() size parameter to size_t
107: 8cae84e = 90: a9e9f30 tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
64: 8cd2e8e = 91: 52c4abd survey: add ability to track prioritized lists
65: 617879c = 92: e545921 compat/mingw: handle WSA errors in strerror
133: dd40c36 = 93: 6f2a250 http: disallow NTLM authentication by default
134: 844b298 = 94: c472120 mingw: when running in a Windows container, try to rename() harder
135: e07258f = 95: 54f6c6e mingw: allow to specify the symlink type in .gitattributes
108: f4a60bc = 96: 0e56b8b combine-diff: stop truncating combined-diff blob sizes on Windows
109: 11d39b0 = 97: 9b8cac5 tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
69: 7c7608c = 98: 8034f0b survey: add report of "largest" paths
70: f8b0e98 = 99: 69ef2da compat/mingw: drop outdated comment
138: 94f9cd1 = 100: ed419a0 http: warn if might have failed because of NTLM
139: b64ae0a = 101: cbc6bba mingw: move the file_attr_to_st_mode() function definition
140: 2ee0fe7 = 102: 9005251 Win32: symlink: add test for
symlinkattribute110: 82a15ba = 103: 4300818 diff: widen textconv_object() size out-param to size_t
113: 3fe778a = 104: 4b114f9 pack-objects: drop the two tree-walk casts in the preferred-base path
77: 7e14822 = 105: b19b22d survey: add --top= option and config
78: f497295 = 106: d396ac2 t0301: actually test credential-cache on Windows
143: 48eb04b = 107: 42cc210 credential: advertise NTLM suppression and allow helpers to re-enable
144: 7f4b828 = 108: de3f615 mingw: Windows Docker volumes are not symbolic links
145: 1f161dc = 109: 793cd72 clean: do not traverse mount points
111: 3cc0550 = 110: c87ae32 pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
114: 178fc75 = 111: bfdd025 diffcore: widen struct diff_filespec.size to size_t
117: edcf93f = 112: e305bdd tree: widen struct tree.size and parse_tree_buffer() to size_t
120: e8560fc = 113: 6b0eb29 commit: widen the commit-buffer API to size_t
97: 1098958 = 114: bba784e Fallback to AppData if XDG_CONFIG_HOME is unset
98: 96786fe = 115: 1432a47 survey: clearly note the experimental nature in the output
99: ffbfbb8 = 116: 615d844 credential-cache: handle ECONNREFUSED gracefully
100: 4c9f944 = 117: 963184f reftable: do make sure to use custom allocators
101: 502d8f4 = 118: 8905868 check-whitespace: avoid alerts about upstream commits
102: 47c8bce = 119: 7905eca t/t5571-prep-push-hook.sh: Add test with writing to stderr
147: c44956e = 120: 8076258 dir: do not traverse mount points
148: ed80dc7 = 121: 6d8ee4a win32: thread-utils: handle multi-socket systems
149: 24bf3ff = 122: ca6255d t5563: add tests for http.emptyAuth with Negotiate
150: 0aa6447 = 123: 82afef6 entry: flush fscache after creating directories and writing files
151: 9f9768c = 124: 4e3bc5c ci(macos): skip the
git p4tests152: b4dc2e0 = 125: 43ab101 mingw: work around rename() failing on a read-only file
153: bf1502c = 126: e2a8e2c clean: remove mount points when possible
154: b69254a = 127: 2c13883 mingw: optionally enable wsl compability file mode bits
155: 7004572 ! 128: a4bd1b6 Refuse to follow invalid paths in
.gitfiles112: 0b2a1ed = 129: 3342580 Merge branch 'size-t/pack-objects-delta'
115: 016c4d2 = 130: da71951 Merge branch 'size-t/pack-bitmap'
118: d335293 = 131: aaaed9a Merge branch 'size-t/diff'
157: df3af57 = 132: f81b1f3 Merge branch 'bump-ci-actions/checkout-from-6-to-7'
121: a2faa95 = 133: be76f14 Merge branch 'size-t/tree'
158: 54da256 = 134: 7ceff5b Merge 'remote-hg-prerequisites' into HEAD
123: 978bece = 135: 74a9a06 blame: widen find_line_starts() len parameter to size_t
124: 84486c6 = 136: 15f70bc Merge branch 'size-t/commit'
159: cafec94 = 137: 78d56e3 Merge branch 'drive-prefix'
126: 4523114 = 138: ec8fe49 grep: widen struct grep_source.size and grep_buffer() to size_t
127: cd9817a = 139: ff8f785 Merge branch 'size-t/blame'
161: 9f98c8b = 140: fedf756 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
131: 2603337 = 141: e188e9c fast-export: drop the export_blob() size cast and widen anonymize_blob()
132: df7cace = 142: 47c1651 Merge branch 'size-t/grep'
162: cbf8391 = 143: e4cc9da Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
136: b1c85b5 = 144: 12d14c4 repo: drop the inflated-size cast in count_objects()
137: 4c30c59 = 145: e29aee7 Merge branch 'size-t/fast-export'
163: ed2a4dd = 146: 98ad171 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
141: 2e5c984 = 147: 448bb56 unpack-objects: widen the size-passing infrastructure to size_t
142: d9c5185 = 148: 4ac0c6b Merge branch 'size-t/repo'
164: 3bfd202 = 149: be71dde Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction146: f246aa2 = 150: a40687f Merge branch 'size-t/unpack-objects'
165: c0ae67b = 151: 2685c08 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
173: 725fb70 = 152: 735ff7b Merge branch 'topic/size-t' into size-t-followups
166: a4e890f = 153: 2591cd7 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
175: d8f7fec = 154: e84722e pack-objects: drop cast_size_t_to_ulong shims in get_delta()
167: d0f47d7 = 155: 82073d3 Merge 'add-p-many-files'
177: 796825b = 156: e35fd9b pack-objects: drop cast_size_t_to_ulong shims in try_delta()
168: 1b34e8a = 157: ba40298 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
179: af2e1f9 = 158: 59db5d2 pack-objects: drop the last size shim in write_no_reuse_object()
169: b322283 = 159: 45238bc Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
181: b47b323 = 160: 7df45d3 blame: widen struct blame_scoreboard.final_buf_size to size_t
170: 6f6b01c = 161: ad9ff98 Merge 'git-gui/js/intent-to-add'
183: d3576b5 ! 162: 2df5ab5 fast-import: drop the six size casts in the object-read paths
171: 83d21df = 163: 37de171 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
185: b20dbc1 = 164: e44bec3 t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
172: 9493287 = 165: 04a0e45 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
187: ce9abe2 = 166: b35b8fd Drop the
cast_size_t_to_ulong()helper188: 0990fe0 = 167: b6cd301 Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
174: e2f20c7 = 168: 5c10bab Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
190: 179796d = 169: 16149ab Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
191: 97e32a7 = 170: 0b1db5d coverity: skip building with Rust, for now
176: 901e681 = 171: e747c17 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path178: 6050c84 = 172: a1f8809 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
180: b808222 = 173: ee8c6ba Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
182: 1b98ea3 = 174: 69bc2c3 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests184: 075b426 = 175: 8418327 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
-: ---------- > 176: e440cf0 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t186: 8885529 = 177: e290770 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory189: 8c24278 = 178: b3d3134 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
192: 5ac254e = 179: 380a67a Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
193: 38ea001 = 180: a037c6a Merge branch 'optionally-dont-append-atomically-on-windows'
194: 5ff7a58 = 181: 8f88897 Merge branch 'fsync-object-files-always'
195: e7bd23f = 182: 85c9f3f Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
196: 7ffdf70 = 183: 21c2c6c Fix Windows version resources (Fix Windows version resources git#4092)
197: d1b24f9 = 184: 6c1b3e8 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
199: 444d0ca = 185: 2d36132 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)200: 6137255 = 186: e6373ba Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283201: b380c34 = 187: ae3f0ee Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
202: 30e79fa = 188: 52ff458 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
203: 25d59d0 = 189: a9de51a Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
204: 1603755 = 190: d532e8d Merge branch 'nano-server'
205: 2088866 = 191: 43ccfde Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
206: 134a1e9 = 192: 9c3791a win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
207: bd3093b = 193: ce0a7eb common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
208: 9471e11 = 194: 40cb791 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
209: 00207d2 = 195: 322e37f Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
210: 19d59cc = 196: 800fe8d Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
211: 40ebbec = 197: 6cd6058 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
212: 9ab2de3 = 198: 3738a26 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
213: d3480ae = 199: f0f0a09 Merge branch 'reftable-vs-custom-allocators'
214: 143f621 = 200: 3f42f08 Merge branch 'check-whitespace-only-downstream'
215: 3c3ef58 = 201: 8484c8e 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)
216: 9beeb56 = 202: c9f3bcc Merge branch 'disallow-ntlm-auth-by-default'
217: bc39572 = 203: bba122b Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)218: fd3d672 = 204: 299cc37 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
219: 5943b42 = 205: 0b24d5e http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
220: 555fd09 = 206: 1dd981b entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
221: 672b3dc = 207: ca06234 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)222: 6b63e89 = 208: 374646a Merge branch 'msys2'
223: c3eccd3 = 209: 3508fc5 Merge 'docker-volumes-are-no-symlinks'
224: 804a39a = 210: 7ce1b5c mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
225: 16da38b = 211: f0f98dc Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
226: d469318 = 212: c125873 Merge branch 'dont-clean-junctions'
227: d58a45c = 213: 80b3f8a Merge branch 'wsl-file-mode-bits'
228: 1456f28 = 214: 3bf90db Merge branch 'validate-dotgit'
229: e4aa11f = 215: 1aeabcd Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
230: cdc3fb3 = 216: 617ebc4 Merge branch 'skip-rust-in-the-coverity-builds'
231: 6b886f0 = 217: 20fd745 Merge branch 'ready-for-upstream'
233: 17fab19 = 218: b11c619 Win32: make FILETIME conversion functions public
235: 0224b5d = 219: 022fdb8 Win32: dirent.c: Move opendir down
236: c9feb5d = 220: d7e399d mingw: make the dirent implementation pluggable
237: 892428d = 221: 3402497 Win32: make the lstat implementation pluggable
238: f5d6ceb = 222: 45e4e4a mingw: add infrastructure for read-only file system level caches
239: 33bb3f9 = 223: a676976 mingw: add a cache below mingw's lstat and dirent implementations
240: fc7626f = 224: 5011c19 fscache: load directories only once
241: 6ec5298 = 225: fa4f44e fscache: add key for GIT_TRACE_FSCACHE
242: ca23236 = 226: 89ca624 fscache: remember not-found directories
243: c1b5416 = 227: 28e7b98 fscache: add a test for the dir-not-found optimization
244: e2e0ac9 = 228: 989877c add: use preload-index and fscache for performance
245: 1d07078 = 229: ebc5b89 dir.c: make add_excludes aware of fscache during status
246: 3d9c8d6 = 230: 44bbc65 fscache: make fscache_enabled() public
247: 923a158 = 231: 142fb51 dir.c: regression fix for add_excludes with fscache
248: b3e1703 = 232: b48d063 fetch-pack.c: enable fscache for stats under .git/objects
249: 2e1ee1e = 233: aa69c5d checkout.c: enable fscache for checkout again
250: 68b3a79 = 234: d4ef26b Enable the filesystem cache (fscache) in refresh_index().
251: 52e62aa = 235: bd8ca96 fscache: use FindFirstFileExW to avoid retrieving the short name
252: a93149c = 236: 8d8053e fscache: add GIT_TEST_FSCACHE support
253: 91060d4 = 237: 5e79062 fscache: add fscache hit statistics
254: 4cb9f61 = 238: 894d72c unpack-trees: enable fscache for sparse-checkout
255: 2dd88d2 = 239: 51b7e40 status: disable and free fscache at the end of the status command
256: ea8a8d2 = 240: 45501af mem_pool: add GIT_TRACE_MEMPOOL support
257: 6521701 = 241: 12930ee fscache: fscache takes an initial size
258: 38bd985 = 242: 43b7d2b fscache: update fscache to be thread specific instead of global
259: d3e5335 = 243: f6eb832 fscache: teach fscache to use mempool
260: 659a0fd = 244: a7748ea fscache: make fscache_enable() thread safe
261: e7cb946 = 245: 11cea1a fscache: teach fscache to use NtQueryDirectoryFile
262: cefa4ec = 246: 3d9267d fscache: remember the reparse tag for each entry
263: 6a1b93b = 247: 9052658 fscache: Windows Docker volumes are not symbolic links
264: d1018a2 = 248: 976f1ff fscache: optionally enable wsl compability file mode bits
266: 1fe25ab = 249: 40e5b94 fscache: implement an FSCache-aware is_mount_point()
232: f0d4221 = 250: 48f5a64 git-gui--askyesno: fix funny text wrapping
268: 2323e73 = 251: 3c097df clean: make use of FSCache
234: b59edfa = 252: 0a913ad git-gui--askyesno (mingw): use Git for Windows' icon, if available
265: 4088585 = 253: 54066fa Merge branch 'fscache'
-: ---------- > 254: 4427beb compat/poll: do not collect more handles than the wait supports
267: a302fdb = 255: 6827bfa 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: e9a3371 parallel-checkout: limit worker count to what poll() can wait on
269: 80e962b = 257: 2652d18 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
-: ---------- > 258: cf3ad2c run-command: limit concurrent children to what poll() can wait on
270: b3ef077 = 259: 33bc80e Merge branch 'dont-clean-junctions-fscache'
-: ---------- > 260: b760f19 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)
271: df2292a = 261: c0d3a89 pack-objects (mingw): demonstrate a segmentation fault with large deltas
272: e3cf386 ! 262: 7b5bed6 mingw: support long paths
273: 1887ebb ! 263: 72bb461 win32(long path support): leave drive-less absolute paths intact
274: 96a87dc = 264: 6c5606e compat/fsmonitor/fsm-*-win32: support long paths
275: af4770c = 265: 8f99ac7 clean: suggest using
core.longPathsif paths are too long to remove276: b9cc790 = 266: 4d49c85 mingw: explicitly specify with which cmd to prefix the cmdline
277: 324c14f = 267: d812eaf mingw: when path_lookup() failed, try BusyBox
278: aa3e6da = 268: 3a0fa93 test-tool: learn to act as a drop-in replacement for
iconv279: 056e218 = 269: fb029eb tests(mingw): if
iconvis unavailable, usetest-helper --iconv280: a165c88 = 270: 7af942d gitattributes: mark .png files as binary
281: 013b066 = 271: d87684a tests: move test PNGs into t/lib-diff/
282: c3d395f = 272: f63dc75 tests: only override sort & find if there are usable ones in /usr/bin/
283: f4e5a5b = 273: 4656248 tests: use the correct path separator with BusyBox
284: 8e391bc = 274: a54ee16 mingw: only use Bash-ism
builtin pwd -Wwhen available285: a392c89 = 275: 68e46be tests (mingw): remove Bash-specific pwd option
286: 6964d87 = 276: 18530ea test-lib: add BUSYBOX prerequisite
287: 67890a1 = 277: 75c596c t5003: use binary file from t/lib-diff/
288: a88958f = 278: 7427a25 t5532: workaround for BusyBox on Windows
289: f5c5eef = 279: 0988ddf t5605: special-case hardlink test for BusyBox-w32
290: 262ea12 = 280: 69d1be9 t5813: allow for $PWD to be a Windows path
291: 3d78eb3 = 281: 1772545 t9200: skip tests when $PWD contains a colon
292: a9ec63f = 282: cbb92b8 Describe Git for Windows' architecture
293: 1f4dd87 = 283: bee8eba Add an AGENTS.md file to help with AI-assisted debugging/development
294: f66b231 = 284: 8ba28ed Modify the Code of Conduct for Git for Windows
295: 13cbf49 = 285: 0625023 CONTRIBUTING.md: add guide for first-time contributors
296: 7c398cc = 286: a741ebb README.md: Add a Windows-specific preamble
297: 4014fdb = 287: bfff78d Add an issue template
299: c5ac2aa = 288: f5de305 Modify the GitHub Pull Request template (to reflect Git for Windows)
298: cf2e5b2 = 289: 6807658 Merge branch 'gitk-and-git-gui-patches'
301: 6835b85 = 290: bdf993b Add a GitHub workflow to monitor component updates
302: 228db84 = 291: 429980d SECURITY.md: document Git for Windows' policies
300: 49a1be6 = 292: 76f1ff5 Merge branch 'long-paths'
303: 4e8c0f7 = 293: 5865463 Partially un-revert "editor: save and reset terminal after calling EDITOR"
305: 5edbdc9 = 294: 59838bb reset: reinstate support for the deprecated --stdin option
306: bd7a62e = 295: d4eab83 fsmonitor: reintroduce core.useBuiltinFSMonitor
307: 64b3bbb = 296: 363eacb dependabot: help keeping GitHub Actions versions up to date
308: ffd8b46 = 297: 614a569 ci: only run the expensive tests in the Windows tests for now
304: 166d58a = 298: e9e1e59 Merge branch 'busybox-w32'
309: 1a8b07e = 299: f81c8d2 Merge branch 'un-revert-editor-save-and-reset'
310: a88a679 = 300: 70febd9 Merge branch 'phase-out-reset-stdin'
311: 0e2d21d = 301: 841d9c3 Merge branch 'deprecate-core.useBuiltinFSMonitor'
312: 27bc219 = 302: 54fd4a9 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
313: 8ce1f2a = 303: 448656d Merge 'readme' into HEAD
314: bd64ea5 = 304: 765bd78 build(deps): bump actions/cache from 5 to 6
315: 3ec75d2 = 305: 6fc7114 build(deps): bump actions/cache from 5 to 6 (build(deps): bump actions/cache from 5 to 6 git#6303)
316: cd3fa11 = 306: d15f008 repo: split annotated tags out from total tag count in structure
317: bd6004c ! 307: 4b8cfa6 repo: filter the structure scope via --ref-filter=
318: 5ba582f = 308: a13a13a repo: report top-N paths by count, disk, and inflated size in structure
319: 30ceff5 ! 309: 5718749 t1901: cover the --top option of
git repo structure320: 911d8a3 ! 310: c4736cf 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 + ) +' +321: 9bb2f5d = 311: 1ebce4a git-survey: announce the upcoming pivot into
git repo structure322: 6456fbe ! 312: 6dfdcd8 survey: turn into a thin shim over
git repo structure323: 6cb53cb = 313: 8b4bbfb Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)-: ---------- > 314: 45b2e37 mingw: handle staging 4GB+ files correctly
13: fbe6970 = 315: 278b82b bundle-uri: refuse advertised URIs by protocol
25: 5d62de2 < -: ---------- windows: skip linking
git-<command>for built-ins26: 9346172 < -: ---------- mingw: stop hard-coding
CC = gcc27: 9009866 < -: ---------- mingw: drop the -D_USE_32BIT_TIME_T option
28: ab9596f < -: ---------- mingw: only use -Wl,--large-address-aware for 32-bit builds
29: 1b807be < -: ---------- mingw: avoid over-specifying
--pic-executable30: 23b2083 < -: ---------- mingw: set the prefix and HOST_CPU as per MSYS2's settings
31: 2ff1834 < -: ---------- mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
32: 6a168cb < -: ---------- mingw: rely on MSYS2's metadata instead of hard-coding it
33: b74eed6 < -: ---------- mingw: always define
ETC_*for MSYS2 environments37: 6af87b0 < -: ---------- mingw: ensure valid CTYPE
39: e3befc3 < -: ---------- mingw: allow
git.exeto be used instead of the "Git wrapper"-: ---------- > 316: 884d0ae mingw: support unpacking loose 4GB+ objects
-: ---------- > 317: 74d1e6e git-for-windows: prepare for 2.55.0(5)
156: 4772c99 = 318: 7f94b1e Merge tag 'v2.55.0.windows.4'
160: 764890f < -: ---------- Merge branch 'msys2-python'
198: ac51bd6 < -: ---------- Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)324: df73f90 < -: ---------- fixup??? repo: filter the structure scope via --ref-filter=
325: 9ebb856 < -: ---------- fixup??? t1901: cover the --top option of
git repo structure326: a1fabf0 < -: ---------- fixup??? repo: read the
--topdefault fromrepo.structure.top327: abd95cd < -: ---------- fixup??? mingw: support long paths
328: fcab3d9 < -: ---------- fixup??? win32(long path support): leave drive-less absolute paths intact
329: 8cd0c3e < -: ---------- fixup??? survey: stub in new experimental 'git-survey' command
330: d8b3c10 < -: ---------- fixup??? survey: turn into a thin shim over
git repo structure331: 038fecc < -: ---------- fixup??? survey: stub in new experimental 'git-survey' command
332: 4b188a3 < -: ---------- Merge tag 'v2.55.0.windows.5'
333: bb68782 < -: ---------- Support loose 4GB+ objects (Support loose 4GB+ objects git#6353)
334: 5b35fd9 < -: ---------- ci: bump debian-11 job to debian-12 (ci: bump debian-11 job to debian-12 git#6401)
-: ---------- > 319: ec37465 t: add an expensive test to verify that 4GB+ blobs can be staged/read
-: ---------- > 320: bd1c434 Merge tag 'v2.55.0.windows.5'
-: ---------- > 321: a8d5338 Support loose 4GB+ objects (Support loose 4GB+ objects git#6353)
-: ---------- > 322: add6a4a fixup! Add config option
windows.appendAtomicallyTruncated; see the full conflict report in the workflow run summary.