Repository navigation
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#39091308379) - #536
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
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>
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>
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>
Continue the size_t evacuation. read_blob_data_from_index() reads the blob through the size_t odb_read_object() API but writes the size back through an unsigned long out-parameter, silently truncating anything past 4 GiB on Windows. Widen the out-parameter, drop the cast_size_t_to_ulong() shim, and move the matching locals in the two convert.c callers and the one in attr.c. Their downstream consumers (gather_convert_stats() widened in the prior commit and read_attr_from_buf() already size_t) take the new type directly. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
`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 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>
In future changes, we will make use of these methods. The intention is to keep track of the top contributors according to some metric. We don't want to store all of the entries and do a sort at the end, so track a constant-size table and remove rows that get pushed out depending on the chosen sorting algorithm. Co-authored-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by; Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
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>
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>
Smallest piece of the tree topic. link_len is only used as strbuf_splice()'s size_t length and as an array index; widening it outright removes the cast_size_t_to_ulong() shim and the bridge local that fed it. odb_read_object() now writes straight into link_len. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue the size_t evacuation. With buffer_is_binary() widened in the prior commit, every consumer that the size flows into in combine-diff.c is size_t-ready, so widen grab_blob()'s out-param outright and move the matching locals at its three call sites together. grab_blob()'s body collapses to a direct odb_read_object(&size) since the bridge variable is no longer needed. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Since we are already walking our reachable objects using the path-walk API,
let's now collect lists of the paths that contribute most to different
metrics. Specifically, we care about
* Number of versions.
* Total size on disk.
* Total inflated size (no delta or zlib compression).
This information can be critical to discovering which parts of the
repository are causing the most growth, especially on-disk size. Different
packing strategies might help compress data more efficiently, but the toal
inflated size is a representation of the raw size of all snapshots of those
paths. Even when stored efficiently on disk, that size represents how much
information must be processed to complete a command such as 'git blame'.
The exact disk size seems to be not quite robust enough for testing, as
could be seen by the `linux-musl-meson` job consistently failing, possibly
because of zlib-ng deflates differently: t8100.4(git survey
(default)) was failing with a symptom like this:
TOTAL OBJECT SIZES BY TYPE
===============================================
Object Type | Count | Disk Size | Inflated Size
------------+-------+-----------+--------------
- Commits | 10 | 1523 | 2153
+ Commits | 10 | 1528 | 2153
Trees | 10 | 495 | 1706
Blobs | 10 | 191 | 101
- Tags | 4 | 510 | 528
+ Tags | 4 | 547 | 528
This means: the disk size is unlikely something we can verify robustly.
Since zlib-ng seems to increase the disk size of the tags from 528 to
547, we cannot even assume that the disk size is always smaller than the
inflated size. We will most likely want to either skip verifying the
disk size altogether, or go for some kind of fuzzy matching, say, by
replacing `s/ 1[45][0-9][0-9] / ~1.5k /` and `s/ [45][0-9][0-9] / ~½k /`
or something like that.
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`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>
This comment has been true for the longest time; The combination of the two preceding commits made it incorrect, so let's drop that comment. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NTLM authentication is relatively weak. This is the case even with the
default setting of modern Windows versions, where NTLMv1 and LanManager
are disabled and only NTLMv2 is enabled: NTLMv2 hashes of even
reasonably complex 8-character passwords can be broken in a matter of
days, given enough compute resources.
Even worse: On Windows, NTLM authentication uses Security Support
Provider Interface ("SSPI"), which provides the credentials without
requiring the user to type them in.
Which means that an attacker could talk an unsuspecting user into
cloning from a server that is under the attacker's control and extracts
the user's NTLMv2 hash without their knowledge.
For that reason, let's disallow NTLM authentication by default.
NTLM authentication is quite simple to set up, though, and therefore
there are still some on-prem Azure DevOps setups out there whose users
and/or automation rely on this type of authentication. To give them an
escape hatch, introduce the `http.<url>.allowNTLMAuth` config setting
that can be set to `true` to opt back into using NTLM for a specific
remote repository.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `git_terminal_prompt()` function expects the terminal window to be attached to a Win32 Console. However, this is not the case with terminal windows other than `cmd.exe`'s, e.g. with MSys2's own `mintty`. Non-cmd terminals such as `mintty` still have to have a Win32 Console to be proper console programs, but have to hide the Win32 Console to be able to provide more flexibility (such as being resizeable not only vertically but also horizontally). By writing to that Win32 Console, `git_terminal_prompt()` manages only to send the prompt to nowhere and to wait for input from a Console to which the user has no access. This commit introduces a function specifically to support `mintty` -- or other terminals that are compatible with MSys2's `/dev/tty` emulation. We use the `TERM` environment variable as an indicator for that: if the value starts with "xterm" (such as `mintty`'s "xterm_256color"), we prefer to let `xterm_prompt()` handle the user interaction. The most prominent user of `git_terminal_prompt()` is certainly `git-remote-https.exe`. It is an interesting use case because both `stdin` and `stdout` are redirected when Git calls said executable, yet it still wants to access the terminal. When running inside a `mintty`, the terminal is not accessible to the `git-remote-https.exe` program, though, because it is a MinGW program and the `mintty` terminal is not backed by a Win32 console. To solve that problem, we simply call out to the shell -- which is an *MSys2* program and can therefore access `/dev/tty`. Helped-by: nalla <nalla@hamal.uberspace.de> Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is a known issue that a rename() can fail with an "Access denied" error at times, when copying followed by deleting the original file works. Let's just fall back to that behavior. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, symbolic links actually have a type depending on the target: it can be a file or a directory. In certain circumstances, this poses problems, e.g. when a symbolic link is supposed to point into a submodule that is not checked out, so there is no way for Git to auto-detect the type. To help with that, we will add support over the course of the next commits to specify that symlink type via the Git attributes. This requires an index_state, though, something that Git for Windows' `symlink()` replacement cannot know about because the function signature is defined by the POSIX standard and not ours to change. So let's introduce a helper function to create symbolic links that *does* know about the index_state. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Windows paths are typically limited to MAX_PATH = 260 characters, even
though the underlying NTFS file system supports paths up to 32,767 chars.
This limitation is also evident in Windows Explorer, cmd.exe and many
other applications (including IDEs).
Particularly annoying is that most Windows APIs return bogus error codes
if a relative path only barely exceeds MAX_PATH in conjunction with the
current directory, e.g. ERROR_PATH_NOT_FOUND / ENOENT instead of the
infinitely more helpful ERROR_FILENAME_EXCED_RANGE / ENAMETOOLONG.
Many Windows wide char APIs support longer than MAX_PATH paths through the
file namespace prefix ('\\?\' or '\\?\UNC\') followed by an absolute path.
Notable exceptions include functions dealing with executables and the
current directory (CreateProcess, LoadLibrary, Get/SetCurrentDirectory) as
well as the entire shell API (ShellExecute, SHGetSpecialFolderPath...).
Introduce a handle_long_path function to check the length of a specified
path properly (and fail with ENAMETOOLONG), and to optionally expand long
paths using the '\\?\' file namespace prefix. Short paths will not be
modified, so we don't need to worry about device names (NUL, CON, AUX).
Contrary to MSDN docs, the GetFullPathNameW function doesn't seem to be
limited to MAX_PATH (at least not on Win7), so we can use it to do the
heavy lifting of the conversion (translate '/' to '\', eliminate '.' and
'..', and make an absolute path).
Add long path error checking to xutftowcs_path for APIs with hard MAX_PATH
limit.
Add a new MAX_LONG_PATH constant and xutftowcs_long_path function for APIs
that support long paths.
While improved error checking is always active, long paths support must be
explicitly enabled via 'core.longpaths' option. This is to prevent end
users from shooting themselves in the foot by checking out files that Windows
Explorer, cmd/bash or their favorite IDE cannot handle.
Test suite:
Test the case is when the full pathname length of a dir is close
to 260 (MAX_PATH).
Bug report and an original reproducer by Andrey Rogozhnikov:
msysgit#122 (comment)
[jes: adjusted test number to avoid conflicts, added support for
chdir(), etc]
Thanks-to: Martin W. Kirst <maki@bitkings.de>
Thanks-to: Doug Kelly <dougk.ff7@gmail.com>
Original-test-by: Andrey Rogozhnikov <rogozhnikov.andrey@gmail.com>
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Josh Soref <jsoref@gmail.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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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: 90a9327955 (Backport fix for now-flaky HTTP-auth tests (git-for-windows#6489), 2026-10-16) (5cb0ffc12f..90a9327955)
Resolved: 90a9327 (Backport fix for now-flaky HTTP-auth tests (git-for-windows#6489), 2026-10-16)
added and staged lazy-loaded curl URL API symbols and wrappers on the upstream implementation
Range-diff
1: 90a9327 ! 1: d15ee3b 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 4f13b48aee..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; -+ +-<<<<<<< 830411e825 (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"); +-<<<<<<< 830411e825 (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); -+} +-<<<<<<< 830411e825 (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: d15ee3b294 (Backport fix for now-flaky HTTP-auth tests (git-for-windows#6489), 2026-10-16) (9937fd3daf..d15ee3b294)
Statistics
Range-diff (click to expand)
1: c85ee38 = 1: d76e0b7 unix-socket: avoid leak when initialization fails
2: 3ed68d2 = 2: fb88cfa grep: prevent
^$false match at end of file3: a4a93a2 = 3: 561599e Merge branch 'fixes-from-the-git-mailing-list'
20: 128c8ee = 4: 0c09240 t9350: point out that refs are not updated correctly
23: 0ec4de6 = 5: 56c012a difftool: do not crash on a path rejected by verify_path()
24: 0e400b2 = 6: b90f573 transport-helper: add trailing --
25: 5dd90f8 = 7: 798d504 mingw: demonstrate a
git addissue with NTFS junctions28: 730676e = 8: 160ea57 difftool: avoid memory leak when
run_dir_diff()fails29: 0981a73 = 9: 525d6c7 ci: bump actions/checkout from 6 to 7
30: 8bcc80b = 10: ed49579 remote-helper: check helper status after import/export
31: c8b5cf1 = 11: 18bc763 strbuf_realpath(): use platform-dependent API if available
39: 573095f = 12: a1ca99b difftool: avoid invalid memory access by an atexit handler
40: 7efff67 = 13: fcd956d bundle-uri: refuse advertised URIs by protocol
41: 0686ee2 = 14: a50c4c7 ci(coverity): bump actions/cache from 5 to 6
42: 9d5fa9a = 15: 40e8c18 Always auto-gc after calling a fast-import transport
43: 4ed3ebc = 16: 9d54985 mingw: prevent regressions with "drive-less" absolute paths
44: 067c56d = 17: ea8844e transport: optionally disable side-band-64k
45: 3905827 = 18: cda87ea mingw: fix fatal error working on mapped network drives on Windows
46: b233af1 = 19: 2ef7f3e clink.pl: fix MSVC compile script to handle libcurl-d.lib
4: 7dd1536 = 20: 53808f4 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
5: 3b09639 = 21: f8509bd vcpkg_install: detect lack of Git
6: 513bbac = 22: ccd3e1e vcpkg_install: add comment regarding slow network connections
9: c835247 = 23: 227c5b6 t5505/t5516: allow running without
.git/branches/in the templates10: 3baca01 = 24: 07b290e max_tree_depth: lower it for clang builds in general on Windows
7: 7e9df76 = 25: df4500a vcbuild: install ARM64 dependencies when building ARM64 binaries
12: a81b3c3 = 26: 44215b5 t5505/t5516: fix white-space around redirectors
13: cf2bb4d = 27: 0b8d640 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
8: 0132d5d = 28: 02926d1 vcbuild: add an option to install individual 'features'
15: ffb4acf = 29: b6a0fcb Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
11: 5d29d78 = 30: ca8f864 cmake: allow building for Windows/ARM64
17: f185a48 = 31: ba45870 clink.pl: fix libexpatd.lib link error when using MSVC
14: 4750c4b = 32: 89b9cd6 ci(vs-build) also build Windows/ARM64 artifacts
19: f24e5c8 = 33: 1a9368c Makefile: clean up .ilk files when MSVC=1
63: 90f5153 = 34: c3e8d85 revision: create mark_trees_uninteresting_dense()
16: 5571650 = 35: c7b2ebe vcbuild: stop hard-coding OpenSSL as a dependency
22: 49763d3 = 36: c352f75 vcbuild: add support for compiling Windows resource files
64: fe63640 = 37: 409b98a survey: stub in new experimental 'git-survey' command
18: f029de5 = 38: 71bd82d cmake(): allow setting HOST_CPU for cross-compilation
27: fd93de9 = 39: 1d641e3 config.mak.uname: add git.rc to MSVC builds
37: 256cdff = 40: c9bb305 MinGW: link as terminal server aware
65: 83b910b = 41: 1a46e5b survey: add command line opts to select references
21: 30857b5 = 42: e9ec161 CMake: default Visual Studio generator has changed
38: feecd39 = 43: 30668c6 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
71: a0960fd = 44: 7abe29b http: optionally load libcurl lazily
66: 2c2ff7d = 45: ddbf345 survey: start pretty printing data in table form
26: e8d8f23 = 46: 1e8c6d1 .gitignore: add Visual Studio CMakeSetting.json file
73: bb22a20 = 47: 13ee2ba clink.pl: move default linker options for MSVC=1 builds
74: 7fd4ced = 48: a1fc732 http: support lazy-loading libcurl also on Windows
67: 13e0c60 = 49: 2c5cdd1 survey: add object count summary
32: 5745e4c = 50: aa75328 http: use new "best effort" strategy for Secure Channel revoke checking
33: 0f83e44 = 51: 275a0ee subtree: update
contrib/subtreetesttarget34: 553bb48 = 52: b1f39bd CMakeLists: add default "x64-windows" arch for Visual Studio
35: f96b727 = 53: 24183d0 setup: properly use "%(prefix)/" when in WSL
36: f19547a = 54: ad32174 Add config option
windows.appendAtomically76: b38ce14 = 55: 1a4e54c cmake: install headless-git.
77: 3be3dee = 56: fc44c4b http: when loading libcurl lazily, allow for multiple SSL backends
68: 1e23a78 = 57: 78f72b9 survey: summarize total sizes by object type
47: b5f29cb = 58: 181690b mingw: implement a platform-specific
strbuf_realpath()48: 8b9748e = 59: 3185da9 t3701: verify that we can add lots of files interactively
49: a890b44 = 60: 658232d commit: accept "scissors" with CR/LF line endings
50: 5b8ff4f = 61: 95946c8 t0014: fix indentation
51: 6615662 = 62: 633005f git-gui: accommodate for intent-to-add files
52: e44e603 = 63: 26d0a2c mingw: allow for longer paths in
parse_interpreter()53: 197357d = 64: 6507205 compat/vcbuild: document preferred way to build in Visual Studio
54: 438002c = 65: 5319336 http: optionally send SSL client certificate
55: 145935d = 66: eca1947 ci: run
contrib/subtreetests in CI builds56: c2d69ca = 67: 50c2665 CMake: show Win32 and Generator_platform build-option values
57: 8507013 = 68: 928c9be compat/mingw.c: do not warn when failing to get owner
58: e3d74d5 = 69: d685e6f mingw: $env:TERM="xterm-256color" for newer OSes
59: d670d86 = 70: c48d62e winansi: check result and Buffer before using Name
60: 415b4ea = 71: 1b5aec9 mingw: change core.fsyncObjectFiles = 1 by default
61: c4979d8 = 72: 0c5d845 Fix Windows version resources
62: 5b162da = 73: 3146b1e status: fix for old-style submodules with commondir
79: d46464e = 74: 9fb66e4 git.rc: include winuser.h
80: 33474bb = 75: 07876bb mingw: do load libcurl dynamically by default
81: ff9066f = 76: 92ffd54 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
82: 61e98f6 = 77: c565985 mingw: suggest
windows.appendAtomicallyin more cases83: 157b3d2 = 78: c285506 win32: use native ANSI sequence processing, if possible
84: 959a364 = 79: 347c1d9 common-main.c: fflush stdout buffer upon exit
85: f46485f = 80: 3b89a92 t5601/t7406(mingw): do run tests with symlink support
86: 4c3b865 = 81: ebd1c5c Fallback to AppData if XDG_CONFIG_HOME is unset
69: 17c561f = 82: 082b483 survey: show progress during object walk
70: bc07395 = 83: c88b8ca survey: add ability to track prioritized lists
72: 09a4b65 = 84: 3d20519 survey: add report of "largest" paths
91: cdf44fe = 85: 838c5e3 mingw: Support
git_terminal_promptwith more terminals75: 405af17 = 86: 7679378 survey: add --top= option and config
92: c3e021a = 87: 77bbee9 compat/terminal.c: only use the Windows console if bash 'read -r' fails
93: 48bbb67 = 88: 1ee5d88 diff: stop truncating the deflated-binary-diff size on Windows
78: 7c7aee0 = 89: 4121c57 survey: clearly note the experimental nature in the output
94: 13a4966 = 90: d69521b mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
95: 0fc6c09 = 91: fd46385 convert: widen gather_convert_stats() helpers to size_t
87: 8dfc23a = 92: bdaabae repo: split annotated tags out from total tag count in structure
96: ec5ed12 = 93: 90e806c Win32: symlink: move phantom symlink creation to a separate function
97: e9b4515 = 94: 39ee1f0 read-cache: stop truncating index blob sizes on Windows
88: 3487bab = 95: 52cc010 repo: report top-N paths by count, disk, and inflated size in structure
98: 220d74a = 96: 9d39c11 mingw: make sure
errnois set correctly when socket operations fail99: bef86ac = 97: 640a171 t5563: verify that NTLM authentication works
100: 0cf0598 = 98: 6601f20 mingw: introduce code to detect whether we're inside a Windows container
101: 1c029ed = 99: 2125690 Introduce helper to create symlinks that knows about index_state
102: 97dbca8 = 100: 82eeeeb xdiff-interface: widen buffer_is_binary() size parameter to size_t
89: 6138901 = 101: c73c6f7 t1901: cover the --top option of
git repo structure104: 89ab081 = 102: d0d870c compat/mingw: handle WSA errors in strerror
105: cf2ef72 = 103: a1144e2 http: disallow NTLM authentication by default
106: 614fe2d = 104: 75de683 mingw: when running in a Windows container, try to rename() harder
107: 63ae8d0 = 105: edd63ac mingw: allow to specify the symlink type in .gitattributes
103: b333b46 = 106: cb19916 tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
108: 23e3170 = 107: 351d4ed combine-diff: stop truncating combined-diff blob sizes on Windows
90: c415d04 = 108: bc42d9a repo: read the
--topdefault fromrepo.structure.top110: 36eacdc = 109: a51830f compat/mingw: drop outdated comment
111: 0db6a01 = 110: 6d6f585 http: warn if might have failed because of NTLM
112: 04f0d48 = 111: 40baa25 mingw: move the file_attr_to_st_mode() function definition
113: d0d2452 = 112: 20be7ad Win32: symlink: add test for
symlinkattribute109: 2ccb82c = 113: 506da8e tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
114: 388f283 = 114: ed8d85b diff: widen textconv_object() size out-param to size_t
116: f7c6228 = 115: fee054e git-survey: announce the upcoming pivot into
git repo structure117: b8a6fee = 116: 45a7e67 t0301: actually test credential-cache on Windows
118: 9f6bd69 = 117: 6cc489c credential: advertise NTLM suppression and allow helpers to re-enable
119: d2120ab = 118: d27fa60 mingw: Windows Docker volumes are not symbolic links
120: 6ce0570 = 119: a83f36c clean: do not traverse mount points
121: 3d01faa = 120: dfc171d pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
115: e40e6f0 = 121: 623bd9f pack-objects: drop the two tree-walk casts in the preferred-base path
122: 3f6074e = 122: 79d1252 diffcore: widen struct diff_filespec.size to size_t
129: f6ce490 = 123: 0957add survey: turn into a thin shim over
git repo structure130: 1bc8d6c = 124: da03e7c credential-cache: handle ECONNREFUSED gracefully
131: edf7de4 = 125: 70725d5 reftable: do make sure to use custom allocators
132: 0704231 = 126: ffbc0f0 check-whitespace: avoid alerts about upstream commits
133: cf8abeb = 127: 345eb2b t/t5571-prep-push-hook.sh: Add test with writing to stderr
134: 2a39ada = 128: 41f0347 dir: do not traverse mount points
135: a5bd431 = 129: 296bb54 win32: thread-utils: handle multi-socket systems
136: 78273b8 = 130: 732e43b t5563: add tests for http.emptyAuth with Negotiate
137: b8158b1 = 131: 1a98a73 entry: flush fscache after creating directories and writing files
138: b6e2916 = 132: 87a161d ci(macos): skip the
git p4tests139: fad1e3b = 133: 7fc08ac mingw: work around rename() failing on a read-only file
140: 2fea4d3 = 134: e7da9bc clean: remove mount points when possible
141: 2754b01 = 135: d89aa40 mingw: optionally enable wsl compability file mode bits
142: c403421 = 136: d4197b3 Refuse to follow invalid paths in
.gitfiles143: e4384cd = 137: 0eea9b1 Merge branch 'size-t/pack-objects-delta'
144: d2355ae = 138: 02a57ab Merge branch 'size-t/pack-bitmap'
123: 1f1bf60 = 139: 0c0fb68 tree: widen struct tree.size and parse_tree_buffer() to size_t
145: 84b5ec3 = 140: 82ebd98 Merge branch 'size-t/diff'
124: 16db436 = 141: 5261299 commit: widen the commit-buffer API to size_t
146: 8d0bdf5 = 142: 36c39e6 Merge branch 'size-t/tree'
125: b23a21c = 143: b639015 blame: widen find_line_starts() len parameter to size_t
147: 01c04f2 = 144: 63fc364 Merge branch 'size-t/commit'
126: a53dbd8 = 145: 2588ba0 grep: widen struct grep_source.size and grep_buffer() to size_t
148: 81a63f8 = 146: 3c09cdb Merge branch 'size-t/blame'
127: 3a25c08 = 147: 28c0251 fast-export: drop the export_blob() size cast and widen anonymize_blob()
149: ab03966 = 148: 72d4663 Merge branch 'size-t/grep'
128: 9c3b221 = 149: 9917186 repo: drop the inflated-size cast in count_objects()
151: 958f21b = 150: c01304b Merge branch 'size-t/fast-export'
153: a7276f8 = 151: d7c6a14 unpack-objects: widen the size-passing infrastructure to size_t
154: dd816e8 = 152: 849ba42 Merge branch 'size-t/repo'
156: a4e4413 = 153: 808aefe Merge branch 'size-t/unpack-objects'
158: f0ec174 = 154: 1ee7896 Merge branch 'topic/size-t' into size-t-followups
160: 5ab27c6 = 155: 3e5f12a pack-objects: drop cast_size_t_to_ulong shims in get_delta()
162: abd21ec = 156: 0c29129 pack-objects: drop cast_size_t_to_ulong shims in try_delta()
150: 5a596c9 = 157: 95382e4 difftool: do not crash on a path rejected by verify_path() (difftool: do not crash on a path rejected by verify_path() git#6426)
164: e581604 = 158: c7aa738 pack-objects: drop the last size shim in write_no_reuse_object()
152: bc5e11a = 159: 73dc1c0 Merge tag 'v2.55.0.windows.4'
166: e07604a = 160: e04269f blame: widen struct blame_scoreboard.final_buf_size to size_t
155: edc9223 = 161: 9ddb29a Merge branch 'bump-ci-actions'
168: b88ac86 = 162: 739b23b fast-import: drop the six size casts in the object-read paths
157: 476576e = 163: b6e9d6a Merge 'remote-hg-prerequisites' into HEAD
170: bb2079f = 164: 28e9661 t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
159: 68685e6 = 165: c4105ab Merge branch 'drive-prefix'
172: 9f8cb7f = 166: c225c25 Drop the
cast_size_t_to_ulong()helper173: 1795da0 = 167: a306cca Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
161: 0949c6a = 168: a197a6a Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
175: 49731c2 = 169: c29e534 Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
163: cd452bb = 170: 9918b48 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
177: ed58016 = 171: 38d2702 mingw: handle staging 4GB+ files correctly
165: 7be6285 = 172: 44bf601 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
179: 5501e05 = 173: 6e80e80 mingw: support unpacking loose 4GB+ objects
167: 101c48c = 174: 1992915 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction181: c6717a8 = 175: 9bce1e2 t: add an expensive test to verify that 4GB+ blobs can be staged/read
169: e62b9cb = 176: ed9b2c3 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: 98d981f = 177: cf0ef9f object-file: use size_t for object size in check_object_signature()
184: dd8d481 = 178: e88ad63 coverity: skip building with Rust, for now
171: 665147f = 179: bfca4ee Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
174: 7de66b6 = 180: 4162b1e Merge 'add-p-many-files'
176: b834d5b = 181: 1da4542 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
178: 691c739 = 182: bb096b5 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
180: fb6c7ce = 183: 9b3d70e Merge 'git-gui/js/intent-to-add'
182: 827509a = 184: bcfd3b4 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
185: 0bd827b = 185: 1c7b0b9 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
186: bddccce = 186: 192b92c Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
187: 9b7df58 = 187: 1bd8984 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path188: d5d77d9 = 188: 4e8ceed Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
189: 38dce0e = 189: a555eef Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
190: 3b80e5e = 190: c485d68 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests191: f637db3 = 191: afd4d86 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
192: 84eb8b0 = 192: 87af082 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory193: 096db39 = 193: e2c5ba6 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
194: cc9067e = 194: bfca6cb Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
195: 734be46 = 195: d542711 Merge branch 'optionally-dont-append-atomically-on-windows'
196: f2688f2 = 196: 1e79de7 Merge branch 'fsync-object-files-always'
197: 537e18d = 197: 8825498 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
198: aed423f = 198: fd3af9f Fix Windows version resources (Fix Windows version resources git#4092)
199: 5328ff9 = 199: f067c62 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
200: 7a76d26 = 200: 1a191b4 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)201: a7e531d = 201: 8099b57 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283202: 0a9a00b = 202: 9de7c68 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
203: d236e90 = 203: d3eb0f1 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
204: 29cdbc6 = 204: 5781bab Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
205: 6c6f4fa = 205: af6df44 Merge branch 'nano-server'
206: 1f48d54 = 206: a778ef0 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
207: de73ece = 207: 1eada54 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
208: 50260a9 = 208: deafb62 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
209: 7e96459 = 209: 7d30a82 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
210: 32e77ed = 210: 525b918 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
211: c6f8f31 = 211: 12e5ef9 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
212: b195cb5 = 212: d7b5467 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
213: 8497e94 = 213: 039e00d Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)214: 3ff89ff = 214: 2892567 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
215: 8ea049b = 215: 50e4c40 Merge branch 'reftable-vs-custom-allocators'
216: a5f7162 = 216: 1f73b12 Merge branch 'check-whitespace-only-downstream'
217: 25a985b = 217: 2ad228b 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)
218: 54ee23d = 218: b8beb97 Merge branch 'disallow-ntlm-auth-by-default'
219: e6ac5ae = 219: 8b4ba84 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)220: b49f336 = 220: aa98b2c Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
221: 360ba1b = 221: 573dbb0 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
222: ae55462 = 222: 068a56d entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
223: a36782c = 223: ab93c32 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)224: 1eadbaf = 224: a9956e4 Merge branch 'msys2'
225: 63c9a28 = 225: 14d0d02 Merge 'docker-volumes-are-no-symlinks'
226: 3d100cb = 226: 5504d20 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
227: 33009d3 = 227: a52564a Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
228: 3036e2e = 228: 85d3afd Merge branch 'dont-clean-junctions'
229: 2c6efee = 229: c9da6b8 Merge branch 'wsl-file-mode-bits'
230: 7d87815 = 230: 2adbde0 Merge branch 'validate-dotgit'
231: 275ffc8 = 231: 055709f Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
232: 86be95e = 232: f47a8bc Support loose 4GB+ objects (Support loose 4GB+ objects git#6353)
233: c0ddf24 = 233: 31c0d88 Merge branch 'skip-rust-in-the-coverity-builds'
234: 48168b0 = 234: 26c17ce Merge branch 'ready-for-upstream'
235: 01fb84a = 235: 5edff9d Win32: make FILETIME conversion functions public
236: 9c15bb6 = 236: 4230fbc Win32: dirent.c: Move opendir down
237: a953af3 = 237: b0dec2a mingw: make the dirent implementation pluggable
238: a3d4b0b = 238: e15beb4 Win32: make the lstat implementation pluggable
239: 350c8b6 = 239: 4cb04bc mingw: add infrastructure for read-only file system level caches
240: 6f7acd7 = 240: f66730f mingw: add a cache below mingw's lstat and dirent implementations
241: d69890b = 241: 97a80e4 fscache: load directories only once
242: e25870f = 242: 6568a5a fscache: add key for GIT_TRACE_FSCACHE
243: 427f307 = 243: 40c2dbe fscache: remember not-found directories
244: 62622a2 = 244: ef894dc fscache: add a test for the dir-not-found optimization
245: 8e8eb36 = 245: d97ee34 add: use preload-index and fscache for performance
246: 09c2379 = 246: 4290eb7 dir.c: make add_excludes aware of fscache during status
247: 84e0b97 = 247: 108bc03 fscache: make fscache_enabled() public
248: de77ad8 = 248: 02de135 dir.c: regression fix for add_excludes with fscache
249: 1ad3a60 = 249: 234e3cd fetch-pack.c: enable fscache for stats under .git/objects
250: 9328235 = 250: 3f9e188 checkout.c: enable fscache for checkout again
251: 5442f3f = 251: 39681ac Enable the filesystem cache (fscache) in refresh_index().
252: 322a83c = 252: c68e2b5 fscache: use FindFirstFileExW to avoid retrieving the short name
253: abec983 = 253: bca481b fscache: add GIT_TEST_FSCACHE support
267: ddfe990 = 254: 677d115 git-gui--askyesno: fix funny text wrapping
254: d90c0ab = 255: 7a8a607 fscache: add fscache hit statistics
269: 9960be2 = 256: a7791b3 git-gui--askyesno (mingw): use Git for Windows' icon, if available
255: 5e2f963 = 257: 6db9cfa unpack-trees: enable fscache for sparse-checkout
256: 2918211 = 258: c2ef28b status: disable and free fscache at the end of the status command
257: 3ab9b3e = 259: 3a26a8a mem_pool: add GIT_TRACE_MEMPOOL support
258: 8149c90 = 260: b5c9157 fscache: fscache takes an initial size
259: 2b74440 = 261: b9aa40a fscache: update fscache to be thread specific instead of global
260: dde62d3 = 262: 731220a fscache: teach fscache to use mempool
261: 1100f5f = 263: 85b9ba8 fscache: make fscache_enable() thread safe
262: 7630eae = 264: dbc1c61 fscache: teach fscache to use NtQueryDirectoryFile
263: 96887ea = 265: e4b43e8 fscache: remember the reparse tag for each entry
264: 82b0903 = 266: e02d094 fscache: Windows Docker volumes are not symbolic links
265: a0f20e6 = 267: 34f5d01 fscache: optionally enable wsl compability file mode bits
266: 68cc1a3 = 268: e08dd14 fscache: implement an FSCache-aware is_mount_point()
268: 3bfca50 = 269: df373fd clean: make use of FSCache
270: 9841c1c = 270: 3e48335 Merge branch 'fscache'
271: 83a4c73 = 271: 7fd8b74 compat/poll: do not collect more handles than the wait supports
272: 32c02b7 = 272: 36c3a98 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
273: 672cd41 = 273: 4df9059 parallel-checkout: limit worker count to what poll() can wait on
274: 233171d = 274: b9f402e Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
275: ced0307 = 275: fe22650 run-command: limit concurrent children to what poll() can wait on
276: 06a58fa = 276: 004ac12 Merge branch 'dont-clean-junctions-fscache'
277: d4021ac = 277: b838c2e parallel-checkout: fix stack buffer overflow in Windows poll() with many workers (parallel-checkout: fix stack buffer overflow in Windows poll() with many workers git#6395)
278: b18acfb = 278: 4015a2d pack-objects (mingw): demonstrate a segmentation fault with large deltas
279: cbea508 = 279: 46229ba mingw: support long paths
280: 503f12e = 280: 7f0801d win32(long path support): leave drive-less absolute paths intact
281: 0f515f0 = 281: fa27280 compat/fsmonitor/fsm-*-win32: support long paths
282: e146379 = 282: 1db0b2c clean: suggest using
core.longPathsif paths are too long to remove283: 61dcc82 = 283: ca9f2fd mingw: explicitly specify with which cmd to prefix the cmdline
284: 897391f = 284: ca76bcf mingw: when path_lookup() failed, try BusyBox
285: 8b079ed = 285: 7fd2e3b test-tool: learn to act as a drop-in replacement for
iconv286: 8250926 = 286: a002503 tests(mingw): if
iconvis unavailable, usetest-helper --iconv287: 530b999 = 287: 163cb48 gitattributes: mark .png files as binary
288: 239ad39 = 288: 6536262 tests: move test PNGs into t/lib-diff/
289: 0549902 = 289: 2a984a6 tests: only override sort & find if there are usable ones in /usr/bin/
290: 3eb3794 = 290: 08bb2c8 tests: use the correct path separator with BusyBox
291: 87a6192 = 291: e118ba2 mingw: only use Bash-ism
builtin pwd -Wwhen available292: 2d8e068 = 292: 4e74ad4 tests (mingw): remove Bash-specific pwd option
293: 8ea87e1 = 293: 6023c2b test-lib: add BUSYBOX prerequisite
294: c3c666d = 294: 1cedea5 t5003: use binary file from t/lib-diff/
295: b3c6f2c = 295: c8eaa6e t5532: workaround for BusyBox on Windows
296: c16bc81 = 296: c150788 t5605: special-case hardlink test for BusyBox-w32
297: d8f16fb = 297: 99c4d34 t5813: allow for $PWD to be a Windows path
298: ae75c6c = 298: 65d68a2 t9200: skip tests when $PWD contains a colon
299: 1a63204 = 299: c783704 Describe Git for Windows' architecture
300: 6deb9ea = 300: 2217de2 Add an AGENTS.md file to help with AI-assisted debugging/development
301: 0e6be33 = 301: 8178e12 Modify the Code of Conduct for Git for Windows
302: b6956e0 = 302: cedb980 CONTRIBUTING.md: add guide for first-time contributors
303: 3b1ae39 = 303: fea22ef README.md: Add a Windows-specific preamble
304: b8fbac3 = 304: e4fbfe2 Add an issue template
306: fd5dcdb = 305: c1de692 Modify the GitHub Pull Request template (to reflect Git for Windows)
308: 1f11e9f = 306: b29f919 Add a GitHub workflow to monitor component updates
309: 1a75757 = 307: 1ddd23f SECURITY.md: document Git for Windows' policies
310: 57e41bc = 308: b1e5889 Partially un-revert "editor: save and reset terminal after calling EDITOR"
312: 6848e61 ! 309: 04caaca reset: reinstate support for the deprecated --stdin option
@@ builtin/reset.c: static const char * const git_reset_usage[] = { }; @@ builtin/reset.c: int cmd_reset(int argc, - struct pathspec pathspec; int intent_to_add = 0; + struct lock_file lock = LOCK_INIT; struct interactive_options interactive_opts = INTERACTIVE_OPTIONS_INIT; + int nul_term_line = 0, read_from_stdin = 0; const struct option options[] = {313: 4a95431 = 310: 98679c6 fsmonitor: reintroduce core.useBuiltinFSMonitor
314: 6c34a2c = 311: 122f750 dependabot: help keeping GitHub Actions versions up to date
315: d57617e = 312: 5e7427b ci: only run the expensive tests in the Windows tests for now
305: 9352489 = 313: caf827d Merge branch 'gitk-and-git-gui-patches'
307: 97b9df9 = 314: e68675c Merge branch 'long-paths'
311: 85322b8 = 315: 968058e Merge branch 'busybox-w32'
316: f6d1314 = 316: 836b34d Merge branch 'un-revert-editor-save-and-reset'
317: 6a0bbc4 = 317: 2d5599a Merge branch 'phase-out-reset-stdin'
318: 17dd0cd = 318: 63f6ee9 Merge branch 'deprecate-core.useBuiltinFSMonitor'
319: 1517d11 = 319: f218924 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
320: 3abe55a = 320: 5ab63be Merge 'readme' into HEAD
321: 62719d6 = 321: 7ff175a mingw: let
access()handlenulwhether lower-case or not322: 9f76e6e = 322: fc623dd Allow
GIT_CONFIG_GLOBALto be set toNUL(all upper-case) (AllowGIT_CONFIG_GLOBALto be set toNUL(all upper-case) git#6450)323: 1dab2f4 = 323: 830411e ci: bump actions/setup-python from 6 to 7
324: 90a9327 = 324: d15ee3b Backport fix for now-flaky HTTP-auth tests (Backport fix for now-flaky HTTP-auth tests git#6489)