Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#29772812115)#323
Open
gitforwindowshelper[bot] wants to merge 335 commits into
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#29772812115)#323gitforwindowshelper[bot] wants to merge 335 commits into
gitforwindowshelper[bot] wants to merge 335 commits into
Conversation
Git for Windows wants to add `git.exe` to the users' `PATH`, without cluttering the latter with unnecessary executables such as `wish.exe`. To that end, it invented the concept of its "Git wrapper", i.e. a tiny executable located in `C:\Program Files\Git\cmd\git.exe` (originally a CMD script) whose sole purpose is to set up a couple of environment variables and then spawn the _actual_ `git.exe` (which nowadays lives in `C:\Program Files\Git\mingw64\bin\git.exe` for 64-bit, and the obvious equivalent for 32-bit installations). Currently, the following environment variables are set unless already initialized: - `MSYSTEM`, to make sure that the MSYS2 Bash and the MSYS2 Perl interpreter behave as expected, and - `PLINK_PROTOCOL`, to force PuTTY's `plink.exe` to use the SSH protocol instead of Telnet, - `PATH`, to make sure that the `bin` folder in the user's home directory, as well as the `/mingw64/bin` and the `/usr/bin` directories are included. The trick here is that the `/mingw64/bin/` and `/usr/bin/` directories are relative to the top-level installation directory of Git for Windows (which the included Bash interprets as `/`, i.e. as the MSYS pseudo root directory). Using the absence of `MSYSTEM` as a tell-tale, we can detect in `git.exe` whether these environment variables have been initialized properly. Therefore we can call `C:\Program Files\Git\mingw64\bin\git` in-place after this change, without having to call Git through the Git wrapper. Obviously, above-mentioned directories must be _prepended_ to the `PATH` variable, otherwise we risk picking up executables from unrelated Git installations. We do that by constructing the new `PATH` value from scratch, appending `$HOME/bin` (if `HOME` is set), then the MSYS2 system directories, and then appending the original `PATH`. Side note: this modification of the `PATH` variable is independent of the modification necessary to reach the executables and scripts in `/mingw64/libexec/git-core/`, i.e. the `GIT_EXEC_PATH`. That modification is still performed by Git, elsewhere, long after making the changes described above. While we _still_ cannot simply hard-link `mingw64\bin\git.exe` to `cmd` (because the former depends on a couple of `.dll` files that are only in `mingw64\bin`, i.e. calling `...\cmd\git.exe` would fail to load due to missing dependencies), at least we can now avoid that extra process of running the Git wrapper (which then has to wait for the spawned `git.exe` to finish) by calling `...\mingw64\bin\git.exe` directly, via its absolute path. Testing this is in Git's test suite tricky: we set up a "new" MSYS pseudo-root and copy the `git.exe` file into the appropriate location, then verify that `MSYSTEM` is set properly, and also that the `PATH` is modified so that scripts can be found in `$HOME/bin`, `/mingw64/bin/` and `/usr/bin/`. This addresses git-for-windows#2283 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Move the default `-ENTRY` and `-SUBSYSTEM` arguments for MSVC=1 builds from `config.mak.uname` into `clink.pl`. These args are constant for console-mode executables. Add support to `clink.pl` for generating a Win32 GUI application using the `-mwindows` argument (to match how GCC does it). This changes the `-ENTRY` and `-SUBSYSTEM` arguments accordingly. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
The previous commits introduced a compile-time option to load libcurl lazily, but it uses the hard-coded name "libcurl-4.dll" (or equivalent on platforms other than Windows). To allow for installing multiple libcurl flavors side by side, where each supports one specific SSL/TLS backend, let's first look whether `libcurl-<backend>-4.dll` exists, and only use `libcurl-4.dll` as a fall back. That will allow us to ship with a libcurl by default that only supports the Secure Channel backend for the `https://` protocol. This libcurl won't suffer from any dependency problem when upgrading OpenSSL to a new major version (which will change the DLL name, and hence break every program and library that depends on it). This is crucial because Git for Windows relies on libcurl to keep working when building and deploying a new OpenSSL package because that library is used by `git fetch` and `git clone`. Note that this feature is by no means specific to Windows. On Ubuntu, for example, a `git` built using `LAZY_LOAD_LIBCURL` will use `libcurl.so.4` for `http.sslbackend=openssl` and `libcurl-gnutls.so.4` for `http.sslbackend=gnutls`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The 'git survey' builtin provides several detail tables, such as "top files by on-disk size". The size of these tables defaults to 10, currently. Allow the user to specify this number via a new --top=<N> option or the new survey.top config key. Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Commit 2406bf5 (Win32: detect unix socket support at runtime, 2024-04-03) introduced a runtime detection for whether the operating system supports unix sockets for Windows, but a mistake snuck into the tests. When building and testing Git without NO_UNIX_SOCKETS we currently skip t0301-credential-cache on Windows if unix sockets are supported and run the tests if they aren't. Flip that logic to actually work the way it was intended. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The new default of Git is to disable NTLM authentication by default. To help users find the escape hatch of that config setting, should they need it, suggest it when the authentication failed and the server had offered NTLM, i.e. if re-enabling it would fix the problem. Helped-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
Git LFS is now built with Go 1.21 which no longer supports Windows 7. However, Git for Windows still wants to support Windows 7. Ideally, Git LFS would re-introduce Windows 7 support until Git for Windows drops support for Windows 7, but that's not going to happen: git-for-windows#4996 (comment) The next best thing we can do is to let the users know what is happening, and how to get out of their fix, at least. This is not quite as easy as it would first seem because programs compiled with Go 1.21 or newer will simply throw an exception and fail with an Access Violation on Windows 7. The only way I found to address this is to replicate the logic from Go's very own `version` command (which can determine the Go version with which a given executable was built) to detect the situation, and in that case offer a helpful error message. This addresses git-for-windows#4996. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
The previous commits disabled NTLM authentication by default due to its cryptographic weaknesses. Users can re-enable it via the config setting http.<url>.allowNTLMAuth, but this requires manual intervention. Credential helpers may have knowledge about which servers are trusted for NTLM authentication (e.g., known on-prem Azure DevOps instances). To allow them to signal this trust, introduce a simple negotiation: when NTLM is suppressed and the server offered it, Git advertises ntlm=suppressed to the credential helper. The helper can respond with ntlm=allow to re-enable NTLM for this request. This happens precisely at the point where we would otherwise warn the user about NTLM being suppressed, ensuring the capability is only advertised when relevant. Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.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>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and Philip Oakley. Helped-by: Clive Chan <cc@clive.io> Helped-by: Adric Norris <landstander668@gmail.com> Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com> Helped-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Brendan Forster <brendan@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
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>
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>
) While upstreaming those patches, I've been asked to adjust them. This backports those fixes. Of course, the _real_ reason to do this _now_ is that I need _some_ PR to make a new Git for Windows release (to address [the NTLM](git-for-windows#6308) issue).
Mirror what git survey already reports: lightweight tags (pointing straight at a commit/tree/blob) and annotated tags (pointing at an OBJ_TAG that is itself stored as a separate object) are different things in many monorepo contexts, and one of the differences git survey users routinely care about. Add an annotated_tags counter to struct ref_stats, populate it in count_references() by peeking at the ref OID's object type, and expose it as a sub-row under Tags in the table output and as references.tags.annotated.count in the machine-readable formats. Step toward pivoting the standalone git survey command onto git repo structure; this fills the first of the four feature gaps documented in the assessment. Tests in t1901 widened to assert the new row and key. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git repo structure` walks every reference enumerated by `refs_for_each_ref()` and feeds each reference's tip into the path walk that produces the object counts. There is no way to scope the inquiry to a subset of refs, even though that is the most common need when an operator is investigating what part of the history is driving cost: only branches, only release tags, only one remote's view, etc. Add a single `--ref-filter=<pattern>` option that, when given, restricts both the reference count and the object walk to refs whose full name matches one of the patterns. The option is repeatable; multiple patterns form a union, so `--ref-filter='refs/heads/*' --ref-filter='refs/tags/v*'` includes local branches and tags whose short name starts with `v`. Patterns use `wildmatch()` with `WM_PATHNAME` semantics so a `*` does not cross `/`, matching the convention used by `git for-each-ref` positional arguments. Choosing a single flexible filter, rather than a proliferation of per-kind flags like `--branches`, `--tags`, `--remotes`, keeps the option surface small and lets the same mechanism express narrow selections the per-kind flags could not, such as "only release tags" (`'refs/tags/v*'`) or "only one remote's branches" (`'refs/remotes/origin/*'`). Without `--ref-filter`, behaviour is unchanged: every ref `refs_for_each_ref()` enumerates contributes. Both the reference counter and the path-walk seeding (via `add_pending_oid()`) sit on the same callback, so an early return when no pattern matches naturally excludes a ref from both. No separate object-walk machinery is needed. Cover the two interesting code paths with tests in t1901: a single filter narrowing to branches, and two filters unioning to include both branches and tags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` distinguishes itself from `git repo structure` largely by its path-level reporting: in addition to whole-repo totals it lists the paths whose object histories dominate the repository, ranked by raw count, on-disk size, and inflated size, separately for trees and blobs. That is often the most actionable output from `git survey`, since it points an operator at the directories and files that should be reviewed for cleanup, sparse-checkout exclusion, or rewriting. `git repo structure` already drives the same path-walk traversal that `git survey` uses to gather its per-path numbers; the callback simply discards the path. Aggregate per-(path, type) summaries inside that existing callback and add a bounded, descending-sorted "top-N" table keyed by each of the three axes. Gate the feature behind a new `--top=<n>` option, defaulting to 0, so unadorned invocations are unaffected and pay no extra work for the top-N tracking. Mirror the sort and eviction strategy from `builtin/survey.c`: keep an array of at most N entries sorted from largest to smallest, walk it from the bottom on each candidate, and shift entries down when a new one belongs. Compared to `builtin/survey.c`, drop the void-pointer indirection in the table data, type the comparator's arguments, and fold the trivial comparators into the `(a > b) - (a < b)` idiom. For the human-readable `table` output, extend the existing nested bullet layout with two new top-level sections, `* Top trees` and `* Top blobs`, each containing three sub-tables (`Top by count`, `Top by disk size`, `Top by inflated size`). The path becomes the row name and the relevant scalar becomes the value, reusing `stats_table_count_addf` and `stats_table_size_addf` so units and column alignment match the rest of the table. For the `lines`/`nul` key-value formats, emit one `objects.<type>.top.by_<axis>.<rank>.path=<path>` entry alongside an `objects.<type>.top.by_<axis>.<rank>.<axis>=<value>` entry per ranked path, so consumers can dispatch by axis without parsing the schema. The root tree's path is the empty string as produced by the path-walk machinery; preserve that as-is to stay faithful to the upstream representation rather than fabricating a placeholder. This is the first piece of folding `git survey`'s functionality into `git repo structure`. Subsequent commits will add the corresponding configuration knob and, eventually, turn `git survey` into a thin deprecated shim over `git repo structure`. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The preceding commit added `--top=<n>` to `git repo structure`,
reporting the top-N paths per type ranked by count, on-disk size, and
inflated size. Cover the three behaviors that matter for that option:
* Without `--top`, the key-value output emits no `top.*` keys, so
existing parsers stay unaffected.
* `--top=N` produces exactly N ranked entries on each of the six
`objects.<type>.top.by_<axis>` axes (count/disk_size/inflated_size
crossed with trees/blobs), and a constructed input where one blob
is several orders of magnitude bigger than the other lets us
assert the ordering on the disk-size and inflated-size axes.
* A negative `--top` is rejected with a non-zero exit and a message
naming the constraint, so a typo cannot silently degrade into the
default zero.
Avoid grep patterns starting with `--`; grep would parse the leading
double dash as an option terminator.
Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` exposes its `--top` default via `survey.top` so that a site or per-repository operator can switch the detail tables on once and have every subsequent invocation include them. Mirror that ergonomics for `git repo structure` so that, as `git survey`'s functionality is folded into `git repo structure`, the configuration side of the migration story stays equivalent. Add a small `git_config_int` callback bound to `repo.structure.top` and invoke it before `parse_options()`, so a `--top=<N>` on the command line cleanly overrides the configured default (including `--top=0` to opt out of the detail tables when configuration enables them). Reject negative configured values with the same wording as the command-line guard, since `git_config_int()` happily returns negative integers. Document the new variable in a fresh `Documentation/config/repo.adoc` and wire it into the alphabetical includes in `Documentation/config.adoc` between `repack.adoc` and `rerere.adoc`. Cover the precedence behaviour with a t1901 test: a configured value enables the tables by default, and a command-line `--top=0` suppresses them again. Note that the reported paths respect the `core.quotePath` setting. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` started life as an experimental scale-measurement tool; the preceding commits give `git repo structure` the path-level detail tables and ref-scoping mechanism that were `git survey`'s main draw, so the two now overlap substantially. Plan the migration explicitly: add a short notice at the top of the description making clear which of `git survey`'s knobs map to which `git repo structure` option, and state that a future release will turn `git survey` into a thin shim over `git repo structure`. Putting the notice in the description (rather than only the synopsis) ensures it shows up in `git help survey` rendering before the reader sees any option specifics, so an operator skimming the page learns about the replacement before adopting any survey-specific flags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`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>
Git for Windows dropped Windows 7 support a long time ago. This patch was carried in Git for Windows without making it upstream, and exists exclusively to support Windows 7 users. Therefore it can now go enjoy its retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…it-for-windows#6268) `git survey` was always experimental, and I never got around to upstreaming it to make it non-experimental. In the meantime, the `git repo structure` command was upstreamed upstream, which covers most of the same ground with a cleaner option surface and a stable output contract. This PR closes the remaining gap (annotated-tag breakdown, ref scoping, top-N paths by count/disk/inflated, and the corresponding configuration knob) and then turns `git survey` into a thin shim that warns about deprecation, translates its old command line into the equivalent `git repo structure` invocation, and re-execs the canonical command. Net result: one user-facing tool to maintain and to teach instead of two. The intent is that scripts pinned to `git survey` keep working (a warning aside), and that operators have a single answer when they ask "how do I see what's making my repository large?". The `survey.*` configuration keys are intentionally dropped; the only one that mattered, `survey.top`, has a direct replacement in `repo.structure.top`.
Git for Windows dropped Windows 7 support a long time ago. There is a patch (introduced in git-for-windows#5042 and in git-for-windows#5059) to detect when Git LFS failed to start because of lack of Windows 7 support (which was lost somewhat surprisingly, via a Go upgrade that slipped that change in), and to provid a helpful message to the user in that instance. Since Git for Windows itself does not support Windows 7 anymore, that patch is no longer necessary, either.
Git for Windows v2.55.0(3)
Changes since Git for Windows v2.55.0(2) (July 2nd 2026):
New Features
* Comes with Git Credential Manager v2.9.0.
Bug Fixes
* Fixes heap overflows in the credential helper wincred, see
GHSA-rxqw-wxqg-g7hw for full details.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: seen
From: 2d5e463d36 (Merge tag 'v2.55.0.windows.3', 2026-07-16) (920c7f660c..2d5e463d36)
Resolved: e38c559 (Some amendments for the
hashliteral_tsize fixes (git-for-windows#6311), 2026-07-03)Resolved merge conflicts: took HEAD for all files except t/t1007-hash-object.sh where the merge's intent (removing !LONG_IS_64BIT prerequisite) was applied
Range-diff
1: e38c559 ! 1: 50bc331 Some amendments for the
hashliteral_tsize fixes (Some amendments for thehashliteral_tsize fixes git#6311)@@ Commit message to make a new Git for Windows release (to address [the NTLM](https://github.com/git-for-windows/git/issues/6308) issue). - ## refs/reftable-backend.c ## -@@ refs/reftable-backend.c: static struct ref_store *reftable_be_init(struct repository *repo, + ## builtin/fast-import.c ## + remerge CONFLICT (content): Merge conflict in builtin/fast-import.c + index 3ff44ea747..7d856af38d 100644 + --- builtin/fast-import.c + +++ builtin/fast-import.c +@@ builtin/fast-import.c: static int store_object( + struct object_entry *e; + unsigned char hdr[96]; + struct object_id oid; +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + size_t hdrlen, deltalen = 0; +-======= +- size_t hdrlen, deltalen; +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + struct git_hash_ctx c; + git_zstream s; + struct repo_config_values *cfg = repo_config_values(the_repository); +@@ builtin/fast-import.c: static void cat_blob_write(const char *buf, unsigned long size) + static void cat_blob(struct object_entry *oe, struct object_id *oid) + { + struct strbuf line = STRBUF_INIT; +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + struct iovec iov[3]; +-======= +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + size_t size; + enum object_type type = 0; + char *buf; + + ## ci/lib.sh ## + remerge CONFLICT (content): Merge conflict in ci/lib.sh + index 3feca0cc94..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" || +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + case "$CI_EVENT,$CI_BRANCH" in +-======= +-case "$GITHUB_EVENT_NAME,$CI_BRANCH" in +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + 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 2bec2a1f9c..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); +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + } + + int mingw_platform_has_symlinks(void) + { + static int has_symlinks = -1; +-======= +- +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + /* + * 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 7c6b075f5a..84b620756a 100644 + --- compat/win32/path-utils.c + +++ compat/win32/path-utils.c +@@ + + #include "../../git-compat-util.h" + #include "../../environment.h" +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + #include "../../repository.h" +-======= +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + #include "../../wrapper.h" + #include "../../strbuf.h" + #include "../../versioncmp.h" + + ## config.mak.uname ## + remerge CONFLICT (content): Merge conflict in config.mak.uname + index 6f68619e9e..e0c8dcef9c 100644 + --- config.mak.uname + +++ config.mak.uname +@@ config.mak.uname: endif + EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj kernel32.lib ntdll.lib + GITLIBS += git.res + PTHREAD_LIBS = +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + RC = lib/compat/vcbuild/scripts/rc.pl +-======= +- RC = compat/vcbuild/scripts/rc.pl +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + lib = + BASIC_CFLAGS += $(vcpkg_inc) $(sdk_includes) $(msvc_includes) + ifndef DEBUG + + ## git-compat-util.h ## + remerge CONFLICT (content): Merge conflict in git-compat-util.h + index 3651cdaae6..4980c60506 100644 + --- git-compat-util.h + +++ git-compat-util.h +@@ git-compat-util.h: struct fscache; + #ifndef enable_fscache + #define enable_fscache(x) /* noop */ + #endif +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + #ifndef flush_fscache + #define flush_fscache() /* noop */ + #endif +-======= +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + + #ifndef disable_fscache + #define disable_fscache() /* noop */ + + ## meson_options.txt ## + remerge CONFLICT (content): Merge conflict in meson_options.txt + index 5cfc3d251c..427697f5f7 100644 + --- meson_options.txt + +++ meson_options.txt +@@ meson_options.txt: option('runtime_prefix', type: 'boolean', value: false, + description: 'Resolve ancillary tooling and support files relative to the location of the runtime binary instead of hard-coding them into the binary.') + option('sane_tool_path', type: 'array', value: [], + description: 'An array of paths to pick up tools from in case the normal tools are broken or lacking.') +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + option('nanosec', type: 'boolean', value: false, + description: 'Care about sub-second file mtimes and ctimes.') +-======= +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + option('msystem', type: 'string', value: '', + description: 'Fall-back on Windows when MSYSTEM is not set.') + option('mingw_prefix', type: 'string', value: '', + + ## object-file.c ## + remerge CONFLICT (content): Merge conflict in object-file.c + index 4cdf844cd2..ec35c318bc 100644 + --- object-file.c + +++ object-file.c +@@ object-file.c: int parse_loose_header(const char *hdr, struct object_info *oi) + return 0; + } - reftable_set_alloc(malloc, realloc, free); +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) +-======= +-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); +-} +- +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + #define CHECK_COLLISION_DEST_VANISHED -2 -+ reftable_set_alloc(malloc, realloc, free); -+ - refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir, - &ref_common_dir); + 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]; +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + int hdrlen; +-======= +- size_t hdrlen = sizeof(hdr); +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + hdrlen = format_object_header(hdr, sizeof(hdr), type, len); + + + ## object-file.h ## + remerge CONFLICT (content): Merge conflict in object-file.h + index e162ddab12..805f2cfa28 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); +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) +-======= +-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); +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + + /* Helper to check and "touch" a file */ + int check_and_freshen_file(const char *fn, int freshen, + + ## odb/source-loose.c ## + remerge CONFLICT (content): Merge conflict in odb/source-loose.c + index 817a7bb9cb..ef0e919277 100644 + --- odb/source-loose.c + +++ odb/source-loose.c +@@ odb/source-loose.c: static int write_loose_object(struct odb_source_loose *loose, + + static int odb_source_loose_write_object(struct odb_source *source, + const void *buf, size_t len, +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + 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, +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + enum odb_write_object_flags flags) + { + struct odb_source_loose *loose = odb_source_loose_downcast(source); + char hdr[MAX_HEADER_LEN]; +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + int hdrlen; +-======= +- size_t hdrlen = sizeof(hdr); +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + + hdrlen = format_object_header(hdr, sizeof(hdr), type, len); + + + ## send-pack.c ## + remerge CONFLICT (content): Merge conflict in send-pack.c + index 4bd0bef011..0d3a0d330c 100644 + --- send-pack.c + +++ send-pack.c +@@ send-pack.c: int send_pack(struct repository *r, + allow_deleting_refs = 1; + if (server_supports("ofs-delta")) + args->use_ofs_delta = 1; +-<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + if (server_supports("no-ref-delta")) + args->no_ref_delta = 1; +-======= +->>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + use_sideband = use_sideband && server_supports("side-band-64k"); + if (server_supports("quiet")) + quiet_supported = 1; ## t/t1007-hash-object.sh ## + remerge CONFLICT (content): Merge conflict in t/t1007-hash-object.sh + index 4c144590ed..463b38f990 100755 + --- t/t1007-hash-object.sh + +++ t/t1007-hash-object.sh @@ t/t1007-hash-object.sh: test_expect_success EXPENSIVE,SIZE_T_IS_64BIT \ # This clean filter does nothing, other than excercising the interface. # We ensure that cleaning doesn't mangle large files on 64-bit Windows. +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) -test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \ -+test_expect_success EXPENSIVE,SIZE_T_IS_64BIT \ +-================================ + test_expect_success EXPENSIVE,SIZE_T_IS_64BIT \ +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) 'hash filtered files over 4GB correctly' ' { test -f big || test-tool genzeros $((5*1024*1024*1024)) >big; } && test_oid large5GB >expect && + + ## t/t1517-outside-repo.sh ## + remerge CONFLICT (content): Merge conflict in t/t1517-outside-repo.sh + index 12694602f0..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 | \ +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + 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 ;; +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + *) + h_expect_outcome=expect_success + all_expect_outcome=expect_success + + ## t/t6403-merge-file.sh ## + remerge CONFLICT (content): Merge conflict in t/t6403-merge-file.sh + index 89633e32d2..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 && +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 668c988807 (build(deps): bump actions/cache from 5 to 6 (#6303)) + test_grep "Cannot merge binary files" merge.err +-================================ +- grep "Cannot merge binary files" merge.err +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> c8dff95af8 (fixup! hash-object: add a >4GB/LLP64 test case using filtered input) + ' + + test_expect_success 'binary files cannot be merged with --object-id' 'To: 05058cc8cd (Merge tag 'v2.55.0.windows.3', 2026-07-16) (97cd769981..05058cc8cd)
Statistics
Range-diff (click to expand)
1: 13381bc = 1: 1d99545 mingw: skip symlink type auto-detection for network share targets
2: f33df69 = 2: b922b06 unix-socket: avoid leak when initialization fails
3: c103ed5 = 3: af9e41e Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
4: 1933997 = 4: db69c9a grep: prevent
^$false match at end of file5: dc03fde = 5: 8a0b902 Merge branch 'v2.53.0.windows.3'
6: 255a5c7 = 6: 6bbff89 Merge branch 'fixes-from-the-git-mailing-list'
16: d4ee4ed = 7: f16d243 t9350: point out that refs are not updated correctly
33: 2c65886 = 8: 1115659 ci: bump actions/checkout from 6 to 7
7: d7f9bf4 = 9: e15191b ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
8: 4a0b6ea = 10: c90ed50 vcpkg_install: detect lack of Git
9: 35ff59c = 11: 5c950b3 vcpkg_install: add comment regarding slow network connections
10: 03afc76 = 12: db14e73 vcbuild: install ARM64 dependencies when building ARM64 binaries
11: 3e571f4 = 13: 41797b9 vcbuild: add an option to install individual 'features'
12: 1c90f29 = 14: b34f3a5 cmake: allow building for Windows/ARM64
13: 969b56f = 15: 779f35d ci(vs-build) also build Windows/ARM64 artifacts
14: 83030c6 = 16: 5693b39 vcbuild: stop hard-coding OpenSSL as a dependency
15: f028a64 = 17: 3ed1292 cmake(): allow setting HOST_CPU for cross-compilation
17: 0e72cda = 18: afc6f4d CMake: default Visual Studio generator has changed
18: 7631072 = 19: a258ae3 transport-helper: add trailing --
19: e83b286 = 20: 56d99e4 mingw: demonstrate a
git addissue with NTFS junctions20: a46a385 = 21: 8565b66 .gitignore: add Visual Studio CMakeSetting.json file
21: d635406 = 22: b608bd5 t5505/t5516: allow running without
.git/branches/in the templates22: 6f150f9 = 23: 588908a remote-helper: check helper status after import/export
23: dc383de = 24: 8b7b644 strbuf_realpath(): use platform-dependent API if available
24: eb79c7b = 25: f15f661 http: use new "best effort" strategy for Secure Channel revoke checking
25: 9f4096a = 26: 768c9cb subtree: update
contrib/subtreetesttarget26: b038b7c = 27: bb63faa CMakeLists: add default "x64-windows" arch for Visual Studio
27: 5ce7276 = 28: ff373a5 hash-object: add another >4GB/LLP64 test case
28: a155556 = 29: 626c094 setup: properly use "%(prefix)/" when in WSL
29: c5e0adc = 30: c28ba2f Add config option
windows.appendAtomically30: 354e6ce = 31: 41fcab1 mingw: include the Python parts in the build
31: f6ce350 = 32: 4650d4e t5505/t5516: fix white-space around redirectors
32: 07185e1 = 33: a4aea60 MinGW: link as terminal server aware
34: d30991d = 34: 825ea9a Always auto-gc after calling a fast-import transport
35: 2c85c5d = 35: 2f91439 mingw: prevent regressions with "drive-less" absolute paths
36: dc61a5a = 36: 7a52b7f transport: optionally disable side-band-64k
37: 2a8595a = 37: d9914a1 mingw: fix fatal error working on mapped network drives on Windows
38: e8e8bc1 = 38: 49451c5 clink.pl: fix MSVC compile script to handle libcurl-d.lib
39: 657724d = 39: 5e4280a mingw: implement a platform-specific
strbuf_realpath()40: 68af7b6 = 40: 56a268e t3701: verify that we can add lots of files interactively
41: 8c3b038 = 41: fa79aee commit: accept "scissors" with CR/LF line endings
42: 291a9cc = 42: 55d99c5 t0014: fix indentation
43: 1c172ed = 43: 5910dfa git-gui: accommodate for intent-to-add files
44: b8677e8 = 44: 31025e0 mingw: allow for longer paths in
parse_interpreter()45: cfa4d3d = 45: f211daa compat/vcbuild: document preferred way to build in Visual Studio
46: a94b037 = 46: fa9f51d http: optionally send SSL client certificate
47: e0187fe = 47: ceb4e50 ci: run
contrib/subtreetests in CI builds48: b77c489 = 48: ee8fa97 CMake: show Win32 and Generator_platform build-option values
49: 2eec4b8 = 49: b23b177 hash-object: add a >4GB/LLP64 test case using filtered input
50: 8e851d9 = 50: 2a36132 compat/mingw.c: do not warn when failing to get owner
51: 7bd2738 = 51: e9de9ac mingw: $env:TERM="xterm-256color" for newer OSes
52: 5ace2d2 = 52: 68cadd7 winansi: check result and Buffer before using Name
53: eaf8881 = 53: 1cb6d61 mingw: change core.fsyncObjectFiles = 1 by default
54: 145f247 = 54: 3486f77 Fix Windows version resources
97: c1aea3a = 55: 3774148 status: fix for old-style submodules with commondir
55: d850309 = 56: ceee912 windows: skip linking
git-<command>for built-ins56: 1bc8b65 = 57: c273ee5 mingw: stop hard-coding
CC = gcc57: c52145b = 58: 0bfd0a2 mingw: drop the -D_USE_32BIT_TIME_T option
58: b7d9a58 = 59: cfdc6d0 mingw: only use -Wl,--large-address-aware for 32-bit builds
59: bf77816 = 60: 3669b73 mingw: avoid over-specifying
--pic-executable60: 54a333c = 61: f3d0557 mingw: set the prefix and HOST_CPU as per MSYS2's settings
61: ae79213 = 62: d75997f mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
62: 416d5e3 = 63: 7120018 mingw: rely on MSYS2's metadata instead of hard-coding it
63: bc18143 = 64: 1742741 mingw: always define
ETC_*for MSYS2 environments64: f19a6f6 = 65: 68a1510 max_tree_depth: lower it for clang builds in general on Windows
65: 29b34bf = 66: 8d82d8e mingw: ensure valid CTYPE
66: 6bce802 = 67: 2e3c10d mingw: allow
git.exeto be used instead of the "Git wrapper"67: 42c170b = 68: 7efee85 revision: create mark_trees_uninteresting_dense()
68: b5772d7 = 69: 47d5b2d mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
69: 90a61ea = 70: 7a967ba survey: stub in new experimental 'git-survey' command
70: 51fd0e7 = 71: c487868 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
71: 5175cca = 72: be7530a survey: add command line opts to select references
72: e7bf8e8 = 73: eb9f8ac clink.pl: fix libexpatd.lib link error when using MSVC
73: 1355674 = 74: ef3711f survey: start pretty printing data in table form
74: 0952273 = 75: bf6d59a Makefile: clean up .ilk files when MSVC=1
75: 4931268 = 76: ca80a41 survey: add object count summary
76: 3657e7e = 77: 412da11 vcbuild: add support for compiling Windows resource files
77: 53d644f = 78: 152766e survey: summarize total sizes by object type
78: cc9c9d9 = 79: fc1f66f config.mak.uname: add git.rc to MSVC builds
79: aa982fa = 80: 046d9db survey: show progress during object walk
80: 0a082e2 = 81: 2b81535 mingw: make sure
errnois set correctly when socket operations fail81: 62280e7 = 82: 64d92f5 t5563: verify that NTLM authentication works
82: fc154cb = 83: a7d2b33 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
83: 0f96b2d = 84: c11b7fa http: optionally load libcurl lazily
84: fa9e22e = 85: a9e7185 survey: add ability to track prioritized lists
85: 66406a6 = 86: cd3ec7c compat/mingw: handle WSA errors in strerror
86: 9db1abb = 87: f050f6a http: disallow NTLM authentication by default
87: 3a60c18 = 88: 71847a7 clink.pl: move default linker options for MSVC=1 builds
88: f7fa483 = 89: 310bc3d http: support lazy-loading libcurl also on Windows
89: 7c18720 = 90: 99d1778 survey: add report of "largest" paths
90: 6b6890a = 91: 18ee400 compat/mingw: drop outdated comment
91: e79875b = 92: d335124 http: warn if might have failed because of NTLM
92: f08a500 = 93: caff600 cmake: install headless-git.
93: 2c1a487 = 94: 5971f32 http: when loading libcurl lazily, allow for multiple SSL backends
94: 4feb37c = 95: 52a5970 survey: add --top= option and config
95: 26ec2e6 = 96: 506436a t0301: actually test credential-cache on Windows
96: 7645142 = 97: c3bafb4 credential: advertise NTLM suppression and allow helpers to re-enable
98: 9c045fe = 98: 342d222 git.rc: include winuser.h
99: a30f444 = 99: 3e54dda mingw: do load libcurl dynamically by default
100: 36b1f8e = 100: 306d634 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
101: 9afd8ee = 101: fd7b6e8 mingw: suggest
windows.appendAtomicallyin more cases102: 5a96ae8 = 102: 2bd2b5b win32: use native ANSI sequence processing, if possible
103: 6b20e70 = 103: df65bfc common-main.c: fflush stdout buffer upon exit
104: dd0894b = 104: 523fb8a t5601/t7406(mingw): do run tests with symlink support
105: 03d8d46 = 105: a883466 Fallback to AppData if XDG_CONFIG_HOME is unset
106: 3147b53 = 106: 45cbe21 run-command: be helpful with Git LFS fails on Windows 7
107: 2091b17 = 107: 087fe10 survey: clearly note the experimental nature in the output
108: dc72a03 = 108: 9c36dd2 credential-cache: handle ECONNREFUSED gracefully
109: 9c4e2a8 = 109: 91f0879 reftable: do make sure to use custom allocators
110: 8015b1d = 110: 649f8d8 check-whitespace: avoid alerts about upstream commits
111: 2e6c771 = 111: ebebb02 t/t5571-prep-push-hook.sh: Add test with writing to stderr
115: b466e21 = 112: a2de16e mingw: Support
git_terminal_promptwith more terminals116: 59787e3 = 113: 7d031b8 compat/terminal.c: only use the Windows console if bash 'read -r' fails
117: 30c5c7f = 114: 9c7b448 diff: stop truncating the deflated-binary-diff size on Windows
118: d3e81cc = 115: 48b691c mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
119: ab01036 = 116: ff6239e convert: widen gather_convert_stats() helpers to size_t
120: 9bd7daf = 117: c44bc26 Win32: symlink: move phantom symlink creation to a separate function
121: 7094602 = 118: d38927d read-cache: stop truncating index blob sizes on Windows
122: dac16f9 = 119: 213cf27 mingw: introduce code to detect whether we're inside a Windows container
123: f1597f0 ! 120: d73b743 Introduce helper to create symlinks that knows about index_state
124: 122be8c = 121: ca8bfb4 xdiff-interface: widen buffer_is_binary() size parameter to size_t
125: 67d3e83 = 122: c88ec31 tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
126: 9451798 = 123: 99dde10 mingw: when running in a Windows container, try to rename() harder
127: ead068c = 124: 9d4aa29 mingw: allow to specify the symlink type in .gitattributes
128: 67077e5 = 125: ae96712 combine-diff: stop truncating combined-diff blob sizes on Windows
129: 2d32142 = 126: 8bb7484 tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
130: dc872d2 = 127: 4317571 mingw: move the file_attr_to_st_mode() function definition
131: bdbd1de = 128: 4a0c8ba Win32: symlink: add test for
symlinkattribute132: a1a4890 = 129: 7e0e21b diff: widen textconv_object() size out-param to size_t
135: 1ca3b67 = 130: 21ec27f pack-objects: drop the two tree-walk casts in the preferred-base path
136: 5eb359e = 131: 316cd42 mingw: Windows Docker volumes are not symbolic links
137: ebf7929 = 132: 6f03dac clean: do not traverse mount points
133: 8d67435 = 133: 5beae74 pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
138: c68a5af = 134: b44bacb diffcore: widen struct diff_filespec.size to size_t
140: 4e6e128 = 135: be95c99 diff-delta: widen sizeof_delta_index() return to size_t
141: 8a8dc8d = 136: 81c556f tree: widen struct tree.size and parse_tree_buffer() to size_t
142: cfb15b6 = 137: 60368f4 commit: widen the commit-buffer API to size_t
143: 3bbd4b0 = 138: dee7e10 blame: widen find_line_starts() len parameter to size_t
144: c69d17e = 139: a725abb grep: widen struct grep_source.size and grep_buffer() to size_t
145: 9a38142 = 140: 107f44d fast-export: drop the export_blob() size cast and widen anonymize_blob()
146: 6097a45 = 141: 43424e3 repo: drop the inflated-size cast in count_objects()
147: 28ee212 = 142: 54d3ead unpack-objects: widen the size-passing infrastructure to size_t
112: 1cc040f = 143: 39a3e3d dir: do not traverse mount points
113: 88e817a = 144: 96face1 win32: thread-utils: handle multi-socket systems
114: 4ad7b25 = 145: e9c07d3 t5563: add tests for http.emptyAuth with Negotiate
148: 7bb2c9a = 146: 660f209 entry: flush fscache after creating directories and writing files
149: b052116 = 147: 7505c01 ci(macos): skip the
git p4tests150: 6c42797 = 148: 07ecd9d mingw: work around rename() failing on a read-only file
151: 27c17a0 = 149: 5f028ff clean: remove mount points when possible
152: 837bd7c = 150: 37e67c6 mingw: optionally enable wsl compability file mode bits
153: 9f44179 = 151: 13db3d9 Refuse to follow invalid paths in
.gitfiles134: 8bba07b = 152: df87f6e Merge branch 'size-t/pack-objects-delta'
139: 5d99696 = 153: 34182f8 Merge branch 'size-t/pack-bitmap'
154: d9932d3 = 154: 72be12c Merge branch 'size-t/diff'
155: ecbb5a7 = 155: 8cb1aab Merge branch 'size-t/diff-delta-sizeof'
156: 9be57e6 = 156: 31995be Merge branch 'size-t/tree'
157: c422c8c = 157: 7438388 Merge branch 'size-t/commit'
158: 4119fa0 = 158: 607c79a Merge branch 'size-t/blame'
159: 0b3f881 = 159: 1a73311 Merge branch 'size-t/grep'
160: abd6d8f = 160: 1e23133 Merge branch 'size-t/fast-export'
161: 3e50aa1 = 161: 505fc42 Merge branch 'size-t/repo'
162: 6db2ee1 = 162: a1324ec Merge branch 'size-t/unpack-objects'
163: 03929aa = 163: 5818f0d Merge branch 'topic/size-t' into size-t-followups
164: 6270aeb = 164: b3f0dd2 pack-objects: drop cast_size_t_to_ulong shims in get_delta()
165: 062f9ab = 165: 07f30a0 pack-objects: drop cast_size_t_to_ulong shims in try_delta()
170: 9a85163 = 166: 9ca5aa4 Merge branch 'bump-ci-actions/checkout-from-6-to-7'
166: db89d84 = 167: bf93819 pack-objects: drop the last size shim in write_no_reuse_object()
173: 66d4671 = 168: 583b233 Merge 'remote-hg-prerequisites' into HEAD
167: 2bfe285 = 169: 2e8f7a2 blame: widen struct blame_scoreboard.final_buf_size to size_t
176: a2bc281 = 170: 948cf80 Merge branch 'drive-prefix'
168: 8a2cdd6 = 171: 5fd89bc fast-import: drop the six size casts in the object-read paths
177: 1060e56 = 172: 1062040 Merge branch 'msys2-python'
169: 7edd574 = 173: 7d338f8 t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
178: 5447ac3 = 174: 40bd59f Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
171: 124f803 = 175: 21b8eb2 Drop the
cast_size_t_to_ulong()helper172: f80338e = 176: 6a962a8 Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
179: d88e08d = 177: eaba948 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
174: a4c5f15 = 178: f81792e Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
175: f8b0b41 = 179: edb4638 coverity: skip building with Rust, for now
180: d9afce4 = 180: cc10ed4 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
181: 7bef68a = 181: 4b6732e Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction182: 2260203 = 182: 6ff56f0 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
183: ea6551e = 183: a05e717 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
184: 7e20431 = 184: 82e3147 Merge 'add-p-many-files'
185: 5493b46 = 185: ab09dab Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
186: 0ee85ed = 186: 83887f9 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
187: 5dfe104 = 187: 2e86eaa Merge 'git-gui/js/intent-to-add'
188: e5a9701 = 188: 1d0283c Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
189: 44a8619 = 189: f79787f Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
190: 7b02ab5 = 190: 7be9593 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
191: 5204a85 = 191: 01f52bd Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path192: f9752dd = 192: ed0541f Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
193: a399506 = 193: 8063329 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
194: d40ffa2 = 194: 3505136 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests195: 42550f2 = 195: 3bd2ef1 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
196: 4b7fce8 = 196: 550f2c8 Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t197: 811439f = 197: 97b5642 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory198: ee73c94 = 198: 663a707 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
199: 83fc85d = 199: 1860128 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
200: 3bdd8fe = 200: 1ba2ee0 Merge branch 'optionally-dont-append-atomically-on-windows'
201: e1cdddc = 201: 012b342 Merge branch 'fsync-object-files-always'
202: cd5015f = 202: fc67c70 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
203: 962bd91 = 203: 76638d5 Fix Windows version resources (Fix Windows version resources git#4092)
204: 8e2b40c = 204: 3d60535 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
205: cd2ad34 = 205: 2938956 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)206: 5dff5ad = 206: a545c5e Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)207: 6090c23 = 207: 57a134e Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283208: 11229a1 = 208: 49ce06e Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
209: 2114837 = 209: 73b3231 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
210: baf8392 = 210: fbc9b7f Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
211: 163dd12 = 211: fd6f08e Merge branch 'nano-server'
212: 77bdc5f = 212: 4590134 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
213: 7ddd870 = 213: 6bd563f win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
214: 7d919fc = 214: 2de2878 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
215: e0ac249 = 215: 9807d20 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
216: 7382c14 = 216: a296b85 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
217: a636183 = 217: 6a96b19 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
218: 66e94cb = 218: 0a11ad8 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
219: 5dcb572 = 219: 6183ee7 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
220: 8c2310b = 220: b3efb0d credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
221: b1f1481 = 221: e075097 Merge branch 'reftable-vs-custom-allocators'
222: 4ae8ec9 = 222: 77393ee Merge branch 'check-whitespace-only-downstream'
223: 0a9a66d = 223: 1beaecf t/t5571-prep-push-hook.sh: Add test with writing to stderr (t/t5571-prep-push-hook.sh: Add test with writing to stderr git#6063)
224: a9fc5f9 = 224: 764aaac Merge branch 'disallow-ntlm-auth-by-default'
225: a593687 = 225: 8b81915 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)226: 7140540 = 226: 9ab2c9a Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
227: 7ca4476 = 227: a175c54 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
228: 2eafd35 = 228: 164de70 entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
229: 4926b1f = 229: 7505420 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)230: faecd4e = 230: 17b7588 Merge branch 'msys2'
231: 29a2963 = 231: e4a7b55 Merge 'docker-volumes-are-no-symlinks'
232: d842465 = 232: 51acd44 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
233: 1d9699c = 233: 87a3849 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
234: 52a6973 = 234: 9912c83 Merge branch 'dont-clean-junctions'
235: 5a59acb = 235: e97bcc8 Merge branch 'wsl-file-mode-bits'
236: c8b643b = 236: 83d4eac Merge branch 'validate-dotgit'
237: 42c1c8f = 237: 4039d23 Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
238: c9e9c1d = 238: 983f132 Merge branch 'skip-rust-in-the-coverity-builds'
239: e3e194d = 239: 0a09af6 Merge branch 'ready-for-upstream'
240: bb2717d = 240: 7a52fa7 Win32: make FILETIME conversion functions public
241: 19ee7cd = 241: a8814da Win32: dirent.c: Move opendir down
242: ae539c9 = 242: 9ba0835 mingw: make the dirent implementation pluggable
244: b0214f2 = 243: 5f2c58d Win32: make the lstat implementation pluggable
246: b6e3df3 = 244: b3017c6 mingw: add infrastructure for read-only file system level caches
247: e019fe0 = 245: b771508 mingw: add a cache below mingw's lstat and dirent implementations
248: 4704f28 = 246: cf59b2f fscache: load directories only once
249: 3dc1c3e = 247: dc25200 fscache: add key for GIT_TRACE_FSCACHE
250: 98604c5 = 248: d72d71a fscache: remember not-found directories
251: 69d2245 = 249: ea909cd fscache: add a test for the dir-not-found optimization
252: 16cd1af = 250: a9efdc5 add: use preload-index and fscache for performance
253: 221f021 = 251: a28985a dir.c: make add_excludes aware of fscache during status
254: e820cae = 252: 2174768 fscache: make fscache_enabled() public
255: 7d2deba = 253: f136808 dir.c: regression fix for add_excludes with fscache
256: 1ca9fcd = 254: 24c0ad4 fetch-pack.c: enable fscache for stats under .git/objects
257: b5df7c4 = 255: e4408f3 checkout.c: enable fscache for checkout again
258: b8d59cc = 256: 4f59f53 Enable the filesystem cache (fscache) in refresh_index().
259: 1206b51 = 257: f257b51 fscache: use FindFirstFileExW to avoid retrieving the short name
260: 8395839 = 258: ab5a9d0 fscache: add GIT_TEST_FSCACHE support
261: 8751a4d = 259: 0c6e2df fscache: add fscache hit statistics
262: e8ddf44 = 260: 5a29185 unpack-trees: enable fscache for sparse-checkout
263: 5824b2d = 261: 8238f6f status: disable and free fscache at the end of the status command
264: acc8950 = 262: aa0204c mem_pool: add GIT_TRACE_MEMPOOL support
265: 8337a5e = 263: 8bd0742 fscache: fscache takes an initial size
266: de90928 = 264: d76d67f fscache: update fscache to be thread specific instead of global
267: 9ff13da = 265: b9349e4 fscache: teach fscache to use mempool
268: dd2e2b2 = 266: f81faeb fscache: make fscache_enable() thread safe
269: fe682e9 = 267: 063bb8f fscache: teach fscache to use NtQueryDirectoryFile
270: c77045f = 268: 868ee75 fscache: remember the reparse tag for each entry
271: 5741aea = 269: b81ae07 fscache: Windows Docker volumes are not symbolic links
272: c935e98 = 270: b9876e9 fscache: optionally enable wsl compability file mode bits
243: 8207a59 = 271: c3a6829 git-gui--askyesno: fix funny text wrapping
274: c74714d = 272: c92ddbc fscache: implement an FSCache-aware is_mount_point()
245: 8beec78 = 273: cafe189 git-gui--askyesno (mingw): use Git for Windows' icon, if available
273: b7e9580 = 274: 475ac23 Merge branch 'fscache'
275: 5f05593 = 275: f03ce16 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
276: 8baf550 = 276: c10a962 clean: make use of FSCache
277: 1d0b2df = 277: 7c9748b Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
278: 1bc80c6 = 278: 6d69214 Merge branch 'dont-clean-junctions-fscache'
279: 539196a = 279: 8373fee pack-objects (mingw): demonstrate a segmentation fault with large deltas
280: b6f844f = 280: c633292 mingw: support long paths
281: 7a56d82 = 281: 89ef43c win32(long path support): leave drive-less absolute paths intact
282: 3ce1b5b = 282: 247b3b0 compat/fsmonitor/fsm-*-win32: support long paths
283: 22de74f = 283: a301df9 clean: suggest using
core.longPathsif paths are too long to remove284: bb94c78 = 284: 67b6bbb mingw: explicitly specify with which cmd to prefix the cmdline
285: 72666cf = 285: 24b46ce mingw: when path_lookup() failed, try BusyBox
286: db3302f = 286: 308836c test-tool: learn to act as a drop-in replacement for
iconv287: 580c57c = 287: 8680315 tests(mingw): if
iconvis unavailable, usetest-helper --iconv288: d0f9482 = 288: c25144a gitattributes: mark .png files as binary
289: e6ec46f = 289: 4d90024 tests: move test PNGs into t/lib-diff/
290: 549e042 = 290: 6e74202 tests: only override sort & find if there are usable ones in /usr/bin/
291: 7be49fa = 291: 045a1e5 tests: use the correct path separator with BusyBox
292: 8f25945 = 292: d18dd58 mingw: only use Bash-ism
builtin pwd -Wwhen available293: d05245d = 293: 855a30c tests (mingw): remove Bash-specific pwd option
294: a11f467 = 294: 07b43b6 test-lib: add BUSYBOX prerequisite
295: 44fbfe6 = 295: 7fe3b33 t5003: use binary file from t/lib-diff/
296: 547d6c5 = 296: 12183af t5532: workaround for BusyBox on Windows
297: 707f77a = 297: 1d98cd6 t5605: special-case hardlink test for BusyBox-w32
298: 90da29c = 298: 7c4a28e t5813: allow for $PWD to be a Windows path
299: f89a595 = 299: f4ee878 t9200: skip tests when $PWD contains a colon
300: 22925f3 = 300: 7c1541f Describe Git for Windows' architecture
301: 4228a4a = 301: 1293763 Add an AGENTS.md file to help with AI-assisted debugging/development
302: 4475a6b = 302: 37b49ce Modify the Code of Conduct for Git for Windows
309: 8b76e5e = 303: b7fdc7e Merge branch 'gitk-and-git-gui-patches'
303: 959d5bf = 304: a0ef50c CONTRIBUTING.md: add guide for first-time contributors
315: 72d3470 = 305: 8a34da1 Merge branch 'long-paths'
304: 29ce978 = 306: d819397 README.md: Add a Windows-specific preamble
310: 24115d2 = 307: b19fca2 Partially un-revert "editor: save and reset terminal after calling EDITOR"
316: ef382c3 = 308: 518f4e4 Merge branch 'busybox-w32'
305: 6f1c8dd = 309: cb6ca4e Add an issue template
311: ede69d7 = 310: 9e36aab reset: reinstate support for the deprecated --stdin option
317: db96bad = 311: 4aedde5 Merge branch 'un-revert-editor-save-and-reset'
306: ec86da4 = 312: 4c90b16 Modify the GitHub Pull Request template (to reflect Git for Windows)
307: d9f19f7 = 313: fc6e5ad Add a GitHub workflow to monitor component updates
312: 940e1a9 = 314: c3c2c3d fsmonitor: reintroduce core.useBuiltinFSMonitor
318: b50db95 = 315: 1dcf622 Merge branch 'phase-out-reset-stdin'
308: bdc2230 = 316: cea9932 SECURITY.md: document Git for Windows' policies
313: 40dbd3e = 317: 006acda dependabot: help keeping GitHub Actions versions up to date
319: fe547fa = 318: d5434dd Merge branch 'deprecate-core.useBuiltinFSMonitor'
314: fd586e2 = 319: 2f681fe ci: only run the expensive tests in the Windows tests for now
320: 4a33951 = 320: c5d5b21 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
321: 32ffe14 = 321: a642255 Merge 'readme' into HEAD
322: 4aafd03 = 322: 9114b0f build(deps): bump actions/cache from 5 to 6
323: 938faba = 323: 668c988 build(deps): bump actions/cache from 5 to 6 (build(deps): bump actions/cache from 5 to 6 git#6303)
324: e38c559 = 324: 50bc331 Some amendments for the
hashliteral_tsize fixes (Some amendments for thehashliteral_tsize fixes git#6311)325: 479ccc4 = 325: fa64b58 repo: split annotated tags out from total tag count in structure
326: d07d463 = 326: f8c5070 repo: filter the structure scope via --ref-filter=
327: 2daa8a1 = 327: 718db3d repo: report top-N paths by count, disk, and inflated size in structure
328: 091aa68 = 328: 890272d t1901: cover the --top option of
git repo structure329: c5b9807 = 329: 29eed75 repo: read the
--topdefault fromrepo.structure.top330: f6c7ec0 = 330: d3dbead git-survey: announce the upcoming pivot into
git repo structure331: ec04d13 = 331: a655568 survey: turn into a thin shim over
git repo structure332: bd03686 = 332: f57f952 Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)333: abd644f = 333: 487c803 fixup! run-command: be helpful with Git LFS fails on Windows 7
334: eef11d6 = 334: c960e45 Drop Windows 7 support (Drop Windows 7 support git#6325)
335: 2d5e463 = 335: 05058cc Merge tag 'v2.55.0.windows.3'
Truncated; see the full conflict report in the workflow run summary.