Rebase shears/next: 2 conflict(s) (0 skipped, 2 resolved) (#34304644398) - #431
Open
gitforwindowshelper[bot] wants to merge 334 commits into
Open
gitforwindowshelper[bot] wants to merge 334 commits into
gitforwindowshelper[bot] wants to merge 334 commits into
Conversation
It is merely a historical wart that, say, `git-commit` exists in the `libexec/git-core/` directory, a tribute to the original idea to let Git be essentially a bunch of Unix shell scripts revolving around very few "plumbing" (AKA low-level) commands. Git has evolved a lot from there. These days, most of Git's functionality is contained within the `git` executable, in the form of "built-in" commands. To accommodate for scripts that use the "dashed" form of Git commands, even today, Git provides hard-links that make the `git` executable available as, say, `git-commit`, just in case that an old script has not been updated to invoke `git commit`. Those hard-links do not come cheap: they take about half a minute for every build of Git on Windows, they are mistaken for taking up huge amounts of space by some Windows Explorer versions that do not understand hard-links, and therefore many a "bug" report had to be addressed. The "dashed form" has been officially deprecated in Git version 1.5.4, which was released on February 2nd, 2008, i.e. a very long time ago. This deprecation was never finalized by skipping these hard-links, but we can start the process now, in Git for Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In 436a422 (max_tree_depth: lower it for clangarm64 on Windows, 2025-04-23), I provided a work-around for a nasty issue with clangarm builds, where the stack is exhausted before the maximal tree depth is reached, and the resulting error cannot easily be handled by Git (because it would require Windows-specific handling). Turns out that this is not at all limited to ARM64. In my tests with CLANG64 in MSYS2 on the GitHub Actions runners, the test t6700.4 failed in the exact same way. What's worse: The limit needs to be quite a bit lower for x86_64 than for aarch64. In aforementioned tests, the breaking point was 1232: With 1231 it still worked as expected, with 1232 it would fail with the `STATUS_STACK_OVERFLOW` incorrectly mapped to exit code 127. For comparison, in my tests on GitHub Actions' Windows/ARM64 runners, the breaking point was 1439 instead. Therefore the condition needs to be adapted once more, to accommodate (with some safety margin) both aarch64 and x86_64 in clang-based builds on Windows, to let that test pass. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ctory Internally, Git expects the environment variable `HOME` to be set, and to point to the current user's home directory. This environment variable is not set by default on Windows, and therefore Git tries its best to construct one if it finds `HOME` unset. There are actually two different approaches Git tries: first, it looks at `HOMEDRIVE`/`HOMEPATH` because this is widely used in corporate environments with roaming profiles, and a user generally wants their global Git settings to be in a roaming profile. Only when `HOMEDRIVE`/`HOMEPATH` is either unset or does not point to a valid location, Git will fall back to using `USERPROFILE` instead. However, starting with Windows Vista, for secondary logons and services, the environment variables `HOMEDRIVE`/`HOMEPATH` point to Windows' system directory (usually `C:\Windows\system32`). That is undesirable, and that location is usually write-protected anyway. So let's verify that the `HOMEDRIVE`/`HOMEPATH` combo does not point to Windows' system directory before using it, falling back to `USERPROFILE` if it does. This fixes git-for-windows#2709 Initial-Path-by: Ivan Pozdeev <vano@mail.mipt.ru> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
headless-git is a git executable without opening a console window. It is useful when other GUI executables want to call git. We should install it together with git on Windows. Signed-off-by: Yuyi Wang <Strawberry_Str@hotmail.com>
winuser.h contains the definition of RT_MANIFEST that our LLVM based toolchain needs to understand that we want to embed compat/win32/git.manifest as an application manifest. It currently just embeds it as additional data that Windows doesn't understand. This also helps our GCC based toolchain understand that we only want one copy embedded. It currently embeds one working assembly manifest and one nearly identical, but useless copy as additional data. This also teaches our Visual Studio based buildsystems to pick up the manifest file from git.rc. This means we don't have to explicitly specify it in contrib/buildsystems/Generators/Vcxproj.pm anymore. Slightly counter-intuitively this also means we have to explicitly tell Cmake not to embed a default manifest. This fixes git-for-windows#4707 Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
This will help with Git for Windows' maintenance going forward: It allows Git for Windows to switch its primary libcurl to a variant without the OpenSSL backend, while still loading an alternate when setting `http.sslBackend = openssl`. This is necessary to avoid maintenance headaches with upgrading OpenSSL: its major version name is encoded in the shared library's file name and hence major version updates (temporarily) break libraries that are linked against the OpenSSL library. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In Git for Windows v2.39.0, we fixed a regression where `git.exe` would no longer work in Windows Nano Server (frequently used in Docker containers). This GitHub workflow can be used to verify manually that the Git/Scalar executables work in Nano Server. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When running Git for Windows on a remote APFS filesystem, it would appear that the `mingw_open_append()`/`write()` combination would fail almost exactly like on some CIFS-mounted shares as had been reported in git-for-windows#2753, albeit with a different `errno` value. Let's handle that `errno` value just the same, by suggesting to set `windows.appendAtomically=false`. Signed-off-by: David Lomas <dl3@pale-eds.co.uk> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Windows 10 version 1511 (also known as Anniversary Update), according to https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences introduced native support for ANSI sequence processing. This allows using colors from the entire 24-bit color range. All we need to do is test whether the console's "virtual processing support" can be enabled. If it can, we do not even need to start the `console_thread` to handle ANSI sequences. Or, almost all we need to do: When `console_thread()` does its work, it uses the Unicode-aware `write_console()` function to write to the Win32 Console, which supports Git for Windows' implicit convention that all text that is written is encoded in UTF-8. The same is not necessarily true if native ANSI sequence processing is used, as the output is then subject to the current code page. Let's ensure that the code page is set to `CP_UTF8` as long as Git writes to it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
By default, the buffer type of Windows' `stdout` is unbuffered (_IONBF), and there is no need to manually fflush `stdout`. But some programs, such as the Windows Filtering Platform driver provided by the security software, may change the buffer type of `stdout` to full buffering. This nees `fflush(stdout)` to be called manually, otherwise there will be no output to `stdout`. Signed-off-by: MinarKotonoha <chengzhuo5@qq.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A long time ago, we decided to run tests in Git for Windows' SDK with the default `winsymlinks` mode: copying instead of linking. This is still the default mode of MSYS2 to this day. However, this is not how most users run Git for Windows: As the majority of Git for Windows' users seem to be on Windows 10 and newer, likely having enabled Developer Mode (which allows creating symbolic links without administrator privileges), they will run with symlink support enabled. This is the reason why it is crucial to get the fixes for CVE-2024-? to the users, and also why it is crucial to ensure that the test suite exercises the related test cases. This commit ensures the latter. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In order to be a better Windows citizenship, Git should save its configuration files on AppData folder. This can enables git configuration files be replicated between machines using the same Microsoft account logon which would reduce the friction of setting up Git on new systems. Therefore, if %APPDATA%\Git\config exists, we use it; otherwise $HOME/.config/git/config is used. Signed-off-by: Ariel Lourenco <ariellourenco@users.noreply.github.com>
The sparse tree walk algorithm was created in d5d2e93 (revision: implement sparse algorithm, 2019-01-16) and involves using the mark_trees_uninteresting_sparse() method. This method takes a repository and an oidset of tree IDs, some of which have the UNINTERESTING flag and some of which do not. Create a method that has an equivalent set of preconditions but uses a "dense" walk (recursively visits all reachable trees, as long as they have not previously been marked UNINTERESTING). This is an important difference from mark_tree_uninteresting(), which short-circuits if the given tree has the UNINTERESTING flag. A use of this method will be added in a later change, with a condition set whether the sparse or dense approach should be used. Signed-off-by: Derrick Stolee <stolee@gmail.com>
While this command is definitely something we _want_, chances are that upstreaming this will require substantial changes. We still want to be able to experiment with this before that, to focus on what we need out of this command: To assist with diagnosing issues with large repositories, as well as to help monitoring the growth and the associated painpoints of such repositories. To that end, we are about to integrate this command into `microsoft/git`, to get the tool into the hands of users who need it most, with the idea to iterate in close collaboration between these users and the developers familar with Git's internals. However, we will definitely want to avoid letting anybody have the impression that this command, its exact inner workings, as well as its output format, are anywhere close to stable. To make that fact utterly clear (and thereby protect the freedom to iterate and innovate freely before upstreaming the command), let's mark its output as experimental in all-caps, as the first thing we do. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In 245670c (credential-cache: check for windows specific errors, 2021-09-14) we concluded that on Windows we would always encounter ENETDOWN where we would expect ECONNREFUSED on POSIX systems, when connecting to unix sockets. As reported in [1], we do encounter ECONNREFUSED on Windows if the socket file doesn't exist, but the containing directory does and ENETDOWN if neither exists. We should handle this case like we do on non-windows systems. [1] git-for-windows#4762 (comment) This fixes git-for-windows#5314 Helped-by: M Hickford <mirth.hickford@gmail.com> Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The reftable library goes out of its way to use its own set of allocator functions that can be configured using `reftable_set_alloc()`. However, Git does not configure this. That is not typically a problem, except when Git uses a custom allocator via some definitions in `git-compat-util.h`, as is the case in Git for Windows (which switched away from the long-unmaintained nedmalloc to mimalloc). Then, it is quite possible that Git assigns a `strbuf` (allocated via the custom allocator) to, say, the `refname` field of a `reftable_log_record` in `write_transaction_table()`, and later on asks the reftable library function `reftable_log_record_release()` to release it, but that function was compiled without using `git-compat-util.h` and hence calls regular `free()` (i.e. _not_ the custom allocator's own function). This has been a problem for a long time and it was a matter of some sort of "luck" that 1) reftables are not commonly used on Windows, and 2) mimalloc can often ignore gracefully when it is asked to release memory that it has not allocated. However, a recent update to `seen` brought this problem to the forefront, letting t1460 fail in Git for Windows, with symptoms much in the same way as the problem I had to address in d02c37c (t-reftable-basics: allow for `malloc` to be `#define`d, 2025-01-08) where exit code 127 was also produced in lieu of `STATUS_HEAP_CORRUPTION` (C0000374) because exit codes are only 7 bits wide. It was not possible to figure out what change in particular caused these new failures within a reasonable time frame, as there are too many changes in `seen` that conflict with Git for Windows' patches, I had to stop the investigation after spending four hours on it fruitlessly. To verify that this patch fixes the issue, I avoided using mimalloc and temporarily patched in a "custom allocator" that would more reliably point out problems, like this: diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c index 68f3829..9421d630b9f5 100644 --- a/refs/reftable-backend.c +++ b/refs/reftable-backend.c @@ -353,6 +353,69 @@ static int reftable_be_fsync(int fd) return fsync_component(FSYNC_COMPONENT_REFERENCE, fd); } +#define DEBUG_REFTABLE_ALLOC +#ifdef DEBUG_REFTABLE_ALLOC +#include "khash.h" + +static inline khint_t __ac_X31_hash_ptr(void *ptr) +{ + union { + void *ptr; + char s[sizeof(void *)]; + } u; + size_t i; + khint_t h; + + u.ptr = ptr; + h = (khint_t)*u.s; + for (i = 0; i < sizeof(void *); i++) + h = (h << 5) - h + (khint_t)u.s[i]; + return h; +} + +#define kh_ptr_hash_func(key) __ac_X31_hash_ptr(key) +#define kh_ptr_hash_equal(a, b) ((a) == (b)) + +KHASH_INIT(ptr, void *, int, 0, kh_ptr_hash_func, kh_ptr_hash_equal) + +static kh_ptr_t *my_malloced; + +static void *my_malloc(size_t sz) +{ + int dummy; + void *ptr = malloc(sz); + if (ptr) + kh_put_ptr(my_malloced, ptr, &dummy); + return ptr; +} + +static void *my_realloc(void *ptr, size_t sz) +{ + int dummy; + if (ptr) { + khiter_t pos = kh_get_ptr(my_malloced, ptr); + if (pos >= kh_end(my_malloced)) + die("Was not my_malloc()ed: %p", ptr); + kh_del_ptr(my_malloced, pos); + } + ptr = realloc(ptr, sz); + if (ptr) + kh_put_ptr(my_malloced, ptr, &dummy); + return ptr; +} + +static void my_free(void *ptr) +{ + if (ptr) { + khiter_t pos = kh_get_ptr(my_malloced, ptr); + if (pos >= kh_end(my_malloced)) + die("Was not my_malloc()ed: %p", ptr); + kh_del_ptr(my_malloced, pos); + } + free(ptr); +} +#endif + static struct ref_store *reftable_be_init(struct repository *repo, const char *gitdir, unsigned int store_flags) @@ -362,6 +425,11 @@ static struct ref_store *reftable_be_init(struct repository *repo, int is_worktree; mode_t mask; +#ifdef DEBUG_REFTABLE_ALLOC + my_malloced = kh_init_ptr(); + reftable_set_alloc(my_malloc, my_realloc, my_free); +#endif + mask = umask(0); umask(mask); I briefly considered contributing this "custom allocator" patch, too, but it is unwieldy (for example, it would not work at all when compiling with mimalloc support) and it would only waste space (or even time, if a compile flag was introduced and exercised as part of the CI builds). Given that it is highly unlikely that Git will lose the new `reftable_set_alloc()` call by mistake, I rejected that idea as simply too wasteful. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Every once in a while, whitespace errors are introduced in Git for Windows' rebases to newer Git versions, simply by virtue of integrating upstream commits that do not follow upstream Git's own whitespace rule. In Git v2.50.0-rc0, for example, 03f2915 (xdiff: disable cleanup_records heuristic with --minimal, 2025-04-29) introduced a trailing space. Arguably, non-actionable alerts are worse than no alerts at all, so let's suppress those alerts that we cannot do anything about, anyway. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The 2.53.0.rc0.windows release candidate had a regression where writing to stderr from a pre-push hook would error out. The regression was fixed in 2.53.0.rc1.windows and the test here ensures that this stays fixed. Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>
Continue the size_t evacuation around large object handling: with deflate_it() and the locals around it widened, the cast_size_t_to_ulong() shim the prior delta_delta() widening had to leave behind in emit_binary_diff_body() goes away. deflate_it() is file-static; the only callers are the two in emit_binary_diff_body() already touched here. emit_diff_symbol() formats the resulting sizes via uintmax_t / %"PRIuMAX", so the diff output is not affected; only the per-process upper bound on a binary patch chunk that this function can address grows beyond 4 GiB on Windows. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Prep for the upcoming read_blob_data_from_index() widening, whose callers in convert.c feed the size they receive straight into these two helpers. Both are file-static, so the change is contained. Also fixes a small pre-existing narrowing on the get_wt_convert_stats_ascii() path, where strbuf.len (size_t) was passed to a unsigned long parameter. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue the size_t evacuation. read_blob_data_from_index() reads the blob through the size_t odb_read_object() API but writes the size back through an unsigned long out-parameter, silently truncating anything past 4 GiB on Windows. Widen the out-parameter, drop the cast_size_t_to_ulong() shim, and move the matching locals in the two convert.c callers and the one in attr.c. Their downstream consumers (gather_convert_stats() widened in the prior commit and read_attr_from_buf() already size_t) take the new type directly. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Prep for the widenings of its callers, where size-receiving locals will become size_t (combine-diff's result_size in the immediately following commit, struct diff_filespec.size in a later topic). Body caps the parameter at 8000 anyway, so the type change is mechanical. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Smallest piece of the tree topic. link_len is only used as strbuf_splice()'s size_t length and as an array index; widening it outright removes the cast_size_t_to_ulong() shim and the bridge local that fed it. odb_read_object() now writes straight into link_len. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue the size_t evacuation. With buffer_is_binary() widened in the prior commit, every consumer that the size flows into in combine-diff.c is size_t-ready, so widen grab_blob()'s out-param outright and move the matching locals at its three call sites together. grab_blob()'s body collapses to a direct odb_read_object(&size) since the bridge variable is no longer needed. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Prep for dropping the cast_size_t_to_ulong() shim in add_preferred_base() (pack-objects.c), and aligns the public API with the size_t shape the rest of the tree topic is moving toward. struct tree_desc.size stays unsigned int -- the on-disk tree format hard-caps each tree at 4 GiB, so the field is intentionally narrow and the assignment in init_tree_desc_internal() already truncated unsigned long inputs the same way it now truncates size_t inputs. The widening is purely about the call-side type-correctness; the internal cap is unchanged. All 30+ callers pass values that promote cleanly (unsigned long, size_t, or smaller integer types). Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue the size_t evacuation. textconv_object() fills its out-parameter from fill_textconv()'s size_t return through an unsigned long*; widen the API to match, then take advantage of the new shape where callers can. cat-file's 'c' and batch-mode 'c' branches lose their size_ul bridge variables (one site becomes a direct call, the other collapses an if/else into a single negated condition that reads as "try textconv, fall back to a raw read"). blame.c likewise drops the file_size_st bridge in fill_origin_blob() and hoists final_buf_size_st to bracket both branches in setup_scoreboard(). The latter keeps a cast_size_t_to_ulong() shim because struct blame_scoreboard.final_buf_size is still unsigned long; that field is its own topic. log.c just widens its local from unsigned long to size_t. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Same theme as the preceding pack-objects series: get_size_by_pos() returns an unsigned long but reads its size out of packed_object_info() / odb_read_object_info_extended() via a size_t out-parameter, so on Windows it would silently truncate the very sizes filter_bitmap_blob_limit() then compares against the --filter=blob:limit threshold to decide which blobs to elide from the bitmap-backed traversal. Drop the cast_size_t_to_ulong() and return size_t directly. The two callers' limit comparison promotes to size_t cleanly. limit itself stays unsigned long; it is part of a filter API ripple of its own. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
With init_tree_desc() widened in the prior commit, the size_t-returning odb_read_object_peeled() call in add_preferred_base() and odb_read_object() call in pbase_tree_get() can both flow straight through to init_tree_desc() and into the pbase_tree_cache. Widen pbase_tree_cache.tree_size and the two local size variables to size_t, drop the size_st bridges, and drop the two cast_size_t_to_ulong() shims. This was the last pair of cast_size_t_to_ulong() call sites in builtin/pack-objects.c, completing the >4 GiB-objects work in that file that this branch and its predecessors have been pursuing. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue the size_t evacuation. The struct field already receives its writes from a size_t-shaped source (xsize_t(st.st_size), strbuf.len, fill_textconv()'s return, odb_read_object_info_extended() via oi.sizep), so on Windows it was already truncating anything past 4 GiB silently on the strbuf and textconv paths and loudly through cast_size_t_to_ulong() on the odb path. Switch the field to size_t. In diff_populate_filespec(), point oi.sizep at the field directly and drop both cast_size_t_to_ulong() shims and the size_st bridge they fed. Downstream consumers that still read .size into unsigned long locals will now silently narrow on Windows where the field exceeds 4 GiB. Each of those is its own follow-up; the writer side is the prerequisite for ever putting a >4 GiB value in the field in the first place. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Mirror what git survey already reports: lightweight tags (pointing straight at a commit/tree/blob) and annotated tags (pointing at an OBJ_TAG that is itself stored as a separate object) are different things in many monorepo contexts, and one of the differences git survey users routinely care about. Add an annotated_tags counter to struct ref_stats, populate it in count_references() by peeking at the ref OID's object type, and expose it as a sub-row under Tags in the table output and as references.tags.annotated.count in the machine-readable formats. Step toward pivoting the standalone git survey command onto git repo structure; this fills the first of the four feature gaps documented in the assessment. Tests in t1901 widened to assert the new row and key. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git repo structure` walks every reference enumerated by `refs_for_each_ref()` and feeds each reference's tip into the path walk that produces the object counts. There is no way to scope the inquiry to a subset of refs, even though that is the most common need when an operator is investigating what part of the history is driving cost: only branches, only release tags, only one remote's view, etc. Add a single `--ref-filter=<pattern>` option that, when given, restricts both the reference count and the object walk to refs whose full name matches one of the patterns. The option is repeatable; multiple patterns form a union, so `--ref-filter='refs/heads/*' --ref-filter='refs/tags/v*'` includes local branches and tags whose short name starts with `v`. Patterns use `wildmatch()` with `WM_PATHNAME` semantics so a `*` does not cross `/`, matching the convention used by `git for-each-ref` positional arguments. Choosing a single flexible filter, rather than a proliferation of per-kind flags like `--branches`, `--tags`, `--remotes`, keeps the option surface small and lets the same mechanism express narrow selections the per-kind flags could not, such as "only release tags" (`'refs/tags/v*'`) or "only one remote's branches" (`'refs/remotes/origin/*'`). Without `--ref-filter`, behaviour is unchanged: every ref `refs_for_each_ref()` enumerates contributes. Both the reference counter and the path-walk seeding (via `add_pending_oid()`) sit on the same callback, so an early return when no pattern matches naturally excludes a ref from both. No separate object-walk machinery is needed. Cover the two interesting code paths with tests in t1901: a single filter narrowing to branches, and two filters unioning to include both branches and tags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` distinguishes itself from `git repo structure` largely by its path-level reporting: in addition to whole-repo totals it lists the paths whose object histories dominate the repository, ranked by raw count, on-disk size, and inflated size, separately for trees and blobs. That is often the most actionable output from `git survey`, since it points an operator at the directories and files that should be reviewed for cleanup, sparse-checkout exclusion, or rewriting. `git repo structure` already drives the same path-walk traversal that `git survey` uses to gather its per-path numbers; the callback simply discards the path. Aggregate per-(path, type) summaries inside that existing callback and add a bounded, descending-sorted "top-N" table keyed by each of the three axes. Gate the feature behind a new `--top=<n>` option, defaulting to 0, so unadorned invocations are unaffected and pay no extra work for the top-N tracking. Mirror the sort and eviction strategy from `builtin/survey.c`: keep an array of at most N entries sorted from largest to smallest, walk it from the bottom on each candidate, and shift entries down when a new one belongs. Compared to `builtin/survey.c`, drop the void-pointer indirection in the table data, type the comparator's arguments, and fold the trivial comparators into the `(a > b) - (a < b)` idiom. For the human-readable `table` output, extend the existing nested bullet layout with two new top-level sections, `* Top trees` and `* Top blobs`, each containing three sub-tables (`Top by count`, `Top by disk size`, `Top by inflated size`). The path becomes the row name and the relevant scalar becomes the value, reusing `stats_table_count_addf` and `stats_table_size_addf` so units and column alignment match the rest of the table. For the `lines`/`nul` key-value formats, emit one `objects.<type>.top.by_<axis>.<rank>.path=<path>` entry alongside an `objects.<type>.top.by_<axis>.<rank>.<axis>=<value>` entry per ranked path, so consumers can dispatch by axis without parsing the schema. The root tree's path is the empty string as produced by the path-walk machinery; preserve that as-is to stay faithful to the upstream representation rather than fabricating a placeholder. This is the first piece of folding `git survey`'s functionality into `git repo structure`. Subsequent commits will add the corresponding configuration knob and, eventually, turn `git survey` into a thin deprecated shim over `git repo structure`. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The preceding commit added `--top=<n>` to `git repo structure`,
reporting the top-N paths per type ranked by count, on-disk size, and
inflated size. Cover the three behaviors that matter for that option:
* Without `--top`, the key-value output emits no `top.*` keys, so
existing parsers stay unaffected.
* `--top=N` produces exactly N ranked entries on each of the six
`objects.<type>.top.by_<axis>` axes (count/disk_size/inflated_size
crossed with trees/blobs), and a constructed input where one blob
is several orders of magnitude bigger than the other lets us
assert the ordering on the disk-size and inflated-size axes.
* A negative `--top` is rejected with a non-zero exit and a message
naming the constraint, so a typo cannot silently degrade into the
default zero.
Avoid grep patterns starting with `--`; grep would parse the leading
double dash as an option terminator.
Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` exposes its `--top` default via `survey.top` so that a site or per-repository operator can switch the detail tables on once and have every subsequent invocation include them. Mirror that ergonomics for `git repo structure` so that, as `git survey`'s functionality is folded into `git repo structure`, the configuration side of the migration story stays equivalent. Add a small `git_config_int` callback bound to `repo.structure.top` and invoke it before `parse_options()`, so a `--top=<N>` on the command line cleanly overrides the configured default (including `--top=0` to opt out of the detail tables when configuration enables them). Reject negative configured values with the same wording as the command-line guard, since `git_config_int()` happily returns negative integers. Document the new variable in a fresh `Documentation/config/repo.adoc` and wire it into the alphabetical includes in `Documentation/config.adoc` between `repack.adoc` and `rerere.adoc`. Cover the precedence behaviour with a t1901 test: a configured value enables the tables by default, and a command-line `--top=0` suppresses them again. Note that the reported paths respect the `core.quotePath` setting. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
`git survey` started life as an experimental scale-measurement tool; the preceding commits give `git repo structure` the path-level detail tables and ref-scoping mechanism that were `git survey`'s main draw, so the two now overlap substantially. Plan the migration explicitly: add a short notice at the top of the description making clear which of `git survey`'s knobs map to which `git repo structure` option, and state that a future release will turn `git survey` into a thin shim over `git repo structure`. Putting the notice in the description (rather than only the synopsis) ensures it shows up in `git help survey` rendering before the reader sees any option specifics, so an operator skimming the page learns about the replacement before adopting any survey-specific flags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v5...v6) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` was an experimental scale-measurement tool whose
distinctive features (ref-kind filters, top-N path tables) are now
all available in `git repo structure`. With the path-level reporting
in place (commits "repo: filter the structure scope via
--ref-filter=<pattern>" and "repo: report top-N paths by count, disk,
and inflated size in structure"), there is no functionality `git
survey` provides that `git repo structure` cannot.
Replace the 764-line `git survey` implementation with a roughly
hundred-line shim that:
* Accepts the existing `git survey` command line so callers in
scripts continue to parse without changes.
* Emits a deprecation warning naming the replacement command, so
interactive users learn about the migration target.
* Translates the survey-specific knobs into the equivalent
`git repo structure` invocation and re-execs the canonical
command via `execv_git_cmd()`. Per-kind ref selectors fan out
into the corresponding `refs/heads/*`, `refs/tags/*`, etc.
`--ref-filter` patterns; `--top=<N>` is forwarded directly;
`--all-refs` becomes the absence of any `--ref-filter`.
Two survey options have no `git repo structure` counterpart:
`--verbose` controlled per-step trace output the new command does
not emit, and `--detached` selected the detached HEAD which
`git repo structure` does not enumerate separately. Both are
silently accepted and produce a single warning each, so old
invocations keep working while the absence of these knobs in `git
repo structure` is made visible.
Rewrite t8100 to assert the shim's contract: the deprecation
warning is printed, the output is byte-identical to a corresponding
`git repo structure` invocation, and the per-kind selector
translation produces the right `--ref-filter` pattern. The
preceding survey-specific output assertions (the multi-column
plaintext tables) no longer apply, since `git repo structure`'s
output format is now the canonical one and is covered by t1901.
The `survey.*` configuration keys (`survey.top`, `survey.progress`,
`survey.verbose`) are no longer honored by the shim. They were
mirrored by the preceding `repo.structure.top` work for the most
useful knob; users with `survey.top` set in config should migrate
to `repo.structure.top`. This is a backward-incompatible removal
documented by the deprecation notice in `git-survey.adoc`.
Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/actions/cache/releases">actions/cache's releases</a>.</em></p> <blockquote> <h2>v6.0.0</h2> <h2>What's Changed</h2> <ul> <li>Update packages, migrate to ESM by <a href="https://github.com/Samirat"><code>@Samirat</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1760">actions/cache#1760</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v6.0.0">https://github.com/actions/cache/compare/v5...v6.0.0</a></p> <h2>v5.1.0</h2> <h2>What's Changed</h2> <ul> <li>Bump <code>@actions/cache</code> to v5.1.0 - handle read-only cache access by <a href="https://github.com/jasongin"><code>@jasongin</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1775">actions/cache#1775</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.1.0">https://github.com/actions/cache/compare/v5...v5.1.0</a></p> <h2>v5.0.5</h2> <h2>What's Changed</h2> <ul> <li>Update ts-http-runtime dependency by <a href="https://github.com/yacaovsnc"><code>@yacaovsnc</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1747">actions/cache#1747</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.0.5">https://github.com/actions/cache/compare/v5...v5.0.5</a></p> <h2>v5.0.4</h2> <h2>What's Changed</h2> <ul> <li>Add release instructions and update maintainer docs by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1696">actions/cache#1696</a></li> <li>Potential fix for code scanning alert no. 52: Workflow does not contain permissions by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1697">actions/cache#1697</a></li> <li>Fix workflow permissions and cleanup workflow names / formatting by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1699">actions/cache#1699</a></li> <li>docs: Update examples to use the latest version by <a href="https://github.com/XZTDean"><code>@XZTDean</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1690">actions/cache#1690</a></li> <li>Fix proxy integration tests by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1701">actions/cache#1701</a></li> <li>Fix cache key in examples.md for bun.lock by <a href="https://github.com/RyPeck"><code>@RyPeck</code></a> in <a href="https://redirect.github.com/actions/cache/pull/1722">actions/cache#1722</a></li> <li>Update dependencies & patch security vulnerabilities by <a href="https://github.com/Link"><code>@Link</code></a>- in <a href="https://redirect.github.com/actions/cache/pull/1738">actions/cache#1738</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/XZTDean"><code>@XZTDean</code></a> made their first contribution in <a href="https://redirect.github.com/actions/cache/pull/1690">actions/cache#1690</a></li> <li><a href="https://github.com/RyPeck"><code>@RyPeck</code></a> made their first contribution in <a href="https://redirect.github.com/actions/cache/pull/1722">actions/cache#1722</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.0.4">https://github.com/actions/cache/compare/v5...v5.0.4</a></p> <h2>v5.0.3</h2> <h2>What's Changed</h2> <ul> <li>Bump <code>@actions/cache</code> to v5.0.5 (Resolves: <a href="https://github.com/actions/cache/security/dependabot/33">https://github.com/actions/cache/security/dependabot/33</a>)</li> <li>Bump <code>@actions/core</code> to v2.0.3</li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/cache/compare/v5...v5.0.3">https://github.com/actions/cache/compare/v5...v5.0.3</a></p> <h2>v.5.0.2</h2> <h1>v5.0.2</h1> <h2>What's Changed</h2> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/actions/cache/blob/main/RELEASES.md">actions/cache's changelog</a>.</em></p> <blockquote> <h1>Releases</h1> <h2>How to prepare a release</h2> <blockquote> <p>[!NOTE] Relevant for maintainers with write access only.</p> </blockquote> <ol> <li>Switch to a new branch from <code>main</code>.</li> <li>Run <code>npm test</code> to ensure all tests are passing.</li> <li>Update the version in <a href="https://github.com/actions/cache/blob/main/package.json"><code>https://github.com/actions/cache/blob/main/package.json</code></a>.</li> <li>Run <code>npm run build</code> to update the compiled files.</li> <li>Update this <a href="https://github.com/actions/cache/blob/main/RELEASES.md"><code>https://github.com/actions/cache/blob/main/RELEASES.md</code></a> with the new version and changes in the <code>## Changelog</code> section.</li> <li>Run <code>licensed cache</code> to update the license report.</li> <li>Run <code>licensed status</code> and resolve any warnings by updating the <a href="https://github.com/actions/cache/blob/main/.licensed.yml"><code>https://github.com/actions/cache/blob/main/.licensed.yml</code></a> file with the exceptions.</li> <li>Commit your changes and push your branch upstream.</li> <li>Open a pull request against <code>main</code> and get it reviewed and merged.</li> <li>Draft a new release <a href="https://github.com/actions/cache/releases">https://github.com/actions/cache/releases</a> use the same version number used in <code>package.json</code> <ol> <li>Create a new tag with the version number.</li> <li>Auto generate release notes and update them to match the changes you made in <code>RELEASES.md</code>.</li> <li>Toggle the set as the latest release option.</li> <li>Publish the release.</li> </ol> </li> <li>Navigate to <a href="https://github.com/actions/cache/actions/workflows/release-new-action-version.yml">https://github.com/actions/cache/actions/workflows/release-new-action-version.yml</a> <ol> <li>There should be a workflow run queued with the same version number.</li> <li>Approve the run to publish the new version and update the major tags for this action.</li> </ol> </li> </ol> <h2>Changelog</h2> <h3>6.1.0</h3> <ul> <li>Bump <code>@actions/cache</code> to v6.1.0 to pick up <a href="https://redirect.github.com/actions/toolkit/pull/2435">actions/toolkit#2435 Handle cache write error due to read-only token</a></li> <li>Switch redundant "Cache save failed" warning to debug log in save-only</li> </ul> <h3>6.0.0</h3> <ul> <li>Updated <code>@actions/cache</code> to ^6.0.1, <code>@actions/core</code> to ^3.0.1, <code>@actions/exec</code> to ^3.0.0, <code>@actions/io</code> to ^3.0.2</li> <li>Migrated to ESM module system</li> <li>Upgraded Jest to v30 and test infrastructure to be ESM compatible</li> </ul> <h3>5.0.4</h3> <ul> <li>Bump <code>minimatch</code> to v3.1.5 (fixes ReDoS via globstar patterns)</li> <li>Bump <code>undici</code> to v6.24.1 (WebSocket decompression bomb protection, header validation fixes)</li> <li>Bump <code>fast-xml-parser</code> to v5.5.6</li> </ul> <h3>5.0.3</h3> <ul> <li>Bump <code>@actions/cache</code> to v5.0.5 (Resolves: <a href="https://github.com/actions/cache/security/dependabot/33">https://github.com/actions/cache/security/dependabot/33</a>)</li> <li>Bump <code>@actions/core</code> to v2.0.3</li> </ul> <h3>5.0.2</h3> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/actions/cache/commit/55cc8345863c7cc4c66a329aec7e433d2d1c52a9"><code>55cc834</code></a> Merge pull request <a href="https://redirect.github.com/actions/cache/issues/1768">#1768</a> from jasongin/readonly-cache</li> <li><a href="https://github.com/actions/cache/commit/d8cd72f230726cdf4457ebb61ec1b593a8d12337"><code>d8cd72f</code></a> Bump <code>@actions/cache</code> to v6.1.0 - handle cache write error due to RO token</li> <li><a href="https://github.com/actions/cache/commit/2c8a9bd7457de244a408f35966fab2fb45fda9c8"><code>2c8a9bd</code></a> Merge pull request <a href="https://redirect.github.com/actions/cache/issues/1760">#1760</a> from actions/samirat/esm_migration_and_package_update</li> <li><a href="https://github.com/actions/cache/commit/e9b91fdc3fea7d79165fceb79042ef45c2d51023"><code>e9b91fd</code></a> Prettier fixes</li> <li><a href="https://github.com/actions/cache/commit/e4884b8ff7f92ef6b52c79eda480bbc86e685adb"><code>e4884b8</code></a> Rebuild dist</li> <li><a href="https://github.com/actions/cache/commit/10baf0191a3c426ea0fa4a3253a5c04233b6e18f"><code>10baf01</code></a> Fixed licenses</li> <li><a href="https://github.com/actions/cache/commit/e39b386c9004d72a15d864ade8c0b3a702d47a37"><code>e39b386</code></a> Fix test mock return order</li> <li><a href="https://github.com/actions/cache/commit/b6928203372a8571ff984c0c883ef3a1adfb0c06"><code>b692820</code></a> PR feedback</li> <li><a href="https://github.com/actions/cache/commit/60749128a44d25d3c520a489e576380cf00ff3f1"><code>6074912</code></a> Rebuild dist bundles as ESM to match type:module</li> <li><a href="https://github.com/actions/cache/commit/5a912e8b4af820fa082a0e75cfd2c782f8fbfe0e"><code>5a912e8</code></a> Fix lint and jest issues</li> <li>Additional commits viewable in <a href="https://github.com/actions/cache/compare/v5...v6">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
…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(5)
Changes since Git for Windows v2.55.0(4) (August 11th 2026)
Following the MSYS2 project, on which Git for Windows is based, Windows
8.1 support will be dropped after Git for Windows v2.55.
New Features
* The experimental git survey command (which was never upstreamed to
the core Git project) was deprecated and converted into a small
shim on top of git repo structure. In the future, git repo
structure should be used instead, as the git survey command will be
retired eventually.
* Git for Windows' installer is now a 64-bit executable (x64 instead
of 86).
* Comes with the MSYS2 runtime (Git for Windows flavor) based on
Cygwin v3.6.10.
* Comes with OpenSSH v10.5.P1.
Bug Fixes
* The long-standing bug where Git Bash's screen was cleared after
git.exe called vim (e.g. to edit a commit message) was fixed.
* The Bash executables in the 64-bit and ARM64 distributions no
longer carry an invalid Authenticode signature.
Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com>
When I merged the massive amount of work in git-for-windows#6289, I thought that that was the end of it. But simply staging and unpacking loose blobs that are 4GB or larger _still_ does not work. This PR addresses that. This fixes git-for-windows#6012
Debian 11 just recently went out of its LTS period, and is unmaintained by the project (there is "Extended LTS", but it is a paid service provided by a third party). The point of the debian-11 job was to cover older releases in the LTS state, per ac112fd (Add additional CI jobs to avoid accidental breakage, 2024-10-31). Bumping to debian-12 will cover us there for the next 2 years. This fixes [this kind of error](https://github.com/microsoft/git/actions/runs/34140012025/job/102061159993#step:4:28): > Get:1 http://deb.debian.org/debian bullseye InRelease [75.1 kB] > Get:2 http://deb.debian.org/debian-security bullseye-security InRelease [27.2 kB] > Get:3 http://deb.debian.org/debian bullseye-updates InRelease [44.0 kB] > Get:4 http://deb.debian.org/debian bullseye/main amd64 Packages [8066 kB] > Get:5 http://deb.debian.org/debian bullseye-updates/main amd64 Packages [18.8 kB] > Reading package lists... > E: Release file for http://deb.debian.org/debian-security/dists/bullseye-security/InRelease is expired (invalid since 15h 16min 10s). Updates for this repository will not be applied. > Error: Process completed with exit code 100. This is a sibling of microsoft#982.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: next
From: a49440f021 (ci: bump debian-11 job to debian-12 (git-for-windows#6401), 2026-09-08) (bf6f89f59c..a49440f021)
Resolved: 78fd88c (Merge tag 'v2.55.0.windows.5', 2026-08-21)
Resolved merge of v2.55.0.windows.5 tag: took HEAD for 14 unchanged files; added mimalloc feed and path-utils.c includes for the 4 merge-modified files
Range-diff
1: 78fd88c ! 1: 4b188a3 Merge tag 'v2.55.0.windows.5'
@@ Commit message Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com> ## .github/workflows/monitor-components.yml ## + remerge CONFLICT (add/add): Merge conflict in .github/workflows/monitor-components.yml + index 0bfc0854e4..f15ff218d2 100644 + --- .github/workflows/monitor-components.yml + +++ .github/workflows/monitor-components.yml @@ .github/workflows/monitor-components.yml: jobs: feed: https://github.com/msys2/MINGW-packages/commits/master/mingw-w64-llvm.atom - label: innosetup feed: https://github.com/jrsoftware/issrc/tags.atom -+ - label: mimalloc -+ feed: https://github.com/microsoft/mimalloc/tags.atom -+ title-pattern: ^(?!v1\.|v3\.[01]\.) -+ +-<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) +-======= + - label: mimalloc + feed: https://github.com/microsoft/mimalloc/tags.atom + title-pattern: ^(?!v1\.|v3\.[01]\.) +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) fail-fast: false steps: - uses: git-for-windows/rss-to-issues@v0 ## Documentation/git-survey.adoc ## + remerge CONFLICT (add/add): Merge conflict in Documentation/git-survey.adoc + index 6fb69f063a..e97656b49d 100644 + --- Documentation/git-survey.adoc + +++ Documentation/git-survey.adoc +@@ Documentation/git-survey.adoc: git-survey(1) + + NAME + ---- +-<<<<<<< 038feccd70 (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 +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + + SYNOPSIS + -------- + [verse] +-<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + (DEPRECATED!) 'git survey' <options> +-======= +-(EXPERIMENTAL!) 'git survey' <options> +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + + DESCRIPTION + ----------- + +-<<<<<<< 038feccd70 (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]. -+ +-======= +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) 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 a435493133..c28df068fd 100644 + --- builtin/fast-import.c + +++ builtin/fast-import.c +@@ 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; +-<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + struct iovec iov[3]; +-======= +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + size_t size; + enum object_type type = 0; + char *buf; + + ## builtin/pack-objects.c ## + remerge CONFLICT (content): Merge conflict in builtin/pack-objects.c + index c9c9f5a493..438bdb359b 100644 + --- builtin/pack-objects.c + +++ builtin/pack-objects.c +@@ builtin/pack-objects.c: static void check_object(struct object_entry *entry, uint32_t object_index) + int have_base = 0; + struct object_id base_ref; + struct object_entry *base_entry; +-<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + size_t used, used_0, avail; +-======= +- unsigned long used, used_0; +- size_t avail; +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + off_t ofs; + unsigned char *buf, c; + enum object_type type; +@@ builtin/pack-objects.c: size_t oe_get_size_slow(struct packing_data *pack, + struct pack_window *w_curs; + unsigned char *buf; + enum object_type type; +-<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + size_t used, avail, size; +-======= +- unsigned long used; +- size_t avail, size; +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + + if (e->type_ != OBJ_OFS_DELTA && e->type_ != OBJ_REF_DELTA) { + size_t sz; + + ## builtin/survey.c ## + remerge CONFLICT (add/add): Merge conflict in builtin/survey.c + index 8606b11e4a..d3b36b8914 100644 + --- builtin/survey.c + +++ builtin/survey.c +@@ + #define USE_THE_REPOSITORY_VARIABLE + + #include "builtin.h" +-<<<<<<< 038feccd70 (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; +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + } + + ## ci/lib.sh ## + remerge CONFLICT (content): Merge conflict in ci/lib.sh + index 9fca417a9c..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" || +-<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + case "$CI_EVENT,$CI_BRANCH" in +-======= +-case "$GITHUB_EVENT_NAME,$CI_BRANCH" in +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + 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 8eb03cadf4..df70bae6b6 100644 + --- compat/mingw.c + +++ compat/mingw.c +@@ compat/mingw.c: static void setup_windows_environment(void) + + if (!getenv("LC_ALL") && !getenv("LC_CTYPE") && !getenv("LANG")) + setenv("LC_CTYPE", "C.UTF-8", 1); +-<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + } + + int mingw_platform_has_symlinks(void) + { + static int has_symlinks = -1; +-======= +- +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + /* + * 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 75972eadfc..6250de69cb 100644 + --- compat/win32/path-utils.c + +++ compat/win32/path-utils.c @@ + #include "../../git-compat-util.h" #include "../../environment.h" +-<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) #include "../../repository.h" -+#include "../../strbuf.h" -+#include "../../versioncmp.h" +-======= +-#include "../../wrapper.h" + #include "../../strbuf.h" + #include "../../versioncmp.h" +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) int win32_has_dos_drive_prefix(const char *path) { -@@ compat/win32/path-utils.c: int win32_fspathcmp(const char *a, const char *b) - { - return win32_fspathncmp(a, b, (size_t)-1); - } -+ -+static int read_at(int fd, char *buffer, size_t offset, size_t size) -+{ -+ if (lseek(fd, offset, SEEK_SET) < 0) { -+ fprintf(stderr, "could not seek to 0x%x\n", (unsigned int)offset); -+ return -1; -+ } -+ -+ return read_in_full(fd, buffer, size); -+} -+ -+static size_t le16(const char *buffer) -+{ -+ unsigned char *u = (unsigned char *)buffer; -+ return u[0] | (u[1] << 8); -+} -+ -+static size_t le32(const char *buffer) -+{ -+ return le16(buffer) | (le16(buffer + 2) << 16); -+} -+ -+/* -+ * Determine the Go version of a given executable, if it was built with Go. -+ * -+ * This recapitulates the logic from -+ * https://github.com/golang/go/blob/master/src/cmd/go/internal/version/version.go -+ * (without requiring the user to install `go.exe` to find out). -+ */ -+static ssize_t get_go_version(const char *path, char *go_version, size_t go_version_size) -+{ -+ int fd = open(path, O_RDONLY); -+ char buffer[1024]; -+ off_t offset; -+ size_t num_sections, opt_header_size, i; -+ char *p = NULL, *q; -+ ssize_t res = -1; -+ -+ if (fd < 0) -+ return -1; -+ -+ if (read_in_full(fd, buffer, 2) < 0) -+ goto fail; -+ -+ /* -+ * Parse the PE file format, for more details, see -+ * https://en.wikipedia.org/wiki/Portable_Executable#Layout and -+ * https://learn.microsoft.com/en-us/windows/win32/debug/pe-format -+ */ -+ if (buffer[0] != 'M' || buffer[1] != 'Z') -+ goto fail; -+ -+ if (read_at(fd, buffer, 0x3c, 4) < 0) -+ goto fail; -+ -+ /* Read the `PE\0\0` signature and the COFF file header */ -+ offset = le32(buffer); -+ if (read_at(fd, buffer, offset, 24) < 0) -+ goto fail; -+ -+ if (buffer[0] != 'P' || buffer[1] != 'E' || buffer[2] != '\0' || buffer[3] != '\0') -+ goto fail; -+ -+ num_sections = le16(buffer + 6); -+ opt_header_size = le16(buffer + 20); -+ offset += 24; /* skip file header */ -+ -+ /* -+ * Validate magic number 0x10b or 0x20b, for full details see -+ * https://learn.microsoft.com/en-us/windows/win32/debug/pe-format#optional-header-standard-fields-image-only -+ */ -+ if (read_at(fd, buffer, offset, 2) < 0 || -+ ((i = le16(buffer)) != 0x10b && i != 0x20b)) -+ goto fail; -+ -+ offset += opt_header_size; -+ -+ for (i = 0; i < num_sections; i++) { -+ if (read_at(fd, buffer, offset + i * 40, 40) < 0) -+ goto fail; -+ -+ /* -+ * For full details about the section headers, see -+ * https://learn.microsoft.com/en-us/windows/win32/debug/pe-format#section-table-section-headers -+ */ -+ if ((le32(buffer + 36) /* characteristics */ & ~0x600000) /* IMAGE_SCN_ALIGN_32BYTES */ == -+ (/* IMAGE_SCN_CNT_INITIALIZED_DATA */ 0x00000040 | -+ /* IMAGE_SCN_MEM_READ */ 0x40000000 | -+ /* IMAGE_SCN_MEM_WRITE */ 0x80000000)) { -+ size_t size = le32(buffer + 16); /* "SizeOfRawData " */ -+ size_t pointer = le32(buffer + 20); /* "PointerToRawData " */ -+ -+ /* -+ * Skip the section if either size or pointer is 0, see -+ * https://github.com/golang/go/blob/go1.21.0/src/debug/buildinfo/buildinfo.go#L333 -+ * for full details. -+ * -+ * Merely seeing a non-zero size will not actually do, -+ * though: he size must be at least `buildInfoSize`, -+ * i.e. 32, and we expect a UVarint (at least another -+ * byte) _and_ the bytes representing the string, -+ * which we expect to start with the letters "go" and -+ * continue with the Go version number. -+ */ -+ if (size < 32 + 1 + 2 + 1 || !pointer) -+ continue; -+ -+ p = malloc(size); -+ -+ if (!p || read_at(fd, p, pointer, size) < 0) -+ goto fail; -+ -+ /* -+ * Look for the build information embedded by Go, see -+ * https://github.com/golang/go/blob/go1.21.0/src/debug/buildinfo/buildinfo.go#L165-L175 -+ * for full details. -+ * -+ * Note: Go contains code to enforce alignment along a -+ * 16-byte boundary. In practice, no `.exe` has been -+ * observed that required any adjustment, therefore -+ * this here code skips that logic for simplicity. -+ */ -+ q = memmem(p, size - 18, "\xff Go buildinf:", 14); -+ if (!q) -+ goto fail; -+ /* -+ * Decode the build blob. For full details, see -+ * https://github.com/golang/go/blob/go1.21.0/src/debug/buildinfo/buildinfo.go#L177-L191 -+ * -+ * Note: The `endianness` values observed in practice -+ * were always 2, therefore the complex logic to handle -+ * any other value is skipped for simplicty. -+ */ -+ if ((q[14] == 8 || q[14] == 4) && q[15] == 2) { -+ /* -+ * Only handle a Go version string with fewer -+ * than 128 characters, so the Go UVarint at -+ * q[32] that indicates the string's length must -+ * be only one byte (without the high bit set). -+ */ -+ if ((q[32] & 0x80) || -+ !q[32] || -+ (q + 33 + q[32] - p) > (ssize_t)size || -+ q[32] + 1 > (ssize_t)go_version_size) -+ goto fail; -+ res = q[32]; -+ memcpy(go_version, q + 33, res); -+ go_version[res] = '\0'; -+ break; -+ } -+ } -+ } -+ -+fail: -+ free(p); -+ close(fd); -+ return res; -+} -+ -+void win32_warn_about_git_lfs_on_windows7(int exit_code, const char *argv0) -+{ -+ char buffer[128], *git_lfs = NULL; -+ const char *p; -+ -+ /* -+ * Git LFS v3.5.1 fails with an Access Violation on Windows 7; That -+ * would usually show up as an exit code 0xc0000005. For some reason -+ * (probably because at this point, we no longer have the _original_ -+ * HANDLE that was returned by `CreateProcess()`) we observe other -+ * values like 0xb00 and 0x2 instead. Since the exact exit code -+ * seems to be inconsistent, we check for a non-zero exit status. -+ */ -+ if (exit_code == 0) -+ return; -+ if (GetVersion() >> 16 > 7601) -+ return; /* Warn only on Windows 7 or older */ -+ if (!istarts_with(argv0, "git-lfs ") && -+ strcasecmp(argv0, "git-lfs")) -+ return; -+ if (!(git_lfs = locate_in_PATH("git-lfs"))) -+ return; -+ if (get_go_version(git_lfs, buffer, sizeof(buffer)) > 0 && -+ skip_prefix(buffer, "go", &p) && -+ versioncmp("1.21.0", p) <= 0) -+ warning("This program was built with Go v%s\n" -+ "i.e. without support for this Windows version:\n" -+ "\n\t%s\n" -+ "\n" -+ "To work around this, you can download and install a " -+ "working version from\n" -+ "\n" -+ "\thttps://github.com/git-lfs/git-lfs/releases/tag/" -+ "v3.4.1\n", -+ p, git_lfs); -+ free(git_lfs); -+} - ## 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 - -+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 -+ - #endif + ## object-file.c ## + remerge CONFLICT (content): Merge conflict in object-file.c + index 5397c6cbb4..a4cbf8b081 100644 + --- object-file.c + +++ object-file.c +@@ object-file.c: int parse_loose_header(const char *hdr, struct object_info *oi) + return 0; + } + +-<<<<<<< 038feccd70 (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); +-} +- +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + #define CHECK_COLLISION_DEST_VANISHED -2 + + 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]; +-<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + int hdrlen; +-======= +- size_t hdrlen = sizeof(hdr); +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + + hdrlen = format_object_header(hdr, sizeof(hdr), type, len); + - ## git-compat-util.h ## -@@ git-compat-util.h: static inline int git_offset_1st_component(const char *path) - #define fspathncmp git_fspathncmp - #endif - -+#ifndef warn_about_git_lfs_on_windows7 -+static inline void warn_about_git_lfs_on_windows7(int exit_code UNUSED, -+ const char *argv0 UNUSED) -+{ -+} -+#endif -+ - #ifndef is_valid_path - #define is_valid_path(path) 1 - #endif + ## object-file.h ## + remerge CONFLICT (content): Merge conflict in object-file.h + index 14c0d0abfe..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); +-<<<<<<< 038feccd70 (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); +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + + /* Helper to check and "touch" a file */ + int check_and_freshen_file(const char *fn, int freshen, - ## refs/reftable-backend.c ## -@@ refs/reftable-backend.c: static struct ref_store *reftable_be_init(struct repository *repo, + ## odb/source-loose.c ## + remerge CONFLICT (content): Merge conflict in odb/source-loose.c + index 828730cdae..524405445b 100644 + --- odb/source-loose.c + +++ odb/source-loose.c +@@ odb/source-loose.c: static int write_loose_object(struct odb_source_loose *loose, - reftable_set_alloc(malloc, realloc, free); + static int odb_source_loose_write_object(struct odb_source *source, + const void *buf, size_t len, +-<<<<<<< 038feccd70 (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, +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + enum odb_write_object_flags flags) + { + struct odb_source_loose *loose = odb_source_loose_downcast(source); + char hdr[MAX_HEADER_LEN]; +-<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + int hdrlen; +-======= +- size_t hdrlen = sizeof(hdr); +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) -+ reftable_set_alloc(malloc, realloc, free); -+ - refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir, - &ref_common_dir); + hdrlen = format_object_header(hdr, sizeof(hdr), type, len); - ## 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)) { -+ warn_about_git_lfs_on_windows7(status, argv0); - code = WEXITSTATUS(status); - } else { - if (!in_signal) + ## packfile.c ## + remerge CONFLICT (content): Merge conflict in packfile.c + index 9e45bf81dc..4fa5fd67c8 100644 + --- packfile.c + +++ packfile.c +@@ packfile.c: int unpack_object_header(struct packed_git *p, + size_t *sizep) + { + unsigned char *base; +-<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + size_t left, used; +-======= +- size_t left; +- unsigned long used; +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + enum object_type type; + + /* use_pack() assures us we have [base, base + 20) available + + ## setup.c ## + remerge CONFLICT (content): Merge conflict in setup.c + index 8c1fa7194d..e64afa9ced 100644 + --- setup.c + +++ setup.c +@@ setup.c: int read_gitfile_raw(struct strbuf *contents, const char *path) + error_code = READ_GITFILE_ERR_NO_PATH; + goto cleanup_return; + } +-<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + strbuf_add(contents, buf+8, len-8); +-======= +- buf[len] = '\0'; +- dir = buf + 8; +- +- if (!is_absolute_path(dir) && (slash = strrchr(path, '/'))) { +- size_t pathlen = slash+1 - path; +- dir = xstrfmt("%.*s%.*s", (int)pathlen, path, +- (int)(len - 8), buf + 8); +- free(buf); +- buf = dir; +- } +-#if (defined _WIN32 || defined __WIN32__) +- if (is_dir_sep(dir[0]) && is_invalid_dotgit_path(path, dir)) { +- strbuf_reset(&realpath); +- strbuf_add(&realpath, dir, strlen(dir)); +- path = realpath.buf; +- goto cleanup_return; +- } +-#endif +- if (!is_git_directory(dir)) { +- error_code = READ_GITFILE_ERR_NOT_A_REPO; +- goto cleanup_return; +- } +- +- strbuf_reset(&realpath); +- strbuf_realpath(&realpath, dir, 1); +- path = realpath.buf; +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + + cleanup_return: + free(buf); ## t/lib-bundle-uri-protocol.sh ## + remerge CONFLICT (content): Merge conflict in t/lib-bundle-uri-protocol.sh + index 84e6f89915..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 + test_cmp_config_output expect actual + ' + +-<<<<<<< 038feccd70 (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 test_cmp_config_output expect actual ' -+ +-======= +->>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) # 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/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/t1517-outside-repo.sh ## + remerge CONFLICT (content): Merge conflict in t/t1517-outside-repo.sh + index 6651aaf166..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 | \ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 038feccd70 (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 ;; +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + *) + h_expect_outcome=expect_success + all_expect_outcome=expect_success + + ## t/t2031-checkout-long-paths.sh ## + remerge CONFLICT (add/add): Merge conflict in t/t2031-checkout-long-paths.sh + index b79926721b..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 && +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + test_grep -q "Filename too long" error && +-================================ +- grep -q "Filename too long" error && +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + test ! -d longpa* + ' + +@@ 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 && +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + test_grep "<SYMLINKD\\?> *PF *\\[\\\\Program Files\\]" actual +-================================ +- grep "<SYMLINKD\\?> *PF *\\[\\\\Program Files\\]" actual +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + ' + + test_done + + ## t/t6403-merge-file.sh ## + remerge CONFLICT (content): Merge conflict in t/t6403-merge-file.sh + index 50cb1fff08..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 && +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + test_grep "Cannot merge binary files" merge.err +-================================ +- grep "Cannot merge binary files" merge.err +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + ' + + 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 370f0505e8..a69d8f2672 100755 + --- t/t8100-git-survey.sh + +++ t/t8100-git-survey.sh +@@ + #!/bin/sh + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 038feccd70 (fixup??? survey: stub in new experimental 'git-survey' command) + test_description='git survey (deprecated shim over `git repo structure`)' +-================================ +-test_description='git survey' +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + + 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 + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 038feccd70 (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 +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) + ' + + 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 + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 038feccd70 (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 +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 32c4f76892 (git-for-windows: prepare for 2.55.0(5)) ' -+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)' ' - - echo >>negative && + test_doneResolved: f6cfe04 (Support loose 4GB+ objects (git-for-windows#6353), 2026-08-31)
Resolved all 6 conflicts: kept upstream's test_grep and replay.adoc include, removed Go version detection code and refactored function declarations per merge intent, preserved unsigned long→size_t changes
Range-diff
Truncated; see the full conflict report in the workflow run summary.