Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#31553637213) - #365
Open
gitforwindowshelper[bot] wants to merge 319 commits into
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#31553637213)#365gitforwindowshelper[bot] wants to merge 319 commits into
gitforwindowshelper[bot] wants to merge 319 commits into
Conversation
Signed-off-by: Derrick Stolee <stolee@gmail.com>
The winsock2 library provides functions that work on different data types than file descriptors, therefore we wrap them. But that is not the only difference: they also do not set `errno` but expect the callers to enquire about errors via `WSAGetLastError()`. Let's translate that into appropriate `errno` values whenever the socket operations fail so that Git's code base does not have to change its expectations. This closes git-for-windows#2404 Helped-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In future changes, we will make use of these methods. The intention is to keep track of the top contributors according to some metric. We don't want to store all of the entries and do a sort at the end, so track a constant-size table and remove rows that get pushed out depending on the chosen sorting algorithm. Co-authored-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by; Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
We map WSAGetLastError() errors to errno errors in winsock_error_to_errno(), but the MSVC strerror() implementation only produces "Unknown error" for most of them. Produce some more meaningful error messages in these cases. Our builds for ARM64 link against the newer UCRT strerror() that does know these errors, so we won't change the strerror() used there. The wording of the messages is copied from glibc strerror() messages. Reported-by: M Hickford <mirth.hickford@gmail.com> Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
The previous commits introduced a compile-time option to load libcurl lazily, but it uses the hard-coded name "libcurl-4.dll" (or equivalent on platforms other than Windows). To allow for installing multiple libcurl flavors side by side, where each supports one specific SSL/TLS backend, let's first look whether `libcurl-<backend>-4.dll` exists, and only use `libcurl-4.dll` as a fall back. That will allow us to ship with a libcurl by default that only supports the Secure Channel backend for the `https://` protocol. This libcurl won't suffer from any dependency problem when upgrading OpenSSL to a new major version (which will change the DLL name, and hence break every program and library that depends on it). This is crucial because Git for Windows relies on libcurl to keep working when building and deploying a new OpenSSL package because that library is used by `git fetch` and `git clone`. Note that this feature is by no means specific to Windows. On Ubuntu, for example, a `git` built using `LAZY_LOAD_LIBCURL` will use `libcurl.so.4` for `http.sslbackend=openssl` and `libcurl-gnutls.so.4` for `http.sslbackend=gnutls`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The 'git survey' builtin provides several detail tables, such as "top files by on-disk size". The size of these tables defaults to 10, currently. Allow the user to specify this number via a new --top=<N> option or the new survey.top config key. Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Commit 2406bf5 (Win32: detect unix socket support at runtime, 2024-04-03) introduced a runtime detection for whether the operating system supports unix sockets for Windows, but a mistake snuck into the tests. When building and testing Git without NO_UNIX_SOCKETS we currently skip t0301-credential-cache on Windows if unix sockets are supported and run the tests if they aren't. Flip that logic to actually work the way it was intended. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The new default of Git is to disable NTLM authentication by default. To help users find the escape hatch of that config setting, should they need it, suggest it when the authentication failed and the server had offered NTLM, i.e. if re-enabling it would fix the problem. Helped-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Accessing the Windows console through the special CONIN$ / CONOUT$ devices doesn't work properly for non-ASCII usernames an passwords. It also doesn't work for terminal emulators that hide the native console window (such as mintty), and 'TERM=xterm*' is not necessarily a reliable indicator for such terminals. The new shell_prompt() function, on the other hand, works fine for both MSys1 and MSys2, in native console windows as well as mintty, and properly supports Unicode. It just needs bash on the path (for 'read -s', which is bash-specific). On Windows, try to use the shell to read from the terminal. If that fails with ENOENT (i.e. bash was not found), use CONIN/OUT as fallback. Note: To test this, create a UTF-8 credential file with non-ASCII chars, e.g. in git-bash: 'echo url=http://täst.com > cred.txt'. Then in git-cmd, 'git credential fill <cred.txt' works (shell version), while calling git without the git-wrapper (i.e. 'mingw64\bin\git credential fill <cred.txt') mangles non-ASCII chars in both console output and input. Signed-off-by: Karsten Blees <blees@dcon.de>
In preparation for making this function a bit more complicated (to allow for special-casing the `ContainerMappedDirectories` in Windows containers, which look like a symbolic link, but are not), let's move it out of the header. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, symbolic links have a type: a "file symlink" must point at a file, and a "directory symlink" must point at a directory. If the type of symlink does not match its target, it doesn't work. Git does not record the type of symlink in the index or in a tree. On checkout it'll guess the type, which only works if the target exists at the time the symlink is created. This may often not be the case, for example when the link points at a directory inside a submodule. By specifying `symlink=file` or `symlink=dir` the user can specify what type of symlink Git should create, so Git doesn't have to rely on unreliable heuristics. Signed-off-by: Bert Belder <bertbelder@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It seems to be not exactly rare on Windows to install NTFS junction points (the equivalent of "bind mounts" on Linux/Unix) in worktrees, e.g. to map some development tools into a subdirectory. In such a scenario, it is pretty horrible if `git clean -dfx` traverses into the mapped directory and starts to "clean up". Let's just not do that. Let's make sure before we traverse into a directory that it is not a mount point (or junction). This addresses git-for-windows#607 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This will help with Git for Windows' maintenance going forward: It allows Git for Windows to switch its primary libcurl to a variant without the OpenSSL backend, while still loading an alternate when setting `http.sslBackend = openssl`. This is necessary to avoid maintenance headaches with upgrading OpenSSL: its major version name is encoded in the shared library's file name and hence major version updates (temporarily) break libraries that are linked against the OpenSSL library. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In Git for Windows v2.39.0, we fixed a regression where `git.exe` would no longer work in Windows Nano Server (frequently used in Docker containers). This GitHub workflow can be used to verify manually that the Git/Scalar executables work in Nano Server. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When running Git for Windows on a remote APFS filesystem, it would appear that the `mingw_open_append()`/`write()` combination would fail almost exactly like on some CIFS-mounted shares as had been reported in git-for-windows#2753, albeit with a different `errno` value. Let's handle that `errno` value just the same, by suggesting to set `windows.appendAtomically=false`. Signed-off-by: David Lomas <dl3@pale-eds.co.uk> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Windows 10 version 1511 (also known as Anniversary Update), according to https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences introduced native support for ANSI sequence processing. This allows using colors from the entire 24-bit color range. All we need to do is test whether the console's "virtual processing support" can be enabled. If it can, we do not even need to start the `console_thread` to handle ANSI sequences. Or, almost all we need to do: When `console_thread()` does its work, it uses the Unicode-aware `write_console()` function to write to the Win32 Console, which supports Git for Windows' implicit convention that all text that is written is encoded in UTF-8. The same is not necessarily true if native ANSI sequence processing is used, as the output is then subject to the current code page. Let's ensure that the code page is set to `CP_UTF8` as long as Git writes to it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
By default, the buffer type of Windows' `stdout` is unbuffered (_IONBF), and there is no need to manually fflush `stdout`. But some programs, such as the Windows Filtering Platform driver provided by the security software, may change the buffer type of `stdout` to full buffering. This nees `fflush(stdout)` to be called manually, otherwise there will be no output to `stdout`. Signed-off-by: MinarKotonoha <chengzhuo5@qq.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A long time ago, we decided to run tests in Git for Windows' SDK with the default `winsymlinks` mode: copying instead of linking. This is still the default mode of MSYS2 to this day. However, this is not how most users run Git for Windows: As the majority of Git for Windows' users seem to be on Windows 10 and newer, likely having enabled Developer Mode (which allows creating symbolic links without administrator privileges), they will run with symlink support enabled. This is the reason why it is crucial to get the fixes for CVE-2024-? to the users, and also why it is crucial to ensure that the test suite exercises the related test cases. This commit ensures the latter. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In order to be a better Windows citizenship, Git should save its configuration files on AppData folder. This can enables git configuration files be replicated between machines using the same Microsoft account logon which would reduce the friction of setting up Git on new systems. Therefore, if %APPDATA%\Git\config exists, we use it; otherwise $HOME/.config/git/config is used. Signed-off-by: Ariel Lourenco <ariellourenco@users.noreply.github.com>
The sparse tree walk algorithm was created in d5d2e93 (revision: implement sparse algorithm, 2019-01-16) and involves using the mark_trees_uninteresting_sparse() method. This method takes a repository and an oidset of tree IDs, some of which have the UNINTERESTING flag and some of which do not. Create a method that has an equivalent set of preconditions but uses a "dense" walk (recursively visits all reachable trees, as long as they have not previously been marked UNINTERESTING). This is an important difference from mark_tree_uninteresting(), which short-circuits if the given tree has the UNINTERESTING flag. A use of this method will be added in a later change, with a condition set whether the sparse or dense approach should be used. Signed-off-by: Derrick Stolee <stolee@gmail.com>
While this command is definitely something we _want_, chances are that upstreaming this will require substantial changes. We still want to be able to experiment with this before that, to focus on what we need out of this command: To assist with diagnosing issues with large repositories, as well as to help monitoring the growth and the associated painpoints of such repositories. To that end, we are about to integrate this command into `microsoft/git`, to get the tool into the hands of users who need it most, with the idea to iterate in close collaboration between these users and the developers familar with Git's internals. However, we will definitely want to avoid letting anybody have the impression that this command, its exact inner workings, as well as its output format, are anywhere close to stable. To make that fact utterly clear (and thereby protect the freedom to iterate and innovate freely before upstreaming the command), let's mark its output as experimental in all-caps, as the first thing we do. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
Mirror what git survey already reports: lightweight tags (pointing straight at a commit/tree/blob) and annotated tags (pointing at an OBJ_TAG that is itself stored as a separate object) are different things in many monorepo contexts, and one of the differences git survey users routinely care about. Add an annotated_tags counter to struct ref_stats, populate it in count_references() by peeking at the ref OID's object type, and expose it as a sub-row under Tags in the table output and as references.tags.annotated.count in the machine-readable formats. Step toward pivoting the standalone git survey command onto git repo structure; this fills the first of the four feature gaps documented in the assessment. Tests in t1901 widened to assert the new row and key. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git repo structure` walks every reference enumerated by `refs_for_each_ref()` and feeds each reference's tip into the path walk that produces the object counts. There is no way to scope the inquiry to a subset of refs, even though that is the most common need when an operator is investigating what part of the history is driving cost: only branches, only release tags, only one remote's view, etc. Add a single `--ref-filter=<pattern>` option that, when given, restricts both the reference count and the object walk to refs whose full name matches one of the patterns. The option is repeatable; multiple patterns form a union, so `--ref-filter='refs/heads/*' --ref-filter='refs/tags/v*'` includes local branches and tags whose short name starts with `v`. Patterns use `wildmatch()` with `WM_PATHNAME` semantics so a `*` does not cross `/`, matching the convention used by `git for-each-ref` positional arguments. Choosing a single flexible filter, rather than a proliferation of per-kind flags like `--branches`, `--tags`, `--remotes`, keeps the option surface small and lets the same mechanism express narrow selections the per-kind flags could not, such as "only release tags" (`'refs/tags/v*'`) or "only one remote's branches" (`'refs/remotes/origin/*'`). Without `--ref-filter`, behaviour is unchanged: every ref `refs_for_each_ref()` enumerates contributes. Both the reference counter and the path-walk seeding (via `add_pending_oid()`) sit on the same callback, so an early return when no pattern matches naturally excludes a ref from both. No separate object-walk machinery is needed. Cover the two interesting code paths with tests in t1901: a single filter narrowing to branches, and two filters unioning to include both branches and tags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` distinguishes itself from `git repo structure` largely by its path-level reporting: in addition to whole-repo totals it lists the paths whose object histories dominate the repository, ranked by raw count, on-disk size, and inflated size, separately for trees and blobs. That is often the most actionable output from `git survey`, since it points an operator at the directories and files that should be reviewed for cleanup, sparse-checkout exclusion, or rewriting. `git repo structure` already drives the same path-walk traversal that `git survey` uses to gather its per-path numbers; the callback simply discards the path. Aggregate per-(path, type) summaries inside that existing callback and add a bounded, descending-sorted "top-N" table keyed by each of the three axes. Gate the feature behind a new `--top=<n>` option, defaulting to 0, so unadorned invocations are unaffected and pay no extra work for the top-N tracking. Mirror the sort and eviction strategy from `builtin/survey.c`: keep an array of at most N entries sorted from largest to smallest, walk it from the bottom on each candidate, and shift entries down when a new one belongs. Compared to `builtin/survey.c`, drop the void-pointer indirection in the table data, type the comparator's arguments, and fold the trivial comparators into the `(a > b) - (a < b)` idiom. For the human-readable `table` output, extend the existing nested bullet layout with two new top-level sections, `* Top trees` and `* Top blobs`, each containing three sub-tables (`Top by count`, `Top by disk size`, `Top by inflated size`). The path becomes the row name and the relevant scalar becomes the value, reusing `stats_table_count_addf` and `stats_table_size_addf` so units and column alignment match the rest of the table. For the `lines`/`nul` key-value formats, emit one `objects.<type>.top.by_<axis>.<rank>.path=<path>` entry alongside an `objects.<type>.top.by_<axis>.<rank>.<axis>=<value>` entry per ranked path, so consumers can dispatch by axis without parsing the schema. The root tree's path is the empty string as produced by the path-walk machinery; preserve that as-is to stay faithful to the upstream representation rather than fabricating a placeholder. This is the first piece of folding `git survey`'s functionality into `git repo structure`. Subsequent commits will add the corresponding configuration knob and, eventually, turn `git survey` into a thin deprecated shim over `git repo structure`. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The preceding commit added `--top=<n>` to `git repo structure`,
reporting the top-N paths per type ranked by count, on-disk size, and
inflated size. Cover the three behaviors that matter for that option:
* Without `--top`, the key-value output emits no `top.*` keys, so
existing parsers stay unaffected.
* `--top=N` produces exactly N ranked entries on each of the six
`objects.<type>.top.by_<axis>` axes (count/disk_size/inflated_size
crossed with trees/blobs), and a constructed input where one blob
is several orders of magnitude bigger than the other lets us
assert the ordering on the disk-size and inflated-size axes.
* A negative `--top` is rejected with a non-zero exit and a message
naming the constraint, so a typo cannot silently degrade into the
default zero.
Avoid grep patterns starting with `--`; grep would parse the leading
double dash as an option terminator.
Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` exposes its `--top` default via `survey.top` so that a site or per-repository operator can switch the detail tables on once and have every subsequent invocation include them. Mirror that ergonomics for `git repo structure` so that, as `git survey`'s functionality is folded into `git repo structure`, the configuration side of the migration story stays equivalent. Add a small `git_config_int` callback bound to `repo.structure.top` and invoke it before `parse_options()`, so a `--top=<N>` on the command line cleanly overrides the configured default (including `--top=0` to opt out of the detail tables when configuration enables them). Reject negative configured values with the same wording as the command-line guard, since `git_config_int()` happily returns negative integers. Document the new variable in a fresh `Documentation/config/repo.adoc` and wire it into the alphabetical includes in `Documentation/config.adoc` between `repack.adoc` and `rerere.adoc`. Cover the precedence behaviour with a t1901 test: a configured value enables the tables by default, and a command-line `--top=0` suppresses them again. Note that the reported paths respect the `core.quotePath` setting. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` started life as an experimental scale-measurement tool; the preceding commits give `git repo structure` the path-level detail tables and ref-scoping mechanism that were `git survey`'s main draw, so the two now overlap substantially. Plan the migration explicitly: add a short notice at the top of the description making clear which of `git survey`'s knobs map to which `git repo structure` option, and state that a future release will turn `git survey` into a thin shim over `git repo structure`. Putting the notice in the description (rather than only the synopsis) ensures it shows up in `git help survey` rendering before the reader sees any option specifics, so an operator skimming the page learns about the replacement before adopting any survey-specific flags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v5...v6) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` was an experimental scale-measurement tool whose
distinctive features (ref-kind filters, top-N path tables) are now
all available in `git repo structure`. With the path-level reporting
in place (commits "repo: filter the structure scope via
--ref-filter=<pattern>" and "repo: report top-N paths by count, disk,
and inflated size in structure"), there is no functionality `git
survey` provides that `git repo structure` cannot.
Replace the 764-line `git survey` implementation with a roughly
hundred-line shim that:
* Accepts the existing `git survey` command line so callers in
scripts continue to parse without changes.
* Emits a deprecation warning naming the replacement command, so
interactive users learn about the migration target.
* Translates the survey-specific knobs into the equivalent
`git repo structure` invocation and re-execs the canonical
command via `execv_git_cmd()`. Per-kind ref selectors fan out
into the corresponding `refs/heads/*`, `refs/tags/*`, etc.
`--ref-filter` patterns; `--top=<N>` is forwarded directly;
`--all-refs` becomes the absence of any `--ref-filter`.
Two survey options have no `git repo structure` counterpart:
`--verbose` controlled per-step trace output the new command does
not emit, and `--detached` selected the detached HEAD which
`git repo structure` does not enumerate separately. Both are
silently accepted and produce a single warning each, so old
invocations keep working while the absence of these knobs in `git
repo structure` is made visible.
Rewrite t8100 to assert the shim's contract: the deprecation
warning is printed, the output is byte-identical to a corresponding
`git repo structure` invocation, and the per-kind selector
translation produces the right `--ref-filter` pattern. The
preceding survey-specific output assertions (the multi-column
plaintext tables) no longer apply, since `git repo structure`'s
output format is now the canonical one and is covered by t1901.
The `survey.*` configuration keys (`survey.top`, `survey.progress`,
`survey.verbose`) are no longer honored by the shim. They were
mirrored by the preceding `repo.structure.top` work for the most
useful knob; users with `survey.top` set in config should migrate
to `repo.structure.top`. This is a backward-incompatible removal
documented by the deprecation notice in `git-survey.adoc`.
Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/actions/cache/releases">actions/cache's releases</a>.</em></p> <blockquote> <h2>v6.0.0</h2> <h2>What's Changed</h2> <ul> <li>Update packages, migrate to ESM by <a href="https://github.com/Samirat"><code>@Samirat</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1760">actions/cache#1760</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v6.0.0">https://github.com/actions/cache/compare/v5...v6.0.0</a></p> <h2>v5.1.0</h2> <h2>What's Changed</h2> <ul> <li>Bump <code>@actions/cache</code> to v5.1.0 - handle read-only cache access by <a href="https://github.com/jasongin"><code>@jasongin</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1775">actions/cache#1775</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.1.0">https://github.com/actions/cache/compare/v5...v5.1.0</a></p> <h2>v5.0.5</h2> <h2>What's Changed</h2> <ul> <li>Update ts-http-runtime dependency by <a href="https://github.com/yacaovsnc"><code>@yacaovsnc</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1747">actions/cache#1747</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.0.5">https://github.com/actions/cache/compare/v5...v5.0.5</a></p> <h2>v5.0.4</h2> <h2>What's Changed</h2> <ul> <li>Add release instructions and update maintainer docs by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1696">actions/cache#1696</a></li> <li>Potential fix for code scanning alert no. 52: Workflow does not contain permissions by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1697">actions/cache#1697</a></li> <li>Fix workflow permissions and cleanup workflow names / formatting by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1699">actions/cache#1699</a></li> <li>docs: Update examples to use the latest version by <a href="https://github.com/XZTDean"><code>@XZTDean</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1690">actions/cache#1690</a></li> <li>Fix proxy integration tests by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1701">actions/cache#1701</a></li> <li>Fix cache key in examples.md for bun.lock by <a href="https://github.com/RyPeck"><code>@RyPeck</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1722">actions/cache#1722</a></li> <li>Update dependencies & patch security vulnerabilities by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1738">actions/cache#1738</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/XZTDean"><code>@XZTDean</code></a> made their first contribution in <a href="https://redirect.github.com/actions/cache/pull/1690">actions/cache#1690</a></li> <li><a href="https://github.com/RyPeck"><code>@RyPeck</code></a> made their first contribution in <a href="https://redirect.github.com/actions/cache/pull/1722">actions/cache#1722</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.0.4">https://github.com/actions/cache/compare/v5...v5.0.4</a></p> <h2>v5.0.3</h2> <h2>What's Changed</h2> <ul> <li>Bump <code>@actions/cache</code> to v5.0.5 (Resolves: <a href="https://github.com/actions/cache/security/dependabot/33">https://github.com/actions/cache/security/dependabot/33</a>)</li> <li>Bump <code>@actions/core</code> to v2.0.3</li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.0.3">https://github.com/actions/cache/compare/v5...v5.0.3</a></p> <h2>v.5.0.2</h2> <h1>v5.0.2</h1> <h2>What's Changed</h2> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/actions/cache/blob/main/RELEASES.md">actions/cache's changelog</a>.</em></p> <blockquote> <h1>Releases</h1> <h2>How to prepare a release</h2> <blockquote> <p>[!NOTE] Relevant for maintainers with write access only.</p> </blockquote> <ol> <li>Switch to a new branch from <code>main</code>.</li> <li>Run <code>npm test</code> to ensure all tests are passing.</li> <li>Update the version in <a href="https://github.com/actions/cache/blob/main/package.json"><code>https://github.com/actions/cache/blob/main/package.json</code></a>.</li> <li>Run <code>npm run build</code> to update the compiled files.</li> <li>Update this <a href="https://github.com/actions/cache/blob/main/RELEASES.md"><code>https://github.com/actions/cache/blob/main/RELEASES.md</code></a> with the new version and changes in the <code>## Changelog</code> section.</li> <li>Run <code>licensed cache</code> to update the license report.</li> <li>Run <code>licensed status</code> and resolve any warnings by updating the <a href="https://github.com/actions/cache/blob/main/.licensed.yml"><code>https://github.com/actions/cache/blob/main/.licensed.yml</code></a> file with the exceptions.</li> <li>Commit your changes and push your branch upstream.</li> <li>Open a pull request against <code>main</code> and get it reviewed and merged.</li> <li>Draft a new release <a href="https://github.com/actions/cache/releases">https://github.com/actions/cache/releases</a> use the same version number used in <code>package.json</code> <ol> <li>Create a new tag with the version number.</li> <li>Auto generate release notes and update them to match the changes you made in <code>RELEASES.md</code>.</li> <li>Toggle the set as the latest release option.</li> <li>Publish the release.</li> </ol> </li> <li>Navigate to <a href="https://github.com/actions/cache/actions/workflows/release-new-action-version.yml">https://github.com/actions/cache/actions/workflows/release-new-action-version.yml</a> <ol> <li>There should be a workflow run queued with the same version number.</li> <li>Approve the run to publish the new version and update the major tags for this action.</li> </ol> </li> </ol> <h2>Changelog</h2> <h3>6.1.0</h3> <ul> <li>Bump <code>@actions/cache</code> to v6.1.0 to pick up <a href="https://redirect.github.com/actions/toolkit/pull/2435">actions/toolkit#2435 Handle cache write error due to read-only token</a></li> <li>Switch redundant "Cache save failed" warning to debug log in save-only</li> </ul> <h3>6.0.0</h3> <ul> <li>Updated <code>@actions/cache</code> to ^6.0.1, <code>@actions/core</code> to ^3.0.1, <code>@actions/exec</code> to ^3.0.0, <code>@actions/io</code> to ^3.0.2</li> <li>Migrated to ESM module system</li> <li>Upgraded Jest to v30 and test infrastructure to be ESM compatible</li> </ul> <h3>5.0.4</h3> <ul> <li>Bump <code>minimatch</code> to v3.1.5 (fixes ReDoS via globstar patterns)</li> <li>Bump <code>undici</code> to v6.24.1 (WebSocket decompression bomb protection, header validation fixes)</li> <li>Bump <code>fast-xml-parser</code> to v5.5.6</li> </ul> <h3>5.0.3</h3> <ul> <li>Bump <code>@actions/cache</code> to v5.0.5 (Resolves: <a href="https://github.com/actions/cache/security/dependabot/33">https://github.com/actions/cache/security/dependabot/33</a>)</li> <li>Bump <code>@actions/core</code> to v2.0.3</li> </ul> <h3>5.0.2</h3> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/actions/cache/commit/55cc8345863c7cc4c66a329aec7e433d2d1c52a9"><code>55cc834</code></a> Merge pull request <a href="https://redirect.github.com/actions/cache/issues/1768">#1768</a> from jasongin/readonly-cache</li> <li><a href="https://github.com/actions/cache/commit/d8cd72f230726cdf4457ebb61ec1b593a8d12337"><code>d8cd72f</code></a> Bump <code>@actions/cache</code> to v6.1.0 - handle cache write error due to RO token</li> <li><a href="https://github.com/actions/cache/commit/2c8a9bd7457de244a408f35966fab2fb45fda9c8"><code>2c8a9bd</code></a> Merge pull request <a href="https://redirect.github.com/actions/cache/issues/1760">#1760</a> from actions/samirat/esm_migration_and_package_update</li> <li><a href="https://github.com/actions/cache/commit/e9b91fdc3fea7d79165fceb79042ef45c2d51023"><code>e9b91fd</code></a> Prettier fixes</li> <li><a href="https://github.com/actions/cache/commit/e4884b8ff7f92ef6b52c79eda480bbc86e685adb"><code>e4884b8</code></a> Rebuild dist</li> <li><a href="https://github.com/actions/cache/commit/10baf0191a3c426ea0fa4a3253a5c04233b6e18f"><code>10baf01</code></a> Fixed licenses</li> <li><a href="https://github.com/actions/cache/commit/e39b386c9004d72a15d864ade8c0b3a702d47a37"><code>e39b386</code></a> Fix test mock return order</li> <li><a href="https://github.com/actions/cache/commit/b6928203372a8571ff984c0c883ef3a1adfb0c06"><code>b692820</code></a> PR feedback</li> <li><a href="https://github.com/actions/cache/commit/60749128a44d25d3c520a489e576380cf00ff3f1"><code>6074912</code></a> Rebuild dist bundles as ESM to match type:module</li> <li><a href="https://github.com/actions/cache/commit/5a912e8b4af820fa082a0e75cfd2c782f8fbfe0e"><code>5a912e8</code></a> Fix lint and jest issues</li> <li>Additional commits viewable in <a href="https://github.com/actions/cache/compare/v5...v6">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
…it-for-windows#6268) `git survey` was always experimental, and I never got around to upstreaming it to make it non-experimental. In the meantime, the `git repo structure` command was upstreamed upstream, which covers most of the same ground with a cleaner option surface and a stable output contract. This PR closes the remaining gap (annotated-tag breakdown, ref scoping, top-N paths by count/disk/inflated, and the corresponding configuration knob) and then turns `git survey` into a thin shim that warns about deprecation, translates its old command line into the equivalent `git repo structure` invocation, and re-execs the canonical command. Net result: one user-facing tool to maintain and to teach instead of two. The intent is that scripts pinned to `git survey` keep working (a warning aside), and that operators have a single answer when they ask "how do I see what's making my repository large?". The `survey.*` configuration keys are intentionally dropped; the only one that mattered, `survey.top`, has a direct replacement in `repo.structure.top`.
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…tact Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Required by `mm/test-grep-lint`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is now required by `bc/parse-options-exit-0-on-help`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: seen
From: 36f924bdb7 (Merge tag 'v2.55.0.windows.4', 2026-08-11) (b3d0d94d8d..36f924bdb7)
Resolved: 36f924b (Merge tag 'v2.55.0.windows.4', 2026-08-11)
Resolved all 18 conflicting files in merge of v2.55.0.windows.4: kept HEAD's upstream API changes (object-file signatures, CI_EVENT variable, test_grep, lib/ path prefix, DARWIN_REGEXEC) while preserving Git for Windows additions (bundle URI protocol.*.allow tests, mingw_platform_has_symlinks, no-ref-delta, flush_fscache, path-utils includes, !LONG_IS_64BIT prereq, two-case test structure in t1517)
Range-diff
1: 36f924b ! 1: ebbbe3c Merge tag 'v2.55.0.windows.4'
@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> - ## bundle-uri.c ## + ## Documentation/git-survey.adoc ## + remerge CONFLICT (add/add): Merge conflict in Documentation/git-survey.adoc + index 929106a183..e97656b49d 100644 + --- Documentation/git-survey.adoc + +++ Documentation/git-survey.adoc +@@ Documentation/git-survey.adoc: git-survey(1) + + NAME + ---- +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + git-survey - DEPRECATED: Measure various repository dimensions of scale +-======= +-git-survey - EXPERIMENTAL: Measure various repository dimensions of scale +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + + SYNOPSIS + -------- + [verse] +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + (DEPRECATED!) 'git survey' <options> +-======= +-(EXPERIMENTAL!) 'git survey' <options> +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + + DESCRIPTION + ----------- + +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + NOTE: `git survey` is being superseded by `git repo structure`. New + deployments and new features should use `git repo structure`; its + `--ref-filter=<pattern>` option subsumes the various `--branches`, +@@ Documentation/git-survey.adoc: deployments and new features should use `git repo structure`; its + same detail tables. During the deprecation phase, `git survey` is + a thin shim over `git repo structure`. See linkgit:git-repo[1]. + +-======= +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + Survey the repository and measure various dimensions of scale. + + As repositories grow to "monorepo" size, certain data shapes can cause + + ## builtin/fast-import.c ## + remerge CONFLICT (content): Merge conflict in builtin/fast-import.c + index 135c457ff2..921f9a6a6c 100644 + --- builtin/fast-import.c + +++ builtin/fast-import.c +@@ builtin/fast-import.c: static int store_object( + struct object_entry *e; + unsigned char hdr[96]; + struct object_id oid; +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + size_t hdrlen, deltalen = 0; +-======= +- size_t hdrlen, deltalen; +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + struct git_hash_ctx c; + git_zstream s; + struct repo_config_values *cfg = repo_config_values(the_repository); +@@ builtin/fast-import.c: static void cat_blob_write(const char *buf, unsigned long size) + static void cat_blob(struct object_entry *oe, struct object_id *oid) + { + struct strbuf line = STRBUF_INIT; +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + struct iovec iov[3]; +-======= +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + size_t size; + enum object_type type = 0; + char *buf; + + ## builtin/survey.c ## + remerge CONFLICT (add/add): Merge conflict in builtin/survey.c + index e86ab6a6af..d3b36b8914 100644 + --- builtin/survey.c + +++ builtin/survey.c @@ - #include "remote.h" - #include "trace2.h" - #include "odb.h" -+#include "transport.h" -+#include "url.h" - - static struct { - enum bundle_list_heuristic heuristic; -@@ bundle-uri.c: int fetch_bundle_uri(struct repository *r, const char *uri, - return result; + #define USE_THE_REPOSITORY_VARIABLE + + #include "builtin.h" +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + #include "color.h" + #include "exec-cmd.h" + #include "gettext.h" +@@ builtin/survey.c: int cmd_survey(int argc, const char **argv, const char *prefix, + /* unreachable: execv_git_cmd dies on failure */ + strvec_clear(&child_argv); + return 1; +-======= +-#include "config.h" +-#include "environment.h" +-#include "hex.h" +-#include "object.h" +-#include "odb.h" +-#include "object-name.h" +-#include "parse-options.h" +-#include "path-walk.h" +-#include "progress.h" +-#include "ref-filter.h" +-#include "refs.h" +-#include "revision.h" +-#include "strbuf.h" +-#include "strvec.h" +-#include "tag.h" +-#include "trace2.h" +-#include "color.h" +- +-static const char * const survey_usage[] = { +- N_("(EXPERIMENTAL!) git survey <options>"), +- NULL, +-}; +- +-struct survey_refs_wanted { +- int want_all_refs; /* special override */ +- +- int want_branches; +- int want_tags; +- int want_remotes; +- int want_detached; +- int want_other; /* see FILTER_REFS_OTHERS -- refs/notes/, refs/stash/ */ +-}; +- +-static struct survey_refs_wanted default_ref_options = { +- .want_all_refs = 1, +-}; +- +-struct survey_opts { +- int verbose; +- int show_progress; +- int top_nr; +- struct survey_refs_wanted refs; +-}; +- +-struct survey_report_ref_summary { +- size_t refs_nr; +- size_t branches_nr; +- size_t remote_refs_nr; +- size_t tags_nr; +- size_t tags_annotated_nr; +- size_t others_nr; +- size_t unknown_nr; +-}; +- +-struct survey_report_object_summary { +- size_t commits_nr; +- size_t tags_nr; +- size_t trees_nr; +- size_t blobs_nr; +-}; +- +-/** +- * For some category given by 'label', count the number of objects +- * that match that label along with the on-disk size and the size +- * after decompressing (both with delta bases and zlib). +- */ +-struct survey_report_object_size_summary { +- char *label; +- size_t nr; +- size_t disk_size; +- size_t inflated_size; +- size_t num_missing; +-}; +- +-typedef int (*survey_top_cmp)(void *v1, void *v2); +- +-static int cmp_by_nr(void *v1, void *v2) +-{ +- struct survey_report_object_size_summary *s1 = v1; +- struct survey_report_object_size_summary *s2 = v2; +- +- if (s1->nr < s2->nr) +- return -1; +- if (s1->nr > s2->nr) +- return 1; +- return 0; +-} +- +-static int cmp_by_disk_size(void *v1, void *v2) +-{ +- struct survey_report_object_size_summary *s1 = v1; +- struct survey_report_object_size_summary *s2 = v2; +- +- if (s1->disk_size < s2->disk_size) +- return -1; +- if (s1->disk_size > s2->disk_size) +- return 1; +- return 0; +-} +- +-static int cmp_by_inflated_size(void *v1, void *v2) +-{ +- struct survey_report_object_size_summary *s1 = v1; +- struct survey_report_object_size_summary *s2 = v2; +- +- if (s1->inflated_size < s2->inflated_size) +- return -1; +- if (s1->inflated_size > s2->inflated_size) +- return 1; +- return 0; +-} +- +-/** +- * Store a list of "top" categories by some sorting function. When +- * inserting a new category, reorder the list and free the one that +- * got ejected (if any). +- */ +-struct survey_report_top_table { +- const char *name; +- survey_top_cmp cmp_fn; +- size_t nr; +- size_t alloc; +- +- /** +- * 'data' stores an array of structs and must be cast into +- * the proper array type before evaluating an index. +- */ +- void *data; +-}; +- +-static void init_top_sizes(struct survey_report_top_table *top, +- size_t limit, const char *name, +- survey_top_cmp cmp) +-{ +- struct survey_report_object_size_summary *sz_array; +- +- top->name = name; +- top->cmp_fn = cmp; +- top->alloc = limit; +- top->nr = 0; +- +- CALLOC_ARRAY(sz_array, limit); +- top->data = sz_array; +-} +- +-MAYBE_UNUSED +-static void clear_top_sizes(struct survey_report_top_table *top) +-{ +- struct survey_report_object_size_summary *sz_array = top->data; +- +- for (size_t i = 0; i < top->nr; i++) +- free(sz_array[i].label); +- free(sz_array); +-} +- +-static void maybe_insert_into_top_size(struct survey_report_top_table *top, +- struct survey_report_object_size_summary *summary) +-{ +- struct survey_report_object_size_summary *sz_array = top->data; +- size_t pos = top->nr; +- +- /* Compare against list from the bottom. */ +- while (pos > 0 && top->cmp_fn(&sz_array[pos - 1], summary) < 0) +- pos--; +- +- /* Not big enough! */ +- if (pos >= top->alloc) +- return; +- +- /* We need to shift the data. */ +- if (top->nr == top->alloc) +- free(sz_array[top->nr - 1].label); +- else +- top->nr++; +- +- for (size_t i = top->nr - 1; i > pos; i--) +- memcpy(&sz_array[i], &sz_array[i - 1], sizeof(*sz_array)); +- +- memcpy(&sz_array[pos], summary, sizeof(*summary)); +- sz_array[pos].label = xstrdup(summary->label); +-} +- +-/** +- * This struct contains all of the information that needs to be printed +- * at the end of the exploration of the repository and its references. +- */ +-struct survey_report { +- struct survey_report_ref_summary refs; +- struct survey_report_object_summary reachable_objects; +- +- struct survey_report_object_size_summary *by_type; +- +- struct survey_report_top_table *top_paths_by_count; +- struct survey_report_top_table *top_paths_by_disk; +- struct survey_report_top_table *top_paths_by_inflate; +-}; +- +-#define REPORT_TYPE_COMMIT 0 +-#define REPORT_TYPE_TREE 1 +-#define REPORT_TYPE_BLOB 2 +-#define REPORT_TYPE_TAG 3 +-#define REPORT_TYPE_COUNT 4 +- +-struct survey_context { +- struct repository *repo; +- +- /* Options that control what is done. */ +- struct survey_opts opts; +- +- /* Info for output only. */ +- struct survey_report report; +- +- /* +- * The rest of the members are about enabling the activity +- * of the 'git survey' command, including ref listings, object +- * pointers, and progress. +- */ +- +- struct progress *progress; +- size_t progress_nr; +- size_t progress_total; +- +- struct strvec refs; +- struct ref_array ref_array; +-}; +- +-static void clear_survey_context(struct survey_context *ctx) +-{ +- ref_array_clear(&ctx->ref_array); +- strvec_clear(&ctx->refs); +-} +- +-struct survey_table { +- const char *table_name; +- struct strvec header; +- struct strvec *rows; +- size_t rows_nr; +- size_t rows_alloc; +-}; +- +-#define SURVEY_TABLE_INIT { \ +- .header = STRVEC_INIT, \ +-} +- +-static void clear_table(struct survey_table *table) +-{ +- strvec_clear(&table->header); +- for (size_t i = 0; i < table->rows_nr; i++) +- strvec_clear(&table->rows[i]); +- free(table->rows); +-} +- +-static void insert_table_rowv(struct survey_table *table, ...) +-{ +- va_list ap; +- char *arg; +- ALLOC_GROW(table->rows, table->rows_nr + 1, table->rows_alloc); +- +- memset(&table->rows[table->rows_nr], 0, sizeof(struct strvec)); +- +- va_start(ap, table); +- while ((arg = va_arg(ap, char *))) +- strvec_push(&table->rows[table->rows_nr], arg); +- va_end(ap); +- +- table->rows_nr++; +-} +- +-#define SECTION_SEGMENT "========================================" +-#define SECTION_SEGMENT_LEN 40 +-static const char *section_line = SECTION_SEGMENT +- SECTION_SEGMENT +- SECTION_SEGMENT +- SECTION_SEGMENT; +-static const size_t section_len = 4 * SECTION_SEGMENT_LEN; +- +-static void print_table_title(const char *name, size_t *widths, size_t nr) +-{ +- size_t width = 3 * (nr - 1); +- size_t min_width = strlen(name); +- +- for (size_t i = 0; i < nr; i++) +- width += widths[i]; +- +- if (width < min_width) +- width = min_width; +- +- if (width > section_len) +- width = section_len; +- +- printf("\n%s\n%.*s\n", name, (int)width, section_line); +-} +- +-static void print_row_plaintext(struct strvec *row, size_t *widths) +-{ +- static struct strbuf line = STRBUF_INIT; +- strbuf_setlen(&line, 0); +- +- for (size_t i = 0; i < row->nr; i++) { +- const char *str = row->v[i]; +- size_t len = strlen(str); +- if (i) +- strbuf_add(&line, " | ", 3); +- strbuf_addchars(&line, ' ', widths[i] - len); +- strbuf_add(&line, str, len); +- } +- printf("%s\n", line.buf); +-} +- +-static void print_divider_plaintext(size_t *widths, size_t nr) +-{ +- static struct strbuf line = STRBUF_INIT; +- strbuf_setlen(&line, 0); +- +- for (size_t i = 0; i < nr; i++) { +- if (i) +- strbuf_add(&line, "-+-", 3); +- strbuf_addchars(&line, '-', widths[i]); +- } +- printf("%s\n", line.buf); +-} +- +-static void print_table_plaintext(struct survey_table *table) +-{ +- size_t *column_widths; +- size_t columns_nr = table->header.nr; +- CALLOC_ARRAY(column_widths, columns_nr); +- +- for (size_t i = 0; i < columns_nr; i++) { +- column_widths[i] = strlen(table->header.v[i]); +- +- for (size_t j = 0; j < table->rows_nr; j++) { +- size_t rowlen = strlen(table->rows[j].v[i]); +- if (column_widths[i] < rowlen) +- column_widths[i] = rowlen; +- } +- } +- +- print_table_title(table->table_name, column_widths, columns_nr); +- print_row_plaintext(&table->header, column_widths); +- print_divider_plaintext(column_widths, columns_nr); +- +- for (size_t j = 0; j < table->rows_nr; j++) +- print_row_plaintext(&table->rows[j], column_widths); +- +- free(column_widths); +-} +- +-static void survey_report_plaintext_refs(struct survey_context *ctx) +-{ +- struct survey_report_ref_summary *refs = &ctx->report.refs; +- struct survey_table table = SURVEY_TABLE_INIT; +- +- table.table_name = _("REFERENCES SUMMARY"); +- +- strvec_push(&table.header, _("Ref Type")); +- strvec_push(&table.header, _("Count")); +- +- if (ctx->opts.refs.want_all_refs || ctx->opts.refs.want_branches) { +- char *fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)refs->branches_nr); +- insert_table_rowv(&table, _("Branches"), fmt, NULL); +- free(fmt); +- } +- +- if (ctx->opts.refs.want_all_refs || ctx->opts.refs.want_remotes) { +- char *fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)refs->remote_refs_nr); +- insert_table_rowv(&table, _("Remote refs"), fmt, NULL); +- free(fmt); +- } +- +- if (ctx->opts.refs.want_all_refs || ctx->opts.refs.want_tags) { +- char *fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)refs->tags_nr); +- insert_table_rowv(&table, _("Tags (all)"), fmt, NULL); +- free(fmt); +- fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)refs->tags_annotated_nr); +- insert_table_rowv(&table, _("Tags (annotated)"), fmt, NULL); +- free(fmt); +- } +- +- print_table_plaintext(&table); +- clear_table(&table); +-} +- +-static void survey_report_plaintext_reachable_object_summary(struct survey_context *ctx) +-{ +- struct survey_report_object_summary *objs = &ctx->report.reachable_objects; +- struct survey_table table = SURVEY_TABLE_INIT; +- char *fmt; +- +- table.table_name = _("REACHABLE OBJECT SUMMARY"); +- +- strvec_push(&table.header, _("Object Type")); +- strvec_push(&table.header, _("Count")); +- +- fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)objs->tags_nr); +- insert_table_rowv(&table, _("Tags"), fmt, NULL); +- free(fmt); +- +- fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)objs->commits_nr); +- insert_table_rowv(&table, _("Commits"), fmt, NULL); +- free(fmt); +- +- fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)objs->trees_nr); +- insert_table_rowv(&table, _("Trees"), fmt, NULL); +- free(fmt); +- +- fmt = xstrfmt("%"PRIuMAX"", (uintmax_t)objs->blobs_nr); +- insert_table_rowv(&table, _("Blobs"), fmt, NULL); +- free(fmt); +- +- print_table_plaintext(&table); +- clear_table(&table); +-} +- +-static void survey_report_object_sizes(const char *title, +- const char *categories, +- struct survey_report_object_size_summary *summary, +- size_t summary_nr) +-{ +- struct survey_table table = SURVEY_TABLE_INIT; +- table.table_name = title; +- +- strvec_push(&table.header, categories); +- strvec_push(&table.header, _("Count")); +- strvec_push(&table.header, _("Disk Size")); +- strvec_push(&table.header, _("Inflated Size")); +- +- for (size_t i = 0; i < summary_nr; i++) { +- char *label_str = xstrdup(summary[i].label); +- char *nr_str = xstrfmt("%"PRIuMAX, (uintmax_t)summary[i].nr); +- char *disk_str = xstrfmt("%"PRIuMAX, (uintmax_t)summary[i].disk_size); +- char *inflate_str = xstrfmt("%"PRIuMAX, (uintmax_t)summary[i].inflated_size); +- +- insert_table_rowv(&table, label_str, nr_str, +- disk_str, inflate_str, NULL); +- +- free(label_str); +- free(nr_str); +- free(disk_str); +- free(inflate_str); +- } +- +- print_table_plaintext(&table); +- clear_table(&table); +-} +- +-static void survey_report_plaintext_sorted_size( +- struct survey_report_top_table *top) +-{ +- survey_report_object_sizes(top->name, _("Path"), +- top->data, top->nr); +-} +- +-static void survey_report_plaintext(struct survey_context *ctx) +-{ +- printf("GIT SURVEY for \"%s\"\n", ctx->repo->worktree); +- printf("-----------------------------------------------------\n"); +- survey_report_plaintext_refs(ctx); +- survey_report_plaintext_reachable_object_summary(ctx); +- survey_report_object_sizes(_("TOTAL OBJECT SIZES BY TYPE"), +- _("Object Type"), +- ctx->report.by_type, +- REPORT_TYPE_COUNT); +- +- survey_report_plaintext_sorted_size( +- &ctx->report.top_paths_by_count[REPORT_TYPE_TREE]); +- survey_report_plaintext_sorted_size( +- &ctx->report.top_paths_by_count[REPORT_TYPE_BLOB]); +- +- survey_report_plaintext_sorted_size( +- &ctx->report.top_paths_by_disk[REPORT_TYPE_TREE]); +- survey_report_plaintext_sorted_size( +- &ctx->report.top_paths_by_disk[REPORT_TYPE_BLOB]); +- +- survey_report_plaintext_sorted_size( +- &ctx->report.top_paths_by_inflate[REPORT_TYPE_TREE]); +- survey_report_plaintext_sorted_size( +- &ctx->report.top_paths_by_inflate[REPORT_TYPE_BLOB]); +-} +- +-/* +- * After parsing the command line arguments, figure out which refs we +- * should scan. +- * +- * If ANY were given in positive sense, then we ONLY include them and +- * do not use the builtin values. +- */ +-static void fixup_refs_wanted(struct survey_context *ctx) +-{ +- struct survey_refs_wanted *rw = &ctx->opts.refs; +- +- /* +- * `--all-refs` overrides and enables everything. +- */ +- if (rw->want_all_refs == 1) { +- rw->want_branches = 1; +- rw->want_tags = 1; +- rw->want_remotes = 1; +- rw->want_detached = 1; +- rw->want_other = 1; +- return; +- } +- +- /* +- * If none of the `--<ref-type>` were given, we assume all +- * of the builtin unspecified values. +- */ +- if (rw->want_branches == -1 && +- rw->want_tags == -1 && +- rw->want_remotes == -1 && +- rw->want_detached == -1 && +- rw->want_other == -1) { +- *rw = default_ref_options; +- return; +- } +- +- /* +- * Since we only allow positive boolean values on the command +- * line, we will only have true values where they specified +- * a `--<ref-type>`. +- * +- * So anything that still has an unspecified value should be +- * set to false. +- */ +- if (rw->want_branches == -1) +- rw->want_branches = 0; +- if (rw->want_tags == -1) +- rw->want_tags = 0; +- if (rw->want_remotes == -1) +- rw->want_remotes = 0; +- if (rw->want_detached == -1) +- rw->want_detached = 0; +- if (rw->want_other == -1) +- rw->want_other = 0; +-} +- +-static int survey_load_config_cb(const char *var, const char *value, +- const struct config_context *cctx, void *pvoid) +-{ +- struct survey_context *ctx = pvoid; +- +- if (!strcmp(var, "survey.verbose")) { +- ctx->opts.verbose = git_config_bool(var, value); +- return 0; +- } +- if (!strcmp(var, "survey.progress")) { +- ctx->opts.show_progress = git_config_bool(var, value); +- return 0; +- } +- if (!strcmp(var, "survey.top")) { +- ctx->opts.top_nr = git_config_bool(var, value); +- return 0; +- } +- +- return git_default_config(var, value, cctx, pvoid); +-} +- +-static void survey_load_config(struct survey_context *ctx) +-{ +- repo_config(the_repository, survey_load_config_cb, ctx); +-} +- +-static void do_load_refs(struct survey_context *ctx, +- struct ref_array *ref_array) +-{ +- struct ref_filter filter = REF_FILTER_INIT; +- struct ref_sorting *sorting; +- struct string_list sorting_options = STRING_LIST_INIT_DUP; +- +- string_list_append(&sorting_options, "objectname"); +- sorting = ref_sorting_options(&sorting_options); +- +- if (ctx->opts.refs.want_detached) +- strvec_push(&ctx->refs, "HEAD"); +- +- if (ctx->opts.refs.want_all_refs) { +- strvec_push(&ctx->refs, "refs/"); +- } else { +- if (ctx->opts.refs.want_branches) +- strvec_push(&ctx->refs, "refs/heads/"); +- if (ctx->opts.refs.want_tags) +- strvec_push(&ctx->refs, "refs/tags/"); +- if (ctx->opts.refs.want_remotes) +- strvec_push(&ctx->refs, "refs/remotes/"); +- if (ctx->opts.refs.want_other) { +- strvec_push(&ctx->refs, "refs/notes/"); +- strvec_push(&ctx->refs, "refs/stash/"); +- } +- } +- +- filter.name_patterns = ctx->refs.v; +- filter.ignore_case = 0; +- filter.match_as_path = 1; +- +- if (ctx->opts.show_progress) { +- ctx->progress_total = 0; +- ctx->progress = start_progress(ctx->repo, +- _("Scanning refs..."), 0); +- } +- +- filter_refs(ref_array, &filter, FILTER_REFS_KIND_MASK); +- +- if (ctx->opts.show_progress) { +- ctx->progress_total = ref_array->nr; +- display_progress(ctx->progress, ctx->progress_total); +- } +- +- ref_array_sort(sorting, ref_array); +- +- stop_progress(&ctx->progress); +- ref_filter_clear(&filter); +- ref_sorting_release(sorting); +-} +- +-/* +- * The REFS phase: +- * +- * Load the set of requested refs and assess them for scalablity problems. +- * Use that set to start a treewalk to all reachable objects and assess +- * them. +- * +- * This data will give us insights into the repository itself (the number +- * of refs, the size and shape of the DAG, the number and size of the +- * objects). +- * +- * Theoretically, this data is independent of the on-disk representation +- * (e.g. independent of packing concerns). +- */ +-static void survey_phase_refs(struct survey_context *ctx) +-{ +- trace2_region_enter("survey", "phase/refs", ctx->repo); +- do_load_refs(ctx, &ctx->ref_array); +- +- ctx->report.refs.refs_nr = ctx->ref_array.nr; +- for (int i = 0; i < ctx->ref_array.nr; i++) { +- size_t size; +- struct ref_array_item *item = ctx->ref_array.items[i]; +- +- switch (item->kind) { +- case FILTER_REFS_TAGS: +- ctx->report.refs.tags_nr++; +- if (odb_read_object_info(ctx->repo->objects, +- &item->objectname, +- &size) == OBJ_TAG) +- ctx->report.refs.tags_annotated_nr++; +- break; +- +- case FILTER_REFS_BRANCHES: +- ctx->report.refs.branches_nr++; +- break; +- +- case FILTER_REFS_REMOTES: +- ctx->report.refs.remote_refs_nr++; +- break; +- +- case FILTER_REFS_OTHERS: +- ctx->report.refs.others_nr++; +- break; +- +- default: +- ctx->report.refs.unknown_nr++; +- break; +- } +- } +- +- trace2_region_leave("survey", "phase/refs", ctx->repo); +-} +- +-static void increment_object_counts( +- struct survey_report_object_summary *summary, +- enum object_type type, +- size_t nr) +-{ +- switch (type) { +- case OBJ_COMMIT: +- summary->commits_nr += nr; +- break; +- +- case OBJ_TREE: +- summary->trees_nr += nr; +- break; +- +- case OBJ_BLOB: +- summary->blobs_nr += nr; +- break; +- +- case OBJ_TAG: +- summary->tags_nr += nr; +- break; +- +- default: +- break; +- } +-} +- +-static void increment_totals(struct survey_context *ctx, +- struct oid_array *oids, +- struct survey_report_object_size_summary *summary) +-{ +- for (size_t i = 0; i < oids->nr; i++) { +- struct object_info oi = OBJECT_INFO_INIT; +- unsigned oi_flags = OBJECT_INFO_FOR_PREFETCH; +- size_t object_length = 0; +- off_t disk_sizep = 0; +- enum object_type type; +- +- oi.typep = &type; +- oi.sizep = &object_length; +- oi.disk_sizep = &disk_sizep; +- +- if (odb_read_object_info_extended(ctx->repo->objects, +- &oids->oid[i], +- &oi, oi_flags) < 0) { +- summary->num_missing++; +- } else { +- summary->nr++; +- summary->disk_size += disk_sizep; +- summary->inflated_size += object_length; +- } +- } +-} +- +-static void increment_object_totals(struct survey_context *ctx, +- struct oid_array *oids, +- enum object_type type, +- const char *path) +-{ +- struct survey_report_object_size_summary *total; +- struct survey_report_object_size_summary summary = { 0 }; +- +- increment_totals(ctx, oids, &summary); +- +- switch (type) { +- case OBJ_COMMIT: +- total = &ctx->report.by_type[REPORT_TYPE_COMMIT]; +- break; +- +- case OBJ_TREE: +- total = &ctx->report.by_type[REPORT_TYPE_TREE]; +- break; +- +- case OBJ_BLOB: +- total = &ctx->report.by_type[REPORT_TYPE_BLOB]; +- break; +- +- case OBJ_TAG: +- total = &ctx->report.by_type[REPORT_TYPE_TAG]; +- break; +- +- default: +- BUG("No other type allowed"); +- } +- +- total->nr += summary.nr; +- total->disk_size += summary.disk_size; +- total->inflated_size += summary.inflated_size; +- total->num_missing += summary.num_missing; +- +- if (type == OBJ_TREE || type == OBJ_BLOB) { +- int index = type == OBJ_TREE ? +- REPORT_TYPE_TREE : REPORT_TYPE_BLOB; +- struct survey_report_top_table *top; +- +- /* +- * Temporarily store (const char *) here, but it will +- * be duped if inserted and will not be freed. +- */ +- summary.label = (char *)path; +- +- top = ctx->report.top_paths_by_count; +- maybe_insert_into_top_size(&top[index], &summary); +- +- top = ctx->report.top_paths_by_disk; +- maybe_insert_into_top_size(&top[index], &summary); +- +- top = ctx->report.top_paths_by_inflate; +- maybe_insert_into_top_size(&top[index], &summary); +- } +-} +- +-static int survey_objects_path_walk_fn(const char *path, +- struct oid_array *oids, +- enum object_type type, +- void *data) +-{ +- struct survey_context *ctx = data; +- +- increment_object_counts(&ctx->report.reachable_objects, +- type, oids->nr); +- increment_object_totals(ctx, oids, type, path); +- +- ctx->progress_nr += oids->nr; +- display_progress(ctx->progress, ctx->progress_nr); +- +- return 0; +-} +- +-static void initialize_report(struct survey_context *ctx) +-{ +- CALLOC_ARRAY(ctx->report.by_type, REPORT_TYPE_COUNT); +- ctx->report.by_type[REPORT_TYPE_COMMIT].label = xstrdup(_("Commits")); +- ctx->report.by_type[REPORT_TYPE_TREE].label = xstrdup(_("Trees")); +- ctx->report.by_type[REPORT_TYPE_BLOB].label = xstrdup(_("Blobs")); +- ctx->report.by_type[REPORT_TYPE_TAG].label = xstrdup(_("Tags")); +- +- CALLOC_ARRAY(ctx->report.top_paths_by_count, REPORT_TYPE_COUNT); +- init_top_sizes(&ctx->report.top_paths_by_count[REPORT_TYPE_TREE], +- ctx->opts.top_nr, _("TOP DIRECTORIES BY COUNT"), cmp_by_nr); +- init_top_sizes(&ctx->report.top_paths_by_count[REPORT_TYPE_BLOB], +- ctx->opts.top_nr, _("TOP FILES BY COUNT"), cmp_by_nr); +- +- CALLOC_ARRAY(ctx->report.top_paths_by_disk, REPORT_TYPE_COUNT); +- init_top_sizes(&ctx->report.top_paths_by_disk[REPORT_TYPE_TREE], +- ctx->opts.top_nr, _("TOP DIRECTORIES BY DISK SIZE"), cmp_by_disk_size); +- init_top_sizes(&ctx->report.top_paths_by_disk[REPORT_TYPE_BLOB], +- ctx->opts.top_nr, _("TOP FILES BY DISK SIZE"), cmp_by_disk_size); +- +- CALLOC_ARRAY(ctx->report.top_paths_by_inflate, REPORT_TYPE_COUNT); +- init_top_sizes(&ctx->report.top_paths_by_inflate[REPORT_TYPE_TREE], +- ctx->opts.top_nr, _("TOP DIRECTORIES BY INFLATED SIZE"), cmp_by_inflated_size); +- init_top_sizes(&ctx->report.top_paths_by_inflate[REPORT_TYPE_BLOB], +- ctx->opts.top_nr, _("TOP FILES BY INFLATED SIZE"), cmp_by_inflated_size); +-} +- +-static void survey_phase_objects(struct survey_context *ctx) +-{ +- struct rev_info revs = REV_INFO_INIT; +- struct path_walk_info info = PATH_WALK_INFO_INIT; +- unsigned int add_flags = 0; +- +- trace2_region_enter("survey", "phase/objects", ctx->repo); +- +- info.revs = &revs; +- info.path_fn = survey_objects_path_walk_fn; +- info.path_fn_data = ctx; +- +- initialize_report(ctx); +- +- repo_init_revisions(ctx->repo, &revs, ""); +- revs.tag_objects = 1; +- +- ctx->progress_nr = 0; +- ctx->progress_total = ctx->ref_array.nr; +- if (ctx->opts.show_progress) +- ctx->progress = start_progress(ctx->repo, +- _("Preparing object walk"), +- ctx->progress_total); +- for (int i = 0; i < ctx->ref_array.nr; i++) { +- struct ref_array_item *item = ctx->ref_array.items[i]; +- add_pending_oid(&revs, NULL, &item->objectname, add_flags); +- display_progress(ctx->progress, ++(ctx->progress_nr)); +- } +- stop_progress(&ctx->progress); +- +- ctx->progress_nr = 0; +- ctx->progress_total = 0; +- if (ctx->opts.show_progress) +- ctx->progress = start_progress(ctx->repo, +- _("Walking objects"), 0); +- walk_objects_by_path(&info); +- stop_progress(&ctx->progress); +- +- release_revisions(&revs); +- trace2_region_leave("survey", "phase/objects", ctx->repo); +-} +- +-int cmd_survey(int argc, const char **argv, const char *prefix, struct repository *repo) +-{ +- static struct survey_context ctx = { +- .opts = { +- .verbose = 0, +- .show_progress = -1, /* defaults to isatty(2) */ +- .top_nr = 10, +- +- .refs.want_all_refs = -1, +- +- .refs.want_branches = -1, /* default these to undefined */ +- .refs.want_tags = -1, +- .refs.want_remotes = -1, +- .refs.want_detached = -1, +- .refs.want_other = -1, +- }, +- .refs = STRVEC_INIT, +- }; +- +- static struct option survey_options[] = { +- OPT__VERBOSE(&ctx.opts.verbose, N_("verbose output")), +- OPT_BOOL(0, "progress", &ctx.opts.show_progress, N_("show progress")), +- OPT_INTEGER('n', "top", &ctx.opts.top_nr, +- N_("number of entries to include in detail tables")), +- +- OPT_BOOL_F(0, "all-refs", &ctx.opts.refs.want_all_refs, N_("include all refs"), PARSE_OPT_NONEG), +- +- OPT_BOOL_F(0, "branches", &ctx.opts.refs.want_branches, N_("include branches"), PARSE_OPT_NONEG), +- OPT_BOOL_F(0, "tags", &ctx.opts.refs.want_tags, N_("include tags"), PARSE_OPT_NONEG), +- OPT_BOOL_F(0, "remotes", &ctx.opts.refs.want_remotes, N_("include all remotes refs"), PARSE_OPT_NONEG), +- OPT_BOOL_F(0, "detached", &ctx.opts.refs.want_detached, N_("include detached HEAD"), PARSE_OPT_NONEG), +- OPT_BOOL_F(0, "other", &ctx.opts.refs.want_other, N_("include notes and stashes"), PARSE_OPT_NONEG), +- +- OPT_END(), +- }; +- +- show_usage_with_options_if_asked(argc, argv, +- survey_usage, survey_options); +- +- if (isatty(2)) +- color_fprintf_ln(stderr, +- want_color_fd(2, GIT_COLOR_AUTO) ? GIT_COLOR_YELLOW : "", +- "(THIS IS EXPERIMENTAL, EXPECT THE OUTPUT FORMAT TO CHANGE!)"); +- +- ctx.repo = repo; +- +- prepare_repo_settings(ctx.repo); +- survey_load_config(&ctx); +- +- argc = parse_options(argc, argv, prefix, survey_options, survey_usage, 0); +- +- if (ctx.opts.show_progress < 0) +- ctx.opts.show_progress = isatty(2); +- +- fixup_refs_wanted(&ctx); +- +- survey_phase_refs(&ctx); +- +- survey_phase_objects(&ctx); +- +- survey_report_plaintext(&ctx); +- +- clear_survey_context(&ctx); +- return 0; +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) } + + ## ci/lib.sh ## + remerge CONFLICT (content): Merge conflict in ci/lib.sh + index 470de4d7cf..f31a36ceeb 100755 + --- ci/lib.sh + +++ ci/lib.sh +@@ ci/lib.sh: export SKIP_DASHED_BUILT_INS=YesPlease + # In order to catch bugs introduced at integration time by mismerges, + # enable the long tests for pushes to the integration branches as well. + test -z "$MSYSTEM" || +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + case "$CI_EVENT,$CI_BRANCH" in +-======= +-case "$GITHUB_EVENT_NAME,$CI_BRANCH" in +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + pull_request,*|push,*next*|push,*master*|push,*main*|push,*maint*) + export GIT_TEST_LONG=${GIT_TEST_LONG:-true} + ;; + + ## compat/mingw.c ## + remerge CONFLICT (content): Merge conflict in compat/mingw.c + index 31eb1d5073..df70bae6b6 100644 + --- compat/mingw.c + +++ compat/mingw.c +@@ compat/mingw.c: static void setup_windows_environment(void) -+/* protocol of 'uri', or "file" if it has none (bare/UNC/relative path) */ -+static void bundle_uri_protocol(const char *uri, struct strbuf *out) -+{ -+ const char *p = uri; -+ -+ while (is_urlschemechar(p == uri, *p)) -+ p++; -+ strbuf_reset(out); -+ if (p > uri && starts_with(p, "://")) -+ strbuf_add(out, uri, p - uri); -+ else -+ strbuf_addstr(out, "file"); -+} -+ -+/* Drop advertised URIs whose protocol is not allowed (see protocol.*.allow). */ -+static void sanitize_bundle_list(struct bundle_list *list) -+{ -+ struct remote_bundle_info **skipped; -+ size_t nr = 0, i; -+ struct remote_bundle_info *info; -+ struct hashmap_iter iter; -+ struct strbuf proto = STRBUF_INIT; -+ -+ ALLOC_ARRAY(skipped, hashmap_get_size(&list->bundles)); -+ hashmap_for_each_entry(&list->bundles, &iter, info, ent) { -+ if (!info->uri) -+ continue; -+ bundle_uri_protocol(info->uri, &proto); -+ /* advertised URIs are not user-provided */ -+ if (!is_transport_allowed(proto.buf, 0)) { -+ warning(_("skipping bundle URI '%s': protocol '%s' " -+ "is not allowed"), info->uri, proto.buf); -+ skipped[nr++] = info; -+ } -+ } -+ strbuf_release(&proto); -+ -+ for (i = 0; i < nr; i++) { -+ hashmap_remove(&list->bundles, &skipped[i]->ent, NULL); -+ clear_remote_bundle_info(skipped[i], NULL); -+ free(skipped[i]); -+ } -+ -+ free(skipped); -+} -+ - int fetch_bundle_list(struct repository *r, struct bundle_list *list) - { - int result; - struct bundle_list global_list; + if (!getenv("LC_ALL") && !getenv("LC_CTYPE") && !getenv("LANG")) + setenv("LC_CTYPE", "C.UTF-8", 1); +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + } -+ sanitize_bundle_list(list); -+ + int mingw_platform_has_symlinks(void) + { + static int has_symlinks = -1; +-======= +- +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) /* - * If the creationToken heuristic is used, then the URIs - * advertised by 'list' are not nested lists and instead + * Change 'core.symlinks' default to false, unless native symlinks are + * enabled in MSys2 (via 'MSYS=winsymlinks:nativestrict'). Thus we can + + ## compat/win32/path-utils.c ## + remerge CONFLICT (content): Merge conflict in compat/win32/path-utils.c + index 884796edaf..84b620756a 100644 + --- compat/win32/path-utils.c + +++ compat/win32/path-utils.c +@@ + + #include "../../git-compat-util.h" + #include "../../environment.h" +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + #include "../../repository.h" +-======= + #include "../../wrapper.h" + #include "../../strbuf.h" + #include "../../versioncmp.h" +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + + int win32_has_dos_drive_prefix(const char *path) + { + + ## config.mak.uname ## + remerge CONFLICT (content): Merge conflict in config.mak.uname + index f8b8e36f0c..17ca1e1439 100644 + --- config.mak.uname + +++ config.mak.uname +@@ config.mak.uname: endif + EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj kernel32.lib ntdll.lib + GITLIBS += git.res + PTHREAD_LIBS = +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + RC = lib/compat/vcbuild/scripts/rc.pl +-======= +- RC = compat/vcbuild/scripts/rc.pl +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + lib = + BASIC_CFLAGS += $(vcpkg_inc) $(sdk_includes) $(msvc_includes) + ifndef DEBUG - ## compat/win32/path-utils.h ## -@@ compat/win32/path-utils.h: int win32_fspathcmp(const char *a, const char *b); - int win32_fspathncmp(const char *a, const char *b, size_t count); - #define fspathncmp win32_fspathncmp + ## git-compat-util.h ## + remerge CONFLICT (content): Merge conflict in git-compat-util.h + index fedf83ec45..5973c9c77e 100644 + --- git-compat-util.h + +++ git-compat-util.h +@@ git-compat-util.h: static inline int is_xplatform_dir_sep(int c) + #include "compat/win32/path-utils.h" + #include "compat/msvc.h" + #include "compat/win32/fscache.h" +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + #endif + #ifdef DARWIN_REGEXEC + #include "compat/darwin.h" +-======= +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + #endif -+void win32_warn_about_git_lfs_on_windows7(int exit_code, const char *argv0); -+#define warn_about_git_lfs_on_windows7 win32_warn_about_git_lfs_on_windows7 -+ + /* used on Mac OS X */ +@@ git-compat-util.h: struct fscache; + #ifndef enable_fscache + #define enable_fscache(x) /* noop */ + #endif +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + #ifndef flush_fscache + #define flush_fscache() /* noop */ #endif +-======= +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + + #ifndef disable_fscache + #define disable_fscache() /* noop */ - ## refs/reftable-backend.c ## -@@ refs/reftable-backend.c: static struct ref_store *reftable_be_init(struct repository *repo, + ## object-file.c ## + remerge CONFLICT (content): Merge conflict in object-file.c + index c542e9aae4..08fa8086e3 100644 + --- object-file.c + +++ object-file.c +@@ object-file.c: int parse_loose_header(const char *hdr, struct object_info *oi) + return 0; + } - reftable_set_alloc(malloc, realloc, free); +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) +-======= +-static void hash_object_body(const struct git_hash_algo *algo, struct git_hash_ctx *c, +- const void *buf, size_t len, +- struct object_id *oid, +- char *hdr, size_t *hdrlen) +-{ +- algo->init_fn(c); +- git_hash_update(c, hdr, *hdrlen); +- git_hash_update(c, buf, len); +- git_hash_final_oid(oid, c); +-} +- +-void write_object_file_prepare(const struct git_hash_algo *algo, +- const void *buf, size_t len, +- enum object_type type, struct object_id *oid, +- char *hdr, size_t *hdrlen) +-{ +- struct git_hash_ctx c; +- +- /* Generate the header */ +- *hdrlen = format_object_header(hdr, *hdrlen, type, len); +- +- /* Hash (function pointers) computation */ +- hash_object_body(algo, &c, buf, len, oid, hdr, hdrlen); +-} +- +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + #define CHECK_COLLISION_DEST_VANISHED -2 -+ reftable_set_alloc(malloc, realloc, free); -+ - refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir, - &ref_common_dir); - - - ## run-command.c ## -@@ run-command.c: static int wait_or_whine(pid_t pid, const char *argv0, int in_signal) - */ - code += 128; - } else if (WIFEXITED(status)) { -+#ifdef GIT_WINDOWS_NATIVE -+ warn_about_git_lfs_on_windows7(status, argv0); -+#endif - code = WEXITSTATUS(status); - } else { - if (!in_signal) + static int check_collision(const char *source, const char *dest) +@@ object-file.c: void hash_object_file(const struct git_hash_algo *algo, const void *buf, + { + struct git_hash_ctx c; + char hdr[MAX_HEADER_LEN]; +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + int hdrlen; +-======= +- size_t hdrlen = sizeof(hdr); +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + + hdrlen = format_object_header(hdr, sizeof(hdr), type, len); + + + ## object-file.h ## + remerge CONFLICT (content): Merge conflict in object-file.h + index 69b5f6519a..f44758c4f8 100644 + --- object-file.h + +++ object-file.h +@@ object-file.h: int finalize_object_file_flags(struct repository *repo, + void hash_object_file(const struct git_hash_algo *algo, const void *buf, + size_t len, enum object_type type, + struct object_id *oid); +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) +-======= +-void write_object_file_prepare(const struct git_hash_algo *algo, +- const void *buf, size_t len, +- enum object_type type, struct object_id *oid, +- char *hdr, size_t *hdrlen); +-int write_loose_object(struct odb_source_loose *loose, +- const struct object_id *oid, char *hdr, +- int hdrlen, const void *buf, unsigned long len, +- time_t mtime, unsigned flags); +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + + /* Helper to check and "touch" a file */ + int check_and_freshen_file(const char *fn, int freshen, + + ## odb/source-loose.c ## + remerge CONFLICT (content): Merge conflict in odb/source-loose.c + index 110ccb5022..bb3455dfbd 100644 + --- odb/source-loose.c + +++ odb/source-loose.c +@@ odb/source-loose.c: static int write_loose_object(struct odb_source_loose *loose, + + static int odb_source_loose_write_object(struct odb_source *source, + const void *buf, size_t len, +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + enum object_type type, + const struct object_id *oid, + const struct object_id *compat_oid, + const time_t *mtime, +-======= +- enum object_type type, struct object_id *oid, +- struct object_id *compat_oid_in, +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + enum odb_write_object_flags flags) + { + struct odb_source_loose *loose = odb_source_loose_downcast(source); + char hdr[MAX_HEADER_LEN]; +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + int hdrlen; +-======= +- size_t hdrlen = sizeof(hdr); +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + + hdrlen = format_object_header(hdr, sizeof(hdr), type, len); + + + ## send-pack.c ## + remerge CONFLICT (content): Merge conflict in send-pack.c + index 1192aa54a8..0d3a0d330c 100644 + --- send-pack.c + +++ send-pack.c +@@ send-pack.c: int send_pack(struct repository *r, + allow_deleting_refs = 1; + if (server_supports("ofs-delta")) + args->use_ofs_delta = 1; +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + if (server_supports("no-ref-delta")) + args->no_ref_delta = 1; +-======= +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + use_sideband = use_sideband && server_supports("side-band-64k"); + if (server_supports("quiet")) + quiet_supported = 1; ## t/lib-bundle-uri-protocol.sh ## + remerge CONFLICT (content): Merge conflict in t/lib-bundle-uri-protocol.sh + index 167c99160d..889e673a44 100644 + --- t/lib-bundle-uri-protocol.sh + +++ t/lib-bundle-uri-protocol.sh @@ t/lib-bundle-uri-protocol.sh: test_expect_success "test bundle-uri with $BUNDLE_URI_PROTOCOL:// using protocol - >actual && test_cmp_config_output expect actual ' -+ -+# Advertised bundle URIs are subject to protocol.*.allow; "file" (and bare or -+# UNC paths) is denied by default, so such a URI must be skipped, not fetched. -+advertise_uri () { -+ test_config -C "$BUNDLE_URI_PARENT" bundle.version 1 && -+ test_config -C "$BUNDLE_URI_PARENT" bundle.mode all && -+ test_config -C "$BUNDLE_URI_PARENT" bundle.payload.uri "$1" -+} -+ -+ignores_advertised_uri () { -+ rm -rf victim && -+ advertise_uri "$1" && -+ git -c transfer.bundleURI=true -c protocol.version=2 \ -+ clone "$BUNDLE_URI_REPO_URI" victim && -+ git -C victim for-each-ref refs/bundles/ >refs && -+ test_must_be_empty refs -+} -+ -+test_expect_success "create bundle to advertise" ' -+ git -C "$BUNDLE_URI_PARENT" bundle create "$PWD/payload.bundle" main -+' -+ -+test_expect_success "ignore non-HTTP(S) bundle URI with $BUNDLE_URI_PROTOCOL://" ' -+ ignores_advertised_uri "$PWD/payload.bundle" && -+ ignores_advertised_uri "file://$PWD/payload.bundle" -+' -+ -+test_expect_success "protocol.file.allow=always honors file bundle URI with $BUNDLE_URI_PROTOCOL://" ' -+ rm -rf victim && -+ advertise_uri "$PWD/payload.bundle" && -+ git -c transfer.bundleURI=true -c protocol.version=2 \ -+ -c protocol.file.allow=always \ -+ clone "$BUNDLE_URI_REPO_URI" victim && -+ git -C victim rev-parse --verify refs/bundles/heads/main + +-<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + test_expect_success "test bundle-uri with $BUNDLE_URI_PROTOCOL:// using protocol v2 with empty value" ' + test_config -C "$BUNDLE_URI_PARENT" \ + bundle.bundle1.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-1.bdl" && +@@ t/lib-bundle-uri-protocol.sh: test_expect_success "test bundle-uri with $BUNDLE_URI_PROTOCOL:// using protocol + "$BUNDLE_URI_REPO_URI" \ + >actual && + test_cmp_config_output expect actual +-======= +' + -+# same path via a UNC administrative share (cf. t5580-unc-paths.sh) -+if test_have_prereq CYGWIN -+then -+ UNCPATH="$(cygpath -aw .)" -+elif test_have_prereq MINGW -+then -+ UNCPATH="$(pwd)" -+fi -+case "$UNCPATH" in -+[A-Za-z]:*) -+ WITHOUTDRIVE="${UNCPATH#?:}" -+ UNCPATH="//localhost/${UNCPATH%%:*}\$$WITHOUTDRIVE" -+ test -d "$UNCPATH" && test_set_prereq ADMIN_UNC -+ ;; -+esac -+ -+test_expect_success ADMIN_UNC "ignore UNC bundle URI with $BUNDLE_URI_PROTOCOL://" ' -+ ignores_advertised_uri "$UNCPATH/payload.bundle" && -+ ignores_advertised_uri "file://$UNCPATH/payload.bundle" -+' + # Advertised bundle URIs are subject to protocol.*.allow; "file" (and bare or + # UNC paths) is denied by default, so such a URI must be skipped, not fetched. + advertise_uri () { +@@ t/lib-bundle-uri-protocol.sh: esac + test_expect_success ADMIN_UNC "ignore UNC bundle URI with $BUNDLE_URI_PROTOCOL://" ' + ignores_advertised_uri "$UNCPATH/payload.bundle" && + ignores_advertised_uri "file://$UNCPATH/payload.bundle" +->>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + ' + + ## t/t1007-hash-object.sh ## + remerge CONFLICT (content): Merge conflict in t/t1007-hash-object.sh + index a05be5163d..983bd02b17 100755 + --- t/t1007-hash-object.sh + +++ t/t1007-hash-object.sh +@@ t/t1007-hash-object.sh: test_expect_success EXPENSIVE,SIZE_T_IS_64BIT \ + + # This clean filter does nothing, other than excercising the interface. + # We ensure that cleaning doesn't mangle large files on 64-bit Windows. +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \ +-================================ +-test_expect_success EXPENSIVE,SIZE_T_IS_64BIT \ +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + 'hash filtered files over 4GB correctly' ' + { test -f big || test-tool genzeros $((5*1024*1024*1024)) >big; } && + test_oid large5GB >expect && + + ## t/t1517-outside-repo.sh ## + remerge CONFLICT (content): Merge conflict in t/t1517-outside-repo.sh + index c8ed6996ab..efbac29c0e 100755 + --- t/t1517-outside-repo.sh + +++ t/t1517-outside-repo.sh +@@ t/t1517-outside-repo.sh: do + http-backend | http-fetch | http-push | init-db | \ + mktag | p4 | p4.py | pickaxe | remote-ftp | remote-ftps | \ + remote-http | remote-https | replay | send-email | \ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + sh-i18n--envsubst | shell | show | stage | survey | \ + upload-archive--writer | upload-pack | whatchanged) + h_expect_outcome=expect_failure +@@ t/t1517-outside-repo.sh: do + h_expect_outcome=expect_success + all_expect_outcome=expect_failure + ;; +-================================ +- sh-i18n--envsubst | shell | show | stage | submodule | survey | svn | \ +- upload-archive--writer | upload-pack | web--browse | whatchanged) +- expect_outcome=expect_failure ;; +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + *) + h_expect_outcome=expect_success + all_expect_outcome=expect_success - ## t/t7502-commit-porcelain.sh ## -@@ t/t7502-commit-porcelain.sh: test_expect_success 'cleanup commit messages (scissors option,-F,-e, scissors on - test_must_be_empty actual + ## t/t2031-checkout-long-paths.sh ## + remerge CONFLICT (add/add): Merge conflict in t/t2031-checkout-long-paths.sh + index 624aa4037a..4278a602cb 100755 + --- t/t2031-checkout-long-paths.sh + +++ t/t2031-checkout-long-paths.sh +@@ t/t2031-checkout-long-paths.sh: test_expect_success setup ' + test_expect_success 'checkout of long paths without core.longpaths fails' ' + git config core.longpaths false && + test_must_fail git checkout -f 2>error && +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + test_grep -q "Filename too long" error && +-================================ +- grep -q "Filename too long" error && +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + test ! -d longpa* ' -+test_expect_success 'helper-editor' ' -+ -+ write_script lf-to-crlf.sh <<-\EOF -+ sed "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new && -+ mv -f "$1".new "$1" -+ EOF -+' -+ -+test_expect_success 'cleanup commit messages (scissors option,-F,-e, CR/LF line endings)' ' -+ -+ test_config core.editor "\"$PWD/lf-to-crlf.sh\"" && -+ scissors="# ------------------------ >8 ------------------------" && -+ -+ test_write_lines >text \ -+ "# Keep this comment" "" " $scissors" \ -+ "# Keep this comment, too" "$scissors" \ -+ "# Remove this comment" "$scissors" \ -+ "Remove this comment, too" && -+ -+ test_write_lines >expect \ -+ "# Keep this comment" "" " $scissors" \ -+ "# Keep this comment, too" && -+ -+ git commit --cleanup=scissors -e -F text --allow-empty && -+ git cat-file -p HEAD >raw && -+ sed -e "1,/^\$/d" raw >actual && -+ test_cmp expect actual -+' -+ -+test_expect_success 'cleanup commit messages (scissors option,-F,-e, scissors on first line, CR/LF line endings)' ' -+ -+ scissors="# ------------------------ >8 ------------------------" && -+ test_write_lines >text \ -+ "$scissors" \ -+ "# Remove this comment and any following lines" && -+ cp text /tmp/test2-text && -+ git commit --cleanup=scissors -e -F text --allow-empty --allow-empty-message && -+ git cat-file -p HEAD >raw && -+ sed -e "1,/^\$/d" raw >actual && -+ test_must_be_empty actual -+' -+ - test_expect_success 'cleanup commit messages (strip option,-F)' ' +@@ t/t2031-checkout-long-paths.sh: test_expect_success SYMLINKS_WINDOWS 'leave drive-less, short paths intact' ' + git update-index --add --cacheinfo 120000,$symlink_target_oid,PF && + git -c core.symlinks=true checkout -- PF && + cmd //c dir >actual && +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + test_grep "<SYMLINKD\\?> *PF *\\[\\\\Program Files\\]" actual +-================================ +- grep "<SYMLINKD\\?> *PF *\\[\\\\Program Files\\]" actual +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + ' + + test_done + + ## t/t6403-merge-file.sh ## + remerge CONFLICT (content): Merge conflict in t/t6403-merge-file.sh + index 1d8ce8be06..bd58e471bc 100755 + --- t/t6403-merge-file.sh + +++ t/t6403-merge-file.sh +@@ t/t6403-merge-file.sh: test_expect_success "expected conflict markers" ' + test_expect_success 'binary files cannot be merged' ' + test_must_fail git merge-file -p \ + orig.txt "$TEST_DIRECTORY"/lib-diff/test-binary-1.png new1.txt 2> merge.err && +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + test_grep "Cannot merge binary files" merge.err +-================================ +- grep "Cannot merge binary files" merge.err +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + ' + + test_expect_success 'binary files cannot be merged with --object-id' ' + + ## t/t8100-git-survey.sh ## + remerge CONFLICT (add/add): Merge conflict in t/t8100-git-survey.sh + index deeca520fc..a69d8f2672 100755 + --- t/t8100-git-survey.sh + +++ t/t8100-git-survey.sh +@@ + #!/bin/sh + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + test_description='git survey (deprecated shim over `git repo structure`)' +-================================ +-test_description='git survey' +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + + GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main + export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME +@@ t/t8100-git-survey.sh: export TEST_PASSES_SANITIZE_LEAK + + . ./test-lib.sh + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + test_expect_success 'git survey -h shows the deprecated banner' ' + test_expect_code 0 git survey -h >usage && + test_grep "DEPRECATED!" usage +-================================ +-test_expect_success 'git survey -h shows experimental warning' ' +- test_expect_code 129 git survey -h >usage && +- grep "EXPERIMENTAL!" usage +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + ' + + test_expect_success 'create a semi-interesting repo' ' +@@ t/t8100-git-survey.sh: test_expect_success 'create a semi-interesting repo' ' + git update-ref -d refs/tags/two + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 4ccf71f658 (fixup??? survey: stub in new experimental 'git-survey' command) + test_expect_success 'survey prints a deprecation warning' ' + git survey --all-refs >out 2>err && + test_grep "is deprecated" err +@@ t/t8100-git-survey.sh: test_expect_success 'survey --branches translates to a refs/heads/* filter' ' + git repo structure --top=10 \ + --ref-filter="refs/heads/*" >expected && + test_cmp expected out +-================================ +-test_expect_success 'git survey --progress' ' +- GIT_PROGRESS_DELAY=0 git survey --all-refs --progress >out 2>err && +- grep "Preparing object walk" err +-' +- +-approximate_sizes() { +- # very simplistic approximate rounding +- sed -Ee "s/ *(1[0-9][0-9])( |$)/ ~0.1kB\2/g" \ +- -e "s/ *(4[6-9][0-9]|5[0-6][0-9])( |$)/ ~0.5kB\2/g" \ +- -e "s/ *(5[6-9][0-9]|6[0-6][0-9])( |$)/ ~0.6kB\2/g" \ +- -e "s/ *1(4[89][0-9]|5[0-8][0-9])( |$)/ ~1.5kB\2/g" \ +- -e "s/ *1(69[0-9]|7[0-9][0-9])( |$)/ ~1.7kB\2/g" \ +- -e "s/ *1(79[0-9]|8[0-9][0-9])( |$)/ ~1.8kB\2/g" \ +- -e "s/ *2(1[0-9][0-9]|20[0-1])( |$)/ ~2.1kB\2/g" \ +- -e "s/ *2(3[0-9][0-9]|4[0-1][0-9])( |$)/ ~2.3kB\2/g" \ +- -e "s/ *2(5[0-9][0-9]|6[0-1][0-9])( |$)/ ~2.5kB\2/g" \ +- "$@" +-} +- +-test_expect_success 'git survey (default)' ' +- git survey --all-refs >out 2>err && +- test_line_count = 0 err && +- +- test_oid_cache <<-EOF && +- commits_sizes sha1:~1.5kB | ~2.1kB +- commits_sizes sha256:~1.8kB | ~2.5kB +- trees_sizes sha1:~0.5kB | ~1.7kB +- trees_sizes sha256:~0.6kB | ~2.3kB +- blobs_sizes sha1:~0.1kB | ~0.1kB +- blobs_sizes sha256:~0.1kB | ~0.1kB +- tags_sizes sha1:~0.5kB | ~0.5kB +- tags_sizes sha256:~0.5kB | ~0.6kB +- EOF +- +- tr , " " >expect <<-EOF && +- GIT SURVEY for "$(pwd)" +- ----------------------------------------------------- +- +- REFERENCES SUMMARY +- ======================== +- , Ref Type | Count +- -----------------+------ +- , Branches | 1 +- Remote refs | 0 +- Tags (all) | 2 +- Tags (annotated) | 2 +- +- REACHABLE OBJECT SUMMARY +- ======================== +- Object Type | Count +- ------------+------ +- Tags | 4 +- Commits | 10 +- Trees | 10 +- Blobs | 10 +- +- TOTAL OBJECT SIZES BY TYPE +- =============================================== +- Object Type | Count | Disk Size | Inflated Size +- ------------+-------+-----------+-------------- +- Commits | 10 | $(test_oid commits_sizes) +- Trees | 10 | $(test_oid trees_sizes) +- Blobs | 10 | $(test_oid blobs_sizes) +- Tags | 4 | $(test_oid tags_sizes) +- EOF +- +- approximate_sizes out >out-edited && +- lines=$(wc -l <expect) && +- head -n "$lines" <out-edited >out-trimmed && +- test_cmp expect out-trimmed && +- +- for type in "DIRECTORIES" "FILES" +- do +- for metric in "COUNT" "DISK SIZE" "INFLATED SIZE" +- do +- grep "TOP $type BY $metric" out || return 1 +- done || return 1 +- done +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> a93524749d (bundle-uri: refuse advertised URIs by protocol) + ' - echo >>negative && + test_doneTo: ebbbe3cb7d (Merge tag 'v2.55.0.windows.4', 2026-08-11) (5934c04d8c..ebbbe3cb7d)
Statistics
Range-diff (click to expand)
^$false match at end of filegit addissue with NTFS junctions.git/branches/in the templatesTruncated; see the full conflict report in the workflow run summary.