Repository navigation
Rebase shears/seen: 6 conflict(s) (1 skipped, 5 resolved) (#39023444532) - #535
Open
gitforwindowshelper[bot] wants to merge 324 commits into
Open
gitforwindowshelper[bot] wants to merge 324 commits into
gitforwindowshelper[bot] wants to merge 324 commits into
Conversation
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>
headless-git is a git executable without opening a console window. It is useful when other GUI executables want to call git. We should install it together with git on Windows. Signed-off-by: Yuyi Wang <Strawberry_Str@hotmail.com>
winuser.h contains the definition of RT_MANIFEST that our LLVM based toolchain needs to understand that we want to embed compat/win32/git.manifest as an application manifest. It currently just embeds it as additional data that Windows doesn't understand. This also helps our GCC based toolchain understand that we only want one copy embedded. It currently embeds one working assembly manifest and one nearly identical, but useless copy as additional data. This also teaches our Visual Studio based buildsystems to pick up the manifest file from git.rc. This means we don't have to explicitly specify it in contrib/buildsystems/Generators/Vcxproj.pm anymore. Slightly counter-intuitively this also means we have to explicitly tell Cmake not to embed a default manifest. This fixes git-for-windows#4707 Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
This will help with Git for Windows' maintenance going forward: It allows Git for Windows to switch its primary libcurl to a variant without the OpenSSL backend, while still loading an alternate when setting `http.sslBackend = openssl`. This is necessary to avoid maintenance headaches with upgrading OpenSSL: its major version name is encoded in the shared library's file name and hence major version updates (temporarily) break libraries that are linked against the OpenSSL library. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In Git for Windows v2.39.0, we fixed a regression where `git.exe` would no longer work in Windows Nano Server (frequently used in Docker containers). This GitHub workflow can be used to verify manually that the Git/Scalar executables work in Nano Server. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When running Git for Windows on a remote APFS filesystem, it would appear that the `mingw_open_append()`/`write()` combination would fail almost exactly like on some CIFS-mounted shares as had been reported in git-for-windows#2753, albeit with a different `errno` value. Let's handle that `errno` value just the same, by suggesting to set `windows.appendAtomically=false`. Signed-off-by: David Lomas <dl3@pale-eds.co.uk> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Windows 10 version 1511 (also known as Anniversary Update), according to https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences introduced native support for ANSI sequence processing. This allows using colors from the entire 24-bit color range. All we need to do is test whether the console's "virtual processing support" can be enabled. If it can, we do not even need to start the `console_thread` to handle ANSI sequences. Or, almost all we need to do: When `console_thread()` does its work, it uses the Unicode-aware `write_console()` function to write to the Win32 Console, which supports Git for Windows' implicit convention that all text that is written is encoded in UTF-8. The same is not necessarily true if native ANSI sequence processing is used, as the output is then subject to the current code page. Let's ensure that the code page is set to `CP_UTF8` as long as Git writes to it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
By default, the buffer type of Windows' `stdout` is unbuffered (_IONBF), and there is no need to manually fflush `stdout`. But some programs, such as the Windows Filtering Platform driver provided by the security software, may change the buffer type of `stdout` to full buffering. This nees `fflush(stdout)` to be called manually, otherwise there will be no output to `stdout`. Signed-off-by: MinarKotonoha <chengzhuo5@qq.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A long time ago, we decided to run tests in Git for Windows' SDK with the default `winsymlinks` mode: copying instead of linking. This is still the default mode of MSYS2 to this day. However, this is not how most users run Git for Windows: As the majority of Git for Windows' users seem to be on Windows 10 and newer, likely having enabled Developer Mode (which allows creating symbolic links without administrator privileges), they will run with symlink support enabled. This is the reason why it is crucial to get the fixes for CVE-2024-? to the users, and also why it is crucial to ensure that the test suite exercises the related test cases. This commit ensures the latter. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In order to be a better Windows citizenship, Git should save its configuration files on AppData folder. This can enables git configuration files be replicated between machines using the same Microsoft account logon which would reduce the friction of setting up Git on new systems. Therefore, if %APPDATA%\Git\config exists, we use it; otherwise $HOME/.config/git/config is used. Signed-off-by: Ariel Lourenco <ariellourenco@users.noreply.github.com>
The sparse tree walk algorithm was created in d5d2e93 (revision: implement sparse algorithm, 2019-01-16) and involves using the mark_trees_uninteresting_sparse() method. This method takes a repository and an oidset of tree IDs, some of which have the UNINTERESTING flag and some of which do not. Create a method that has an equivalent set of preconditions but uses a "dense" walk (recursively visits all reachable trees, as long as they have not previously been marked UNINTERESTING). This is an important difference from mark_tree_uninteresting(), which short-circuits if the given tree has the UNINTERESTING flag. A use of this method will be added in a later change, with a condition set whether the sparse or dense approach should be used. Signed-off-by: Derrick Stolee <stolee@gmail.com>
While this command is definitely something we _want_, chances are that upstreaming this will require substantial changes. We still want to be able to experiment with this before that, to focus on what we need out of this command: To assist with diagnosing issues with large repositories, as well as to help monitoring the growth and the associated painpoints of such repositories. To that end, we are about to integrate this command into `microsoft/git`, to get the tool into the hands of users who need it most, with the idea to iterate in close collaboration between these users and the developers familar with Git's internals. However, we will definitely want to avoid letting anybody have the impression that this command, its exact inner workings, as well as its output format, are anywhere close to stable. To make that fact utterly clear (and thereby protect the freedom to iterate and innovate freely before upstreaming the command), let's mark its output as experimental in all-caps, as the first thing we do. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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 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>
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>
The winsock2 library provides functions that work on different data types than file descriptors, therefore we wrap them. But that is not the only difference: they also do not set `errno` but expect the callers to enquire about errors via `WSAGetLastError()`. Let's translate that into appropriate `errno` values whenever the socket operations fail so that Git's code base does not have to change its expectations. This closes git-for-windows#2404 Helped-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Prep for the widenings of its callers, where size-receiving locals will become size_t (combine-diff's result_size in the immediately following commit, struct diff_filespec.size in a later topic). Body caps the parameter at 8000 anyway, so the type change is mechanical. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Smallest piece of the tree topic. link_len is only used as strbuf_splice()'s size_t length and as an array index; widening it outright removes the cast_size_t_to_ulong() shim and the bridge local that fed it. odb_read_object() now writes straight into link_len. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
We map WSAGetLastError() errors to errno errors in winsock_error_to_errno(), but the MSVC strerror() implementation only produces "Unknown error" for most of them. Produce some more meaningful error messages in these cases. Our builds for ARM64 link against the newer UCRT strerror() that does know these errors, so we won't change the strerror() used there. The wording of the messages is copied from glibc strerror() messages. Reported-by: M Hickford <mirth.hickford@gmail.com> Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Although NTLM authentication is considered weak (extending even to
NTLMv2, which purportedly allows brute-forcing reasonably complex
8-character passwords in a matter of days, given ample compute
resources), it _is_ one of the authentication methods supported by
libcurl.
Note: The added test case *cannot* reuse the existing `custom_auth`
facility. The reason is that that facility is backed by an NPH script
("No Parse Headers"), which does not allow handling the 3-phase NTLM
authentication correctly (in my hands, the NPH script would not even be
called upon the Type 3 message, a "200 OK" would be returned, but no
headers, let alone the `git http-backend` output as payload). Having a
separate NTLM authentication script makes the exact workings clearer and
more readable, anyway.
Co-authored-by: Matthew John Cheetham <mjcheetham@outlook.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This will come in handy in the next commit. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Bert Belder <bertbelder@gmail.com>
Continue the size_t evacuation. With buffer_is_binary() widened in the prior commit, every consumer that the size flows into in combine-diff.c is size_t-ready, so widen grab_blob()'s out-param outright and move the matching locals at its three call sites together. grab_blob()'s body collapses to a direct odb_read_object(&size) since the bridge variable is no longer needed. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Prep for dropping the cast_size_t_to_ulong() shim in add_preferred_base() (pack-objects.c), and aligns the public API with the size_t shape the rest of the tree topic is moving toward. struct tree_desc.size stays unsigned int -- the on-disk tree format hard-caps each tree at 4 GiB, so the field is intentionally narrow and the assignment in init_tree_desc_internal() already truncated unsigned long inputs the same way it now truncates size_t inputs. The widening is purely about the call-side type-correctness; the internal cap is unchanged. All 30+ callers pass values that promote cleanly (unsigned long, size_t, or smaller integer types). Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This comment has been true for the longest time; The combination of the two preceding commits made it incorrect, so let's drop that comment. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NTLM authentication is relatively weak. This is the case even with the
default setting of modern Windows versions, where NTLMv1 and LanManager
are disabled and only NTLMv2 is enabled: NTLMv2 hashes of even
reasonably complex 8-character passwords can be broken in a matter of
days, given enough compute resources.
Even worse: On Windows, NTLM authentication uses Security Support
Provider Interface ("SSPI"), which provides the credentials without
requiring the user to type them in.
Which means that an attacker could talk an unsuspecting user into
cloning from a server that is under the attacker's control and extracts
the user's NTLMv2 hash without their knowledge.
For that reason, let's disallow NTLM authentication by default.
NTLM authentication is quite simple to set up, though, and therefore
there are still some on-prem Azure DevOps setups out there whose users
and/or automation rely on this type of authentication. To give them an
escape hatch, introduce the `http.<url>.allowNTLMAuth` config setting
that can be set to `true` to opt back into using NTLM for a specific
remote repository.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Getting started contributing to Git can be difficult on a Windows machine. CONTRIBUTING.md contains a guide to getting started, including detailed steps for setting up build tools, running tests, and submitting patches to upstream. [includes an example by Pratik Karki how to submit v2, v3, v4, etc.] Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
While it may seem super convenient to some old Unix hands to simpy require Perl to be available when running the test suite, this is a major hassle on Windows, where we want to verify that Perl is not, actually, required in a NO_PERL build. As a super ugly workaround, we "install" a script into /usr/bin/perl reading like this: #!/bin/sh # We'd much rather avoid requiring Perl altogether when testing # an installed Git. Oh well, that's why we cannot have nice # things. exec c:/git-sdk-64/usr/bin/perl.exe "$@" The problem with that is that BusyBox assumes that the #! line in a script refers to an executable, not to a script. So when it encounters the line #!/usr/bin/perl in t5532's proxy-get-cmd, it barfs. Let's help this situation by simply executing the Perl script with the "interpreter" specified explicitly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When trying to ensure that long paths are handled correctly, we first normalize absolute paths as we encounter them. However, if the path is a so-called "drive-less" absolute path, i.e. if it is relative to the current drive but _does_ start with a directory separator, we would want the normalized path to be such a drive-less absolute path, too. Let's do that, being careful to still include the drive prefix when we need to go through the `\\?\` dance (because there, the drive prefix is absolutely required). This fixes git-for-windows#4586. 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>
When t5605 tries to verify that files are hardlinked (or that they are not), it uses the `-links` option of the `find` utility. BusyBox' implementation does not support that option, and BusyBox-w32's lstat() does not even report the number of hard links correctly (for performance reasons). So let's just switch to a different method that actually works on Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Update wchar_t buffers to use MAX_LONG_PATH instead of MAX_PATH and call xutftowcs_long_path() in the Win32 backend source files. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
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>
Git for Windows uses MSYS2's Bash to run the test suite, which comes with benefits but also at a heavy price: on the plus side, MSYS2's POSIX emulation layer allows us to continue pretending that we are on a Unix system, e.g. use Unix paths instead of Windows ones, yet this is bought at a rather noticeable performance penalty. There *are* some more native ports of Unix shells out there, though, most notably BusyBox-w32's ash. These native ports do not use any POSIX emulation layer (or at most a *very* thin one, choosing to avoid features such as fork() that are expensive to emulate on Windows), and they use native Windows paths (usually with forward slashes instead of backslashes, which is perfectly legal in almost all use cases). And here comes the problem: with a $PWD looking like, say, C:/git-sdk-64/usr/src/git/t/trash directory.t5813-proto-disable-ssh Git's test scripts get quite a bit confused, as their assumptions have been shattered. Not only does this path contain a colon (oh no!), it also does not start with a slash. This is a problem e.g. when constructing a URL as t5813 does it: ssh://remote$PWD. Not only is it impossible to separate the "host" from the path with a $PWD as above, even prefixing $PWD by a slash won't work, as /C:/git-sdk-64/... is not a valid path. As a workaround, detect when $PWD does not start with a slash on Windows, and simply strip the drive prefix, using an obscure feature of Windows paths: if an absolute Windows path starts with a slash, it is implicitly prefixed by the drive prefix of the current directory. As we are talking about the current directory here, anyway, that strategy works. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, git repositories may have extra files which need cleaned (e.g., a build directory) that may be arbitrarily deep. Suggest using `core.longPaths` if such situations are encountered. Fixes: git-for-windows#2715 Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
These are Git for Windows' Git GUI and gitk patches. We will have to decide at some point what to do about them, but that's a little lower priority (as Git GUI seems to be unmaintained for the time being, and the gitk maintainer keeps a very low profile on the Git mailing list, too). 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>
On Windows, the current working directory is pretty much guaranteed to contain a colon. If we feed that path to CVS, it mistakes it for a separator between host and port, though. This has not been a problem so far because Git for Windows uses MSYS2's Bash using a POSIX emulation layer that also pretends that the current directory is a Unix path (at least as long as we're in a shell script). However, that is rather limiting, as Git for Windows also explores other ports of other Unix shells. One of those is BusyBox-w32's ash, which is a native port (i.e. *not* using any POSIX emulation layer, and certainly not emulating Unix paths). So let's just detect if there is a colon in $PWD and punt in that case. 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>
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>
…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>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
…updates Start monitoring updates of Git for Windows' component in the open
The special-casing of `NUL` in `mingw_access()` was added in 9160068 (msvc: avoid calling `access("NUL", flags)`, 2021-04-16) because the Universal C Runtime's ("UCRT") `_waccess()` rejects `NUL` as an invalid argument. With the switch of GIt for Windows from the MSVCRT-based MINGW64 build to the UCRT-based UCRT64 build in 2.56.0, any spelling other than lowercase `nul` now reaches `_waccess()` and fails. Windows device names are case-insensitive, and `NUL` is the canonical spelling, but even `Nul` is allowed, so a case-insensitive comparison is needed. Note that we cannot use `fspathcmp()` here, as we would usually do: This function is in the code path when reading the config, and `core.ignoreCase` would therefore not be set correctly yet e.g. when running under `GIT_CONFIG_GLOBAL=NUL`. This fixes git-for-windows#6449 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…r-windows#6450) Currently, when running `GIT_CONFIG_GLOBAL=NUL git config --list`, it fails with: ``` fatal: unable to access 'NUL': Invalid argument ``` The underlying reason is the different behavior of the C runtime used by MINGW64 vs UCRT64. Let's accommodate for that. This fixes git-for-windows#6449
This bumps `actions/setup-python from version 6 to 7. The main change is that this is now an ECMAScript Module, which bumps the minimum requirements for GitHub Enterprise Server setups enough to warrant a full major version bump. Release notes: https://github.com/actions/setup-python/releases Commits: actions/setup-python@v6...v7 Originally-authored-by: dependabot[bot] <support@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
I ran into these new failures (caused by an upgrade to libcurl v8.23.0 in CI builds) in Microsoft Git and fixed them via microsoft#1007; This is a companion to fast-track the same fix into Git for Windows.
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: 6b9d27973b (Backport fix for now-flaky HTTP-auth tests (git-for-windows#6489), 2026-10-16) (f9d493ee07..6b9d27973b)
Resolved: 11eb79f (repo: split annotated tags out from total tag count in structure, 2026-06-05)
preserved annotated-tag counting while adapting initialization to upstream's removal of add_to_pending
Range-diff
1: 11eb79f ! 1: 8dfc23a repo: split annotated tags out from total tag count in structure
Skipped: 98fb28a (repo: filter the structure scope via --ref-filter=, 2026-06-06)
Upstream equivalent: 83b910b (survey: add command line opts to select references, 2024-04-29)
Range-diff
1: 98fb28a ! 1: 83b910b repo: filter the structure scope via --ref-filter=
Resolved: 8fff863 (repo: report top-N paths by count, disk, and inflated size in structure, 2026-06-06)
added top-path reporting while preserving upstream command parsing and staged both resolved files
Range-diff
1: 8fff863 ! 1: 3487bab repo: report top-N paths by count, disk, and inflated size in structure
Resolved: b13a4a7 (t1901: cover the --top option of
git repo structure, 2026-06-06)retained --top coverage on the updated upstream test file
Range-diff
1: b13a4a7 ! 1: 6138901 t1901: cover the --top option of
git repo structure@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> ## t/t1901-repo-structure.sh ## -@@ t/t1901-repo-structure.sh: test_expect_success '--ref-filter unions multiple patterns' ' +@@ t/t1901-repo-structure.sh: test_expect_success 'progress meter option' ' ) ' @@ t/t1901-repo-structure.sh: test_expect_success '--ref-filter unions multiple pat + test_must_fail git repo structure --top=-1 2>err && + test_grep "must be non-negative" err +' -+ test_expect_success 'git repo structure -h shows only repo structure usage' ' git repo structure -h >actual && test_grep "git repo structure" actual &&Resolved: a5ed505 (repo: read the
--topdefault fromrepo.structure.top, 2026-06-06)preserved upstream argument parsing, added repo.structure.top config default, retained tests, and staged both files
Range-diff
1: a5ed505 ! 1: c415d04 repo: read the
--topdefault fromrepo.structure.topResolved: 6b9d279 (Backport fix for now-flaky HTTP-auth tests (git-for-windows#6489), 2026-10-16)
retained and staged the libcurl URL API lazy-loading shim on upstream code
Range-diff
1: 6b9d279 ! 1: 90a9327 Backport fix for now-flaky HTTP-auth tests (Backport fix for now-flaky HTTP-auth tests git#6489)
@@ Commit message fast-track the same fix into Git for Windows. ## compat/lazyload-curl.c ## + remerge CONFLICT (add/add): Merge conflict in compat/lazyload-curl.c + index 8cded9d769..c361eab85c 100644 + --- compat/lazyload-curl.c + +++ compat/lazyload-curl.c @@ compat/lazyload-curl.c: static curl_easy_setopt_pointer_type curl_easy_setopt_pointer_func; typedef CURLcode (*curl_easy_setopt_off_t_type)(CURL *curl, CURLoption opt, curl_off_t value); static curl_easy_setopt_off_t_type curl_easy_setopt_off_t_func; -+typedef CURLU *(*curl_url_type)(void); -+static curl_url_type curl_url_func; -+ -+typedef void (*curl_url_cleanup_type)(CURLU *u); -+static curl_url_cleanup_type curl_url_cleanup_func; -+ -+typedef CURLUcode (*curl_url_get_type)(const CURLU *u, CURLUPart what, -+ char **part, unsigned int flags); -+static curl_url_get_type curl_url_get_func; -+ -+typedef CURLUcode (*curl_url_set_type)(CURLU *u, CURLUPart what, -+ const char *part, unsigned int flags); -+static curl_url_set_type curl_url_set_func; -+ +-<<<<<<< 1dab2f4359 (ci: bump actions/setup-python from 6 to 7) +-======= + typedef CURLU *(*curl_url_type)(void); + static curl_url_type curl_url_func; + +@@ compat/lazyload-curl.c: typedef CURLUcode (*curl_url_set_type)(CURLU *u, CURLUPart what, + const char *part, unsigned int flags); + static curl_url_set_type curl_url_set_func; + +->>>>>>> ad514b3878 (Merge branch 'jk/http-curl-strip-creds') static char ssl_backend[64]; static void lazy_load_curl(void) @@ compat/lazyload-curl.c: static void lazy_load_curl(void) curl_easy_setopt_long_func = (curl_easy_setopt_long_type)curl_easy_setopt_func; curl_easy_setopt_pointer_func = (curl_easy_setopt_pointer_type)curl_easy_setopt_func; curl_easy_setopt_off_t_func = (curl_easy_setopt_off_t_type)curl_easy_setopt_func; -+ -+ curl_url_func = (curl_url_type)load_function(libcurl, "curl_url"); -+ curl_url_cleanup_func = (curl_url_cleanup_type)load_function(libcurl, "curl_url_cleanup"); -+ curl_url_get_func = (curl_url_get_type)load_function(libcurl, "curl_url_get"); -+ curl_url_set_func = (curl_url_set_type)load_function(libcurl, "curl_url_set"); +-<<<<<<< 1dab2f4359 (ci: bump actions/setup-python from 6 to 7) +-======= + + curl_url_func = (curl_url_type)load_function(libcurl, "curl_url"); + curl_url_cleanup_func = (curl_url_cleanup_type)load_function(libcurl, "curl_url_cleanup"); + curl_url_get_func = (curl_url_get_type)load_function(libcurl, "curl_url_get"); + curl_url_set_func = (curl_url_set_type)load_function(libcurl, "curl_url_set"); +->>>>>>> ad514b3878 (Merge branch 'jk/http-curl-strip-creds') } struct curl_version_info_data *curl_version_info(CURLversion version) @@ compat/lazyload-curl.c: CURLcode curl_easy_setopt(CURL *curl, CURLoption opt, .. va_end(ap); return res; } -+ -+CURLU *curl_url(void) -+{ -+ return curl_url_func(); -+} -+ -+void curl_url_cleanup(CURLU *u) -+{ -+ curl_url_cleanup_func(u); -+} -+ -+CURLUcode curl_url_get(const CURLU *u, CURLUPart what, -+ char **part, unsigned int flags) -+{ -+ return curl_url_get_func(u, what, part, flags); -+} -+ -+CURLUcode curl_url_set(CURLU *u, CURLUPart what, -+ const char *part, unsigned int flags) -+{ -+ return curl_url_set_func(u, what, part, flags); -+} +-<<<<<<< 1dab2f4359 (ci: bump actions/setup-python from 6 to 7) +-======= + + CURLU *curl_url(void) + { +@@ compat/lazyload-curl.c: CURLUcode curl_url_set(CURLU *u, CURLUPart what, + { + return curl_url_set_func(u, what, part, flags); + } +->>>>>>> ad514b3878 (Merge branch 'jk/http-curl-strip-creds')To: 90a9327955 (Backport fix for now-flaky HTTP-auth tests (git-for-windows#6489), 2026-10-16) (5cb0ffc12f..90a9327955)
Statistics
Range-diff (click to expand)
1: 86760e8 = 1: c85ee38 unix-socket: avoid leak when initialization fails
2: 59512c9 = 2: 3ed68d2 grep: prevent
^$false match at end of file4: 07b7390 = 3: a4a93a2 Merge branch 'fixes-from-the-git-mailing-list'
10: 999f901 = 4: 7dd1536 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
11: deaafa3 = 5: 3b09639 vcpkg_install: detect lack of Git
12: b68024a = 6: 513bbac vcpkg_install: add comment regarding slow network connections
15: db82c7b = 7: 7e9df76 vcbuild: install ARM64 dependencies when building ARM64 binaries
18: d7d7c8b = 8: 0132d5d vcbuild: add an option to install individual 'features'
13: ddc2b9a = 9: c835247 t5505/t5516: allow running without
.git/branches/in the templates14: 4b45b3e = 10: 3baca01 max_tree_depth: lower it for clang builds in general on Windows
20: 27874d6 = 11: 5d29d78 cmake: allow building for Windows/ARM64
16: f7ffa25 = 12: a81b3c3 t5505/t5516: fix white-space around redirectors
17: 6a80a83 = 13: cf2bb4d mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
22: 4b459ec = 14: 4750c4b ci(vs-build) also build Windows/ARM64 artifacts
19: c3d8518 = 15: ffb4acf Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
24: 2767433 = 16: 5571650 vcbuild: stop hard-coding OpenSSL as a dependency
21: 4c56abe = 17: f185a48 clink.pl: fix libexpatd.lib link error when using MSVC
26: 8d9cf5e = 18: f029de5 cmake(): allow setting HOST_CPU for cross-compilation
23: 726b46a = 19: f24e5c8 Makefile: clean up .ilk files when MSVC=1
28: f15f395 = 20: 128c8ee t9350: point out that refs are not updated correctly
29: 39a208f = 21: 30857b5 CMake: default Visual Studio generator has changed
25: 8a5a514 = 22: 49763d3 vcbuild: add support for compiling Windows resource files
3: 98ae9ab = 23: 0ec4de6 difftool: do not crash on a path rejected by verify_path()
31: c9ce807 = 24: 0e400b2 transport-helper: add trailing --
32: 10b60fc = 25: 5dd90f8 mingw: demonstrate a
git addissue with NTFS junctions33: 37961df = 26: e8d8f23 .gitignore: add Visual Studio CMakeSetting.json file
27: d7e9472 = 27: fd93de9 config.mak.uname: add git.rc to MSVC builds
5: 8fce4c6 = 28: 730676e difftool: avoid memory leak when
run_dir_diff()fails6: e8b44d3 = 29: 0981a73 ci: bump actions/checkout from 6 to 7
36: a932e7e = 30: 8bcc80b remote-helper: check helper status after import/export
37: 813e8ff = 31: c8b5cf1 strbuf_realpath(): use platform-dependent API if available
38: fe37735 = 32: 5745e4c http: use new "best effort" strategy for Secure Channel revoke checking
39: 88ffa97 = 33: 0f83e44 subtree: update
contrib/subtreetesttarget40: e1b1186 = 34: 553bb48 CMakeLists: add default "x64-windows" arch for Visual Studio
41: 1025a01 = 35: f96b727 setup: properly use "%(prefix)/" when in WSL
42: 52c8b2e = 36: f19547a Add config option
windows.appendAtomically35: bb0962e = 37: 256cdff MinGW: link as terminal server aware
30: ed6df1c = 38: feecd39 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
7: bfc7071 = 39: 573095f difftool: avoid invalid memory access by an atexit handler
8: 4cfe48c = 40: 7efff67 bundle-uri: refuse advertised URIs by protocol
9: a0d42ab = 41: 0686ee2 ci(coverity): bump actions/cache from 5 to 6
45: ae77593 = 42: 9d5fa9a Always auto-gc after calling a fast-import transport
46: 856548d = 43: 4ed3ebc mingw: prevent regressions with "drive-less" absolute paths
47: b271b99 = 44: 067c56d transport: optionally disable side-band-64k
48: 27e495c = 45: 3905827 mingw: fix fatal error working on mapped network drives on Windows
49: 69ab921 = 46: b233af1 clink.pl: fix MSVC compile script to handle libcurl-d.lib
50: 53eb983 = 47: b5f29cb mingw: implement a platform-specific
strbuf_realpath()51: 29c5185 = 48: 8b9748e t3701: verify that we can add lots of files interactively
52: da37748 = 49: a890b44 commit: accept "scissors" with CR/LF line endings
53: c5d3e75 = 50: 5b8ff4f t0014: fix indentation
54: b241fff = 51: 6615662 git-gui: accommodate for intent-to-add files
55: 70ebc6f = 52: e44e603 mingw: allow for longer paths in
parse_interpreter()56: 628440a = 53: 197357d compat/vcbuild: document preferred way to build in Visual Studio
57: 186597c = 54: 438002c http: optionally send SSL client certificate
58: eddc3d1 = 55: 145935d ci: run
contrib/subtreetests in CI builds59: 70ad1bd = 56: c2d69ca CMake: show Win32 and Generator_platform build-option values
60: f54cc03 = 57: 8507013 compat/mingw.c: do not warn when failing to get owner
61: 72b79c0 = 58: e3d74d5 mingw: $env:TERM="xterm-256color" for newer OSes
62: 248a9a9 = 59: d670d86 winansi: check result and Buffer before using Name
63: e802ebb = 60: 415b4ea mingw: change core.fsyncObjectFiles = 1 by default
64: 2d71e19 = 61: c4979d8 Fix Windows version resources
65: 46eb29f = 62: 5b162da status: fix for old-style submodules with commondir
67: f14c64e = 63: 90f5153 revision: create mark_trees_uninteresting_dense()
68: d5d1746 = 64: fe63640 survey: stub in new experimental 'git-survey' command
69: 182a7a0 = 65: 83b910b survey: add command line opts to select references
70: 16305c6 = 66: 2c2ff7d survey: start pretty printing data in table form
71: 9b3d6b2 = 67: 13e0c60 survey: add object count summary
72: 9f99e56 = 68: 1e23a78 survey: summarize total sizes by object type
73: f1ef8a8 = 69: 17c561f survey: show progress during object walk
74: f60a2d1 = 70: bc07395 survey: add ability to track prioritized lists
44: b552c21 = 71: a0960fd http: optionally load libcurl lazily
75: e075fa3 = 72: 09a4b65 survey: add report of "largest" paths
34: a2c6986 = 73: bb22a20 clink.pl: move default linker options for MSVC=1 builds
76: 3da5afe = 74: 7fd4ced http: support lazy-loading libcurl also on Windows
77: e22264c = 75: 405af17 survey: add --top= option and config
43: ef99c08 = 76: b38ce14 cmake: install headless-git.
78: 957e240 = 77: 3be3dee http: when loading libcurl lazily, allow for multiple SSL backends
79: 6956e25 = 78: 7c7aee0 survey: clearly note the experimental nature in the output
66: 869a2c9 = 79: d46464e git.rc: include winuser.h
80: f148e5d = 80: 33474bb mingw: do load libcurl dynamically by default
81: 24c4775 = 81: ff9066f Add a GitHub workflow to verify that Git/Scalar work in Nano Server
82: 3a58bb3 = 82: 61e98f6 mingw: suggest
windows.appendAtomicallyin more cases83: a2590b4 = 83: 157b3d2 win32: use native ANSI sequence processing, if possible
84: dce1f30 = 84: 959a364 common-main.c: fflush stdout buffer upon exit
85: 8634c16 = 85: f46485f t5601/t7406(mingw): do run tests with symlink support
86: a3784dc = 86: 4c3b865 Fallback to AppData if XDG_CONFIG_HOME is unset
87: 11eb79f ! 87: 8dfc23a repo: split annotated tags out from total tag count in structure
88: 98fb28a < -: ---------- repo: filter the structure scope via --ref-filter=
89: 8fff863 ! 88: 3487bab repo: report top-N paths by count, disk, and inflated size in structure
90: b13a4a7 ! 89: 6138901 t1901: cover the --top option of
git repo structure@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> ## t/t1901-repo-structure.sh ## -@@ t/t1901-repo-structure.sh: test_expect_success '--ref-filter unions multiple patterns' ' +@@ t/t1901-repo-structure.sh: test_expect_success 'progress meter option' ' ) ' @@ t/t1901-repo-structure.sh: test_expect_success '--ref-filter unions multiple pat + test_must_fail git repo structure --top=-1 2>err && + test_grep "must be non-negative" err +' -+ test_expect_success 'git repo structure -h shows only repo structure usage' ' git repo structure -h >actual && test_grep "git repo structure" actual &&93: a5ed505 ! 90: c415d04 repo: read the
--topdefault fromrepo.structure.top100: 5572aee = 91: cdf44fe mingw: Support
git_terminal_promptwith more terminals102: c903b19 = 92: c3e021a compat/terminal.c: only use the Windows console if bash 'read -r' fails
101: 696b388 = 93: 48bbb67 diff: stop truncating the deflated-binary-diff size on Windows
104: 725cf74 = 94: 13a4966 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
103: 0b981ed = 95: 0fc6c09 convert: widen gather_convert_stats() helpers to size_t
106: 7c0b194 = 96: ec5ed12 Win32: symlink: move phantom symlink creation to a separate function
105: fd826b4 = 97: e9b4515 read-cache: stop truncating index blob sizes on Windows
91: cbe30cc = 98: 220d74a mingw: make sure
errnois set correctly when socket operations fail108: 90fe5da = 99: bef86ac t5563: verify that NTLM authentication works
109: 0e851c6 = 100: 0cf0598 mingw: introduce code to detect whether we're inside a Windows container
110: 47d047b = 101: 1c029ed Introduce helper to create symlinks that knows about index_state
107: cacdedb = 102: 97dbca8 xdiff-interface: widen buffer_is_binary() size parameter to size_t
111: f876183 = 103: b333b46 tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
92: 67a573f = 104: 89ab081 compat/mingw: handle WSA errors in strerror
113: 89365e4 = 105: cf2ef72 http: disallow NTLM authentication by default
114: 6241c11 = 106: 614fe2d mingw: when running in a Windows container, try to rename() harder
115: f8239af = 107: 63ae8d0 mingw: allow to specify the symlink type in .gitattributes
112: faf7baa = 108: 23e3170 combine-diff: stop truncating combined-diff blob sizes on Windows
116: cd3a411 = 109: 2ccb82c tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
94: 3b077df = 110: 36eacdc compat/mingw: drop outdated comment
120: 9d58592 = 111: 0db6a01 http: warn if might have failed because of NTLM
121: b6beab2 = 112: 04f0d48 mingw: move the file_attr_to_st_mode() function definition
122: 67fa3e5 = 113: d0d2452 Win32: symlink: add test for
symlinkattribute117: ec37de7 = 114: 388f283 diff: widen textconv_object() size out-param to size_t
123: 20edba9 = 115: e40e6f0 pack-objects: drop the two tree-walk casts in the preferred-base path
95: 24495b5 = 116: f7c6228 git-survey: announce the upcoming pivot into
git repo structure96: ae50494 = 117: b8a6fee t0301: actually test credential-cache on Windows
126: 8c57f7a = 118: 9f6bd69 credential: advertise NTLM suppression and allow helpers to re-enable
127: 77dfda1 = 119: d2120ab mingw: Windows Docker volumes are not symbolic links
128: 293dbd1 = 120: 6ce0570 clean: do not traverse mount points
118: 56301f3 = 121: 3d01faa pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
124: 6f6476f = 122: 3f6074e diffcore: widen struct diff_filespec.size to size_t
129: 8caf7f4 = 123: 1f1bf60 tree: widen struct tree.size and parse_tree_buffer() to size_t
131: 013ee46 = 124: 16db436 commit: widen the commit-buffer API to size_t
132: a249fc0 = 125: b23a21c blame: widen find_line_starts() len parameter to size_t
133: e9856ca = 126: a53dbd8 grep: widen struct grep_source.size and grep_buffer() to size_t
134: ca13dbd = 127: 3a25c08 fast-export: drop the export_blob() size cast and widen anonymize_blob()
135: 7596add = 128: 9c3b221 repo: drop the inflated-size cast in count_objects()
97: 2390992 = 129: f6ce490 survey: turn into a thin shim over
git repo structure98: 95e315e = 130: 1bc8d6c credential-cache: handle ECONNREFUSED gracefully
99: 8c15657 = 131: edf7de4 reftable: do make sure to use custom allocators
137: aa13582 = 132: 0704231 check-whitespace: avoid alerts about upstream commits
138: d865b5a = 133: cf8abeb t/t5571-prep-push-hook.sh: Add test with writing to stderr
139: a486666 = 134: 2a39ada dir: do not traverse mount points
140: 2c82deb = 135: a5bd431 win32: thread-utils: handle multi-socket systems
141: 4532b66 = 136: 78273b8 t5563: add tests for http.emptyAuth with Negotiate
142: 85a9a0c = 137: b8158b1 entry: flush fscache after creating directories and writing files
143: 1b1db8e = 138: b6e2916 ci(macos): skip the
git p4tests144: 22b5afe = 139: fad1e3b mingw: work around rename() failing on a read-only file
145: c0b7ab3 = 140: 2fea4d3 clean: remove mount points when possible
146: 2f7304c = 141: 2754b01 mingw: optionally enable wsl compability file mode bits
147: 11d0968 = 142: c403421 Refuse to follow invalid paths in
.gitfiles119: e8f4f3b = 143: e4384cd Merge branch 'size-t/pack-objects-delta'
125: 9a2551c = 144: d2355ae Merge branch 'size-t/pack-bitmap'
130: e8699da = 145: 84b5ec3 Merge branch 'size-t/diff'
148: 89e467f = 146: 8d0bdf5 Merge branch 'size-t/tree'
150: 208b27d = 147: 01c04f2 Merge branch 'size-t/commit'
152: 9d18089 = 148: 81a63f8 Merge branch 'size-t/blame'
154: 8974240 = 149: ab03966 Merge branch 'size-t/grep'
149: 04417ca = 150: 5a596c9 difftool: do not crash on a path rejected by verify_path() (difftool: do not crash on a path rejected by verify_path() git#6426)
156: 86d1f35 = 151: 958f21b Merge branch 'size-t/fast-export'
151: 857a6c4 = 152: bc5e11a Merge tag 'v2.55.0.windows.4'
136: a34d0f3 = 153: a7276f8 unpack-objects: widen the size-passing infrastructure to size_t
158: 3fcaddd = 154: dd816e8 Merge branch 'size-t/repo'
153: a99ba24 = 155: edc9223 Merge branch 'bump-ci-actions'
160: a37ef87 = 156: a4e4413 Merge branch 'size-t/unpack-objects'
155: a37f218 = 157: 476576e Merge 'remote-hg-prerequisites' into HEAD
162: b5f0bae = 158: f0ec174 Merge branch 'topic/size-t' into size-t-followups
157: b271071 = 159: 68685e6 Merge branch 'drive-prefix'
164: 804d83d = 160: 5ab27c6 pack-objects: drop cast_size_t_to_ulong shims in get_delta()
159: 1bfebb7 = 161: 0949c6a Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
166: 5ef4659 = 162: abd21ec pack-objects: drop cast_size_t_to_ulong shims in try_delta()
161: f14d5f4 = 163: cd452bb Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
168: 08a720b = 164: e581604 pack-objects: drop the last size shim in write_no_reuse_object()
163: b4328d8 = 165: 7be6285 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
170: 03b44a9 = 166: e07604a blame: widen struct blame_scoreboard.final_buf_size to size_t
165: 3650a18 = 167: 101c48c Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction172: 6893cca = 168: b88ac86 fast-import: drop the six size casts in the object-read paths
167: 4984b93 = 169: e62b9cb Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
174: e6146ac = 170: bb2079f t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
169: d775649 = 171: 665147f Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
176: 5ee0c02 = 172: 9f8cb7f Drop the
cast_size_t_to_ulong()helper177: 7334f57 = 173: 1795da0 Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
171: 43df367 = 174: 7de66b6 Merge 'add-p-many-files'
179: 798a324 = 175: 49731c2 Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
173: 57a3075 = 176: b834d5b Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
181: 034ca95 = 177: ed58016 mingw: handle staging 4GB+ files correctly
175: 807878e = 178: 691c739 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
183: 87ccdb0 = 179: 5501e05 mingw: support unpacking loose 4GB+ objects
178: e7b4ab3 = 180: fb6c7ce Merge 'git-gui/js/intent-to-add'
185: 8ff3075 = 181: c6717a8 t: add an expensive test to verify that 4GB+ blobs can be staged/read
180: ea94e43 = 182: 827509a Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
187: d6dcf2b = 183: 98d981f object-file: use size_t for object size in check_object_signature()
188: 012a743 = 184: dd8d481 coverity: skip building with Rust, for now
182: c727204 = 185: 0bd827b Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
184: c0e0f1c = 186: bddccce Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
186: e6f25e9 = 187: 9b7df58 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path189: af92f65 = 188: d5d77d9 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
190: b1bcbbb = 189: 38dce0e Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
191: 90fb05d = 190: 3b80e5e Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests192: b6efe71 = 191: f637db3 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
193: babd783 = 192: 84eb8b0 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory194: 938892d = 193: 096db39 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
195: 0ba5fda = 194: cc9067e Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
196: 3e105d5 = 195: 734be46 Merge branch 'optionally-dont-append-atomically-on-windows'
197: 2f9ee8c = 196: f2688f2 Merge branch 'fsync-object-files-always'
198: 080a34d = 197: 537e18d Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
199: 7fbeb6c = 198: aed423f Fix Windows version resources (Fix Windows version resources git#4092)
200: 829253b = 199: 5328ff9 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
201: 7c6f5be = 200: 7a76d26 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)202: 6366d47 = 201: a7e531d Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283203: 9474bfe = 202: 0a9a00b Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
204: 68ece95 = 203: d236e90 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
205: c8769b4 = 204: 29cdbc6 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
206: 1f4d698 = 205: 6c6f4fa Merge branch 'nano-server'
207: 6edb03d = 206: 1f48d54 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
208: ca89b01 = 207: de73ece win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
209: ce92e47 = 208: 50260a9 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
210: a66546e = 209: 7e96459 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
211: a91ca2d = 210: 32e77ed Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
212: c90e1e3 = 211: c6f8f31 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
213: 9d11a09 = 212: b195cb5 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
214: 8ce0434 = 213: 8497e94 Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)215: 05344e7 = 214: 3ff89ff credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
216: bb60471 = 215: 8ea049b Merge branch 'reftable-vs-custom-allocators'
217: 238b538 = 216: a5f7162 Merge branch 'check-whitespace-only-downstream'
218: 7d8e64d = 217: 25a985b 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)
219: afb3447 = 218: 54ee23d Merge branch 'disallow-ntlm-auth-by-default'
220: b70ea63 = 219: e6ac5ae Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)221: 56fb27e = 220: b49f336 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
222: 9732ca8 = 221: 360ba1b http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
223: 3ee74ef = 222: ae55462 entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
224: aae8ad2 = 223: a36782c ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)225: ff0b76e = 224: 1eadbaf Merge branch 'msys2'
226: 4ba119e = 225: 63c9a28 Merge 'docker-volumes-are-no-symlinks'
227: 1f51fe8 = 226: 3d100cb mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
228: e250543 = 227: 33009d3 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
229: e5af19f = 228: 3036e2e Merge branch 'dont-clean-junctions'
230: 4bc9212 = 229: 2c6efee Merge branch 'wsl-file-mode-bits'
231: dc9fbe1 = 230: 7d87815 Merge branch 'validate-dotgit'
232: 745edf1 = 231: 275ffc8 Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
233: 2df04cc = 232: 86be95e Support loose 4GB+ objects (Support loose 4GB+ objects git#6353)
234: b5a8894 = 233: c0ddf24 Merge branch 'skip-rust-in-the-coverity-builds'
235: 0d39a75 = 234: 48168b0 Merge branch 'ready-for-upstream'
236: 68c2fdc = 235: 01fb84a Win32: make FILETIME conversion functions public
237: f321e03 = 236: 9c15bb6 Win32: dirent.c: Move opendir down
238: 6204d51 = 237: a953af3 mingw: make the dirent implementation pluggable
239: c08409f = 238: a3d4b0b Win32: make the lstat implementation pluggable
240: 88250b3 = 239: 350c8b6 mingw: add infrastructure for read-only file system level caches
241: b1fa2a0 = 240: 6f7acd7 mingw: add a cache below mingw's lstat and dirent implementations
242: a061be1 = 241: d69890b fscache: load directories only once
243: 7640ed2 = 242: e25870f fscache: add key for GIT_TRACE_FSCACHE
244: 5c53c1e = 243: 427f307 fscache: remember not-found directories
245: 5ab68eb = 244: 62622a2 fscache: add a test for the dir-not-found optimization
246: 725bcd1 = 245: 8e8eb36 add: use preload-index and fscache for performance
247: ce3f879 = 246: 09c2379 dir.c: make add_excludes aware of fscache during status
248: b276fe2 = 247: 84e0b97 fscache: make fscache_enabled() public
249: bb26f89 = 248: de77ad8 dir.c: regression fix for add_excludes with fscache
250: f1fa5f1 = 249: 1ad3a60 fetch-pack.c: enable fscache for stats under .git/objects
251: e64d049 = 250: 9328235 checkout.c: enable fscache for checkout again
252: 9a6a875 = 251: 5442f3f Enable the filesystem cache (fscache) in refresh_index().
253: 74db471 = 252: 322a83c fscache: use FindFirstFileExW to avoid retrieving the short name
254: 1560b25 = 253: abec983 fscache: add GIT_TEST_FSCACHE support
255: 1faa863 = 254: d90c0ab fscache: add fscache hit statistics
256: 21a16cc = 255: 5e2f963 unpack-trees: enable fscache for sparse-checkout
257: 4a16f4d = 256: 2918211 status: disable and free fscache at the end of the status command
258: d22f48d = 257: 3ab9b3e mem_pool: add GIT_TRACE_MEMPOOL support
259: b900fb7 = 258: 8149c90 fscache: fscache takes an initial size
260: a124bf7 = 259: 2b74440 fscache: update fscache to be thread specific instead of global
261: 161d64a = 260: dde62d3 fscache: teach fscache to use mempool
262: 7660bc1 = 261: 1100f5f fscache: make fscache_enable() thread safe
263: 058477d = 262: 7630eae fscache: teach fscache to use NtQueryDirectoryFile
264: 8f99c5a = 263: 96887ea fscache: remember the reparse tag for each entry
265: 4d94fdd = 264: 82b0903 fscache: Windows Docker volumes are not symbolic links
266: 51c240a = 265: a0f20e6 fscache: optionally enable wsl compability file mode bits
267: fe789aa = 266: 68cc1a3 fscache: implement an FSCache-aware is_mount_point()
268: 09e68b5 = 267: ddfe990 git-gui--askyesno: fix funny text wrapping
269: 7ca858c = 268: 3bfca50 clean: make use of FSCache
270: 7c597bb = 269: 9960be2 git-gui--askyesno (mingw): use Git for Windows' icon, if available
271: cc056cb = 270: 9841c1c Merge branch 'fscache'
272: dbe5750 = 271: 83a4c73 compat/poll: do not collect more handles than the wait supports
273: 45e66bb = 272: 32c02b7 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
274: e89245f = 273: 672cd41 parallel-checkout: limit worker count to what poll() can wait on
275: 90f9ffe = 274: 233171d Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
276: f482f52 = 275: ced0307 run-command: limit concurrent children to what poll() can wait on
277: 0ad5e49 = 276: 06a58fa Merge branch 'dont-clean-junctions-fscache'
278: 8c9a55c = 277: d4021ac parallel-checkout: fix stack buffer overflow in Windows
Truncated; see the full conflict report in the workflow run summary.