Rebase shears/main (#35949147699) - #481
Open
gitforwindowshelper[bot] wants to merge 317 commits into
Open
gitforwindowshelper[bot] wants to merge 317 commits into
gitforwindowshelper[bot] wants to merge 317 commits into
Conversation
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>
Now that we have explored objects by count, we can expand that a bit more to summarize the data for the on-disk and inflated size of those objects. This information is helpful for diagnosing both why disk space (and perhaps clone or fetch times) is growing but also why certain operations are slow because the inflated size of the abstract objects that must be processed is so large. Note: zlib-ng is slightly more efficient even at those small sizes. Even between zlib versions, there are slight differences in compression. To accommodate for that in the tests, not the exact numbers but some rough approximations are validated (the test should validate `git survey`, after all, not zlib). Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git repo structure` walks every reference enumerated by `refs_for_each_ref()` and feeds each reference's tip into the path walk that produces the object counts. There is no way to scope the inquiry to a subset of refs, even though that is the most common need when an operator is investigating what part of the history is driving cost: only branches, only release tags, only one remote's view, etc. Add a single `--ref-filter=<pattern>` option that, when given, restricts both the reference count and the object walk to refs whose full name matches one of the patterns. The option is repeatable; multiple patterns form a union, so `--ref-filter='refs/heads/*' --ref-filter='refs/tags/v*'` includes local branches and tags whose short name starts with `v`. Patterns use `wildmatch()` with `WM_PATHNAME` semantics so a `*` does not cross `/`, matching the convention used by `git for-each-ref` positional arguments. Choosing a single flexible filter, rather than a proliferation of per-kind flags like `--branches`, `--tags`, `--remotes`, keeps the option surface small and lets the same mechanism express narrow selections the per-kind flags could not, such as "only release tags" (`'refs/tags/v*'`) or "only one remote's branches" (`'refs/remotes/origin/*'`). Without `--ref-filter`, behaviour is unchanged: every ref `refs_for_each_ref()` enumerates contributes. Both the reference counter and the path-walk seeding (via `add_pending_oid()`) sit on the same callback, so an early return when no pattern matches naturally excludes a ref from both. No separate object-walk machinery is needed. Cover the two interesting code paths with tests in t1901: a single filter narrowing to branches, and two filters unioning to include both branches and tags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
This implements the Windows-specific support code, because everything is slightly different on Windows, even loading shared libraries. Note: I specifically do _not_ use the code from `compat/win32/lazyload.h` here because that code is optimized for loading individual functions from various system DLLs, while we specifically want to load _many_ functions from _one_ DLL here, and distinctly not a system DLL (we expect libcurl to be located outside `C:\Windows\system32`, something `INIT_PROC_ADDR` refuses to work with). Also, the `curl_easy_getinfo()`/`curl_easy_setopt()` functions are declared as vararg functions, which `lazyload.h` cannot handle. Finally, we are about to optionally override the exact file name that is to be loaded, which is a goal contrary to `lazyload.h`'s design. 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>
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>
The previous commits introduced a compile-time option to load libcurl lazily, but it uses the hard-coded name "libcurl-4.dll" (or equivalent on platforms other than Windows). To allow for installing multiple libcurl flavors side by side, where each supports one specific SSL/TLS backend, let's first look whether `libcurl-<backend>-4.dll` exists, and only use `libcurl-4.dll` as a fall back. That will allow us to ship with a libcurl by default that only supports the Secure Channel backend for the `https://` protocol. This libcurl won't suffer from any dependency problem when upgrading OpenSSL to a new major version (which will change the DLL name, and hence break every program and library that depends on it). This is crucial because Git for Windows relies on libcurl to keep working when building and deploying a new OpenSSL package because that library is used by `git fetch` and `git clone`. Note that this feature is by no means specific to Windows. On Ubuntu, for example, a `git` built using `LAZY_LOAD_LIBCURL` will use `libcurl.so.4` for `http.sslbackend=openssl` and `libcurl-gnutls.so.4` for `http.sslbackend=gnutls`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The 'git survey' builtin provides several detail tables, such as "top files by on-disk size". The size of these tables defaults to 10, currently. Allow the user to specify this number via a new --top=<N> option or the new survey.top config key. Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` started life as an experimental scale-measurement tool; the preceding commits give `git repo structure` the path-level detail tables and ref-scoping mechanism that were `git survey`'s main draw, so the two now overlap substantially. Plan the migration explicitly: add a short notice at the top of the description making clear which of `git survey`'s knobs map to which `git repo structure` option, and state that a future release will turn `git survey` into a thin shim over `git repo structure`. Putting the notice in the description (rather than only the synopsis) ensures it shows up in `git help survey` rendering before the reader sees any option specifics, so an operator skimming the page learns about the replacement before adopting any survey-specific flags. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Commit 2406bf5 (Win32: detect unix socket support at runtime, 2024-04-03) introduced a runtime detection for whether the operating system supports unix sockets for Windows, but a mistake snuck into the tests. When building and testing Git without NO_UNIX_SOCKETS we currently skip t0301-credential-cache on Windows if unix sockets are supported and run the tests if they aren't. Flip that logic to actually work the way it was intended. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The new default of Git is to disable NTLM authentication by default. To help users find the escape hatch of that config setting, should they need it, suggest it when the authentication failed and the server had offered NTLM, i.e. if re-enabling it would fix the problem. Helped-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Accessing the Windows console through the special CONIN$ / CONOUT$ devices doesn't work properly for non-ASCII usernames an passwords. It also doesn't work for terminal emulators that hide the native console window (such as mintty), and 'TERM=xterm*' is not necessarily a reliable indicator for such terminals. The new shell_prompt() function, on the other hand, works fine for both MSys1 and MSys2, in native console windows as well as mintty, and properly supports Unicode. It just needs bash on the path (for 'read -s', which is bash-specific). On Windows, try to use the shell to read from the terminal. If that fails with ENOENT (i.e. bash was not found), use CONIN/OUT as fallback. Note: To test this, create a UTF-8 credential file with non-ASCII chars, e.g. in git-bash: 'echo url=http://täst.com > cred.txt'. Then in git-cmd, 'git credential fill <cred.txt' works (shell version), while calling git without the git-wrapper (i.e. 'mingw64\bin\git credential fill <cred.txt') mangles non-ASCII chars in both console output and input. Signed-off-by: Karsten Blees <blees@dcon.de>
In preparation for making this function a bit more complicated (to allow for special-casing the `ContainerMappedDirectories` in Windows containers, which look like a symbolic link, but are not), let's move it out of the header. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, symbolic links have a type: a "file symlink" must point at a file, and a "directory symlink" must point at a directory. If the type of symlink does not match its target, it doesn't work. Git does not record the type of symlink in the index or in a tree. On checkout it'll guess the type, which only works if the target exists at the time the symlink is created. This may often not be the case, for example when the link points at a directory inside a submodule. By specifying `symlink=file` or `symlink=dir` the user can specify what type of symlink Git should create, so Git doesn't have to rely on unreliable heuristics. Signed-off-by: Bert Belder <bertbelder@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
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>
The Git for Windows project has grown quite complex over the years, certainly much more complex than during the first years where the `msysgit.git` repository was abusing Git for package management purposes and the `git/git` fork was called `4msysgit.git`. Let's describe the status quo in a thorough way. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In this time and age, AI is everywhere. However, it's sometimes not very easy to use. For green-field projects it works quite a bit better than for existing legacy projects. And Git's source code is _quite_ as legacy code as they come... 😁 Now, the only way how AI can be used efficiently with legacy code is by providing enough information by way of prompt context for the AI to have a chance to make any sense of the code. The structure and the architecture is, after all, not designed for AI, but rather the opposite: By virtue of having grown organically over two decades, there is no design that AI coding models would readily grasp. So here is a document that describes all kinds of aspects about this project. The idea is to help AI by providing information that it does not have ingrained in its weights. The idea is to provide information that a human prompter might take for granted, but no coding model will have been trained on specifically. Assisted-by: Claude Opus 4.5 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The Git project followed Git for Windows' lead and added their Code of Conduct, based on the Contributor Covenant v1.4, later updated to v2.0. We adapt it slightly to Git for Windows. 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>
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>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and Philip Oakley. Helped-by: Clive Chan <cc@clive.io> Helped-by: Adric Norris <landstander668@gmail.com> Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com> Helped-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Brendan Forster <brendan@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: main
From: 6f712333fa (Merge 'readme' into HEAD, 2018-06-07) (9083bf1865..6f712333fa)
To: cc29cd621e (Merge 'readme' into HEAD, 2018-06-07) (ca42d5af82..cc29cd621e)
Statistics
Range-diff (click to expand)
1: 2936e40 = 1: 4039399 unix-socket: avoid leak when initialization fails
2: 6604005 = 2: 156b845 grep: prevent
^$false match at end of file3: 0eb4579 = 3: d85cadb Merge branch 'fixes-from-the-git-mailing-list'
18: 6367bd4 = 4: 9347cb7 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
19: b8a71b5 = 5: c21992a vcpkg_install: detect lack of Git
20: 69e9c1b = 6: f547cc0 vcpkg_install: add comment regarding slow network connections
9: 16ccc14 = 7: 1be9d80 t5505/t5516: allow running without
.git/branches/in the templates21: 5ab23a4 = 8: 711390e max_tree_depth: lower it for clang builds in general on Windows
22: 0f0681f = 9: 047a721 vcbuild: install ARM64 dependencies when building ARM64 binaries
23: 1863ee0 = 10: 32a6124 t5505/t5516: fix white-space around redirectors
24: 14c7add = 11: 4fc10a2 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
26: 0307546 = 12: cfd751b vcbuild: add an option to install individual 'features'
27: d0b76ea = 13: d3f41cb Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
29: 79ae9e6 = 14: 25ffcb0 cmake: allow building for Windows/ARM64
30: 9521ad8 = 15: 2b17195 clink.pl: fix libexpatd.lib link error when using MSVC
32: 4c279e5 = 16: d72229c ci(vs-build) also build Windows/ARM64 artifacts
33: cabeac9 = 17: a899702 Makefile: clean up .ilk files when MSVC=1
35: 5e4075c = 18: 38bd55c vcbuild: stop hard-coding OpenSSL as a dependency
36: 4ef5a7c = 19: cf1e96c vcbuild: add support for compiling Windows resource files
38: f4e69d0 = 20: b2eb340 cmake(): allow setting HOST_CPU for cross-compilation
39: 601a9f8 = 21: 5598528 config.mak.uname: add git.rc to MSVC builds
4: b9074d6 = 22: deafbb7 t9350: point out that refs are not updated correctly
42: 2a008d4 = 23: ce67ac2 CMake: default Visual Studio generator has changed
43: fa0f704 = 24: a03ead9 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
5: a696a63 = 25: 26429ee transport-helper: add trailing --
6: bd1c9b7 = 26: 3a0b5b7 mingw: demonstrate a
git addissue with NTFS junctions46: 5fcae53 = 27: bd390f6 .gitignore: add Visual Studio CMakeSetting.json file
47: ec323d2 = 28: aa2a5fb clink.pl: move default linker options for MSVC=1 builds
40: eb3a22c = 29: ea7716a MinGW: link as terminal server aware
11: 47e3ebc = 30: ac0b90f ci: bump actions/checkout from 6 to 7
7: f17aa34 = 31: 9e97705 remote-helper: check helper status after import/export
8: 13043b8 = 32: 3cd45b1 strbuf_realpath(): use platform-dependent API if available
10: d0d28e8 = 33: b1fa63a http: use new "best effort" strategy for Secure Channel revoke checking
50: b16b6a0 = 34: 9e67f9b subtree: update
contrib/subtreetesttarget51: c52eb33 = 35: eb6ae8f CMakeLists: add default "x64-windows" arch for Visual Studio
52: dcb75bb = 36: 327388a setup: properly use "%(prefix)/" when in WSL
53: c7d8d5e = 37: 03ae7f3 Add config option
windows.appendAtomically54: 8aeda0d = 38: c9403cb cmake: install headless-git.
44: c030866 = 39: 2d885e1 http: optionally load libcurl lazily
316: 93cbb29 = 40: 917dc88 bundle-uri: refuse advertised URIs by protocol
304: 85d81a7 ! 41: 3817f5c build(deps): bump actions/cache from 5 to 6
12: 33a7797 = 42: d05e794 Always auto-gc after calling a fast-import transport
13: 835cf99 = 43: db6b0ca mingw: prevent regressions with "drive-less" absolute paths
14: 377f947 = 44: 0dfe7c8 transport: optionally disable side-band-64k
15: 72b7b2a = 45: 5f9b812 mingw: fix fatal error working on mapped network drives on Windows
16: 1cdce74 = 46: 53ac651 clink.pl: fix MSVC compile script to handle libcurl-d.lib
17: c3f9cb0 = 47: 89d75f0 mingw: implement a platform-specific
strbuf_realpath()57: ebdd495 = 48: 3d20593 t3701: verify that we can add lots of files interactively
58: 9a7a036 = 49: 9aaac2f commit: accept "scissors" with CR/LF line endings
59: 2223ba6 = 50: 0d1d5d2 t0014: fix indentation
60: d55567e = 51: 8d3735c git-gui: accommodate for intent-to-add files
61: 51078bf = 52: 9f3f1ce mingw: allow for longer paths in
parse_interpreter()62: 71e7d57 = 53: f119cb8 compat/vcbuild: document preferred way to build in Visual Studio
63: a31476b = 54: e2d4922 http: optionally send SSL client certificate
64: 68ae5de = 55: 90ccb31 ci: run
contrib/subtreetests in CI builds65: b3f293f = 56: e71073a CMake: show Win32 and Generator_platform build-option values
67: 76e0e7f = 57: 34f959f compat/mingw.c: do not warn when failing to get owner
68: 94deca5 = 58: 47fd25e mingw: $env:TERM="xterm-256color" for newer OSes
69: a23679d = 59: 542a48c winansi: check result and Buffer before using Name
70: 0c6e3c1 = 60: 1cfde40 mingw: change core.fsyncObjectFiles = 1 by default
71: e734ef9 = 61: 2a0d971 Fix Windows version resources
72: 28df575 = 62: d17049c status: fix for old-style submodules with commondir
73: 3ff319e = 63: 39aedaa git.rc: include winuser.h
25: 9d84c23 = 64: 766bcc1 revision: create mark_trees_uninteresting_dense()
28: 3fce365 = 65: 723e28d survey: stub in new experimental 'git-survey' command
31: 00643a4 = 66: b111db0 survey: add command line opts to select references
34: 2cfcc36 = 67: 4d8ea8f survey: start pretty printing data in table form
37: 17a556f = 68: 87f603e survey: add object count summary
41: f7b7820 = 69: c9c895c survey: summarize total sizes by object type
45: e6c85bf = 70: e2f51db survey: show progress during object walk
49: 0e951fb = 71: 232b9a5 survey: add ability to track prioritized lists
56: 38b2010 = 72: 1d37f65 survey: add report of "largest" paths
106: 2e2f114 = 73: ac7c462 survey: add --top= option and config
81: 596d1d0 = 74: 80ce963 mingw: Support
git_terminal_promptwith more terminals120: b3260e0 = 75: dd12512 survey: clearly note the experimental nature in the output
82: 18f0d3e = 76: 8c54434 compat/terminal.c: only use the Windows console if bash 'read -r' fails
306: 1685cc2 = 77: 41e20d5 repo: split annotated tags out from total tag count in structure
84: afc592f = 78: 1383720 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
307: 5174356 = 79: dd84317 repo: filter the structure scope via --ref-filter=
86: c72782a = 80: 9586415 Win32: symlink: move phantom symlink creation to a separate function
308: ad78881 = 81: bf3aeea repo: report top-N paths by count, disk, and inflated size in structure
88: 340b774 = 82: a91c6ad mingw: make sure
errnois set correctly when socket operations fail89: 9a472bb = 83: ed1e541 t5563: verify that NTLM authentication works
90: 8655cb6 = 84: a429448 mingw: introduce code to detect whether we're inside a Windows container
91: 56731d2 = 85: 9b6d4d0 Introduce helper to create symlinks that knows about index_state
309: b15ddaf = 86: 30e4cc2 t1901: cover the --top option of
git repo structure94: 53dfbfd = 87: 4489af9 compat/mingw: handle WSA errors in strerror
95: 5d698aa = 88: 4e6d7b6 http: disallow NTLM authentication by default
96: de47ac6 = 89: 8550268 mingw: when running in a Windows container, try to rename() harder
97: ac5dbd5 = 90: 5946ef2 mingw: allow to specify the symlink type in .gitattributes
83: ac9ba3c = 91: 01b4473 diff: stop truncating the deflated-binary-diff size on Windows
48: 0ff15c0 = 92: 6fb4033 http: support lazy-loading libcurl also on Windows
310: eeeab06 = 93: 4b8b0e3 repo: read the
--topdefault fromrepo.structure.top100: d7bd34f = 94: 9691e35 compat/mingw: drop outdated comment
101: 4c38e27 = 95: 73ff8dd http: warn if might have failed because of NTLM
102: 082ed0b = 96: f6c4dbd mingw: move the file_attr_to_st_mode() function definition
103: 96ff91c = 97: b782b4a Win32: symlink: add test for
symlinkattribute85: 50a5d54 = 98: 1e32c46 convert: widen gather_convert_stats() helpers to size_t
55: 32867ba = 99: 2023916 http: when loading libcurl lazily, allow for multiple SSL backends
66: edaa84c < -: ---------- Merge branch 'fixes-from-the-git-mailing-list'
311: 07ed439 = 100: 69d306e git-survey: announce the upcoming pivot into
git repo structure107: 5b4fc3a = 101: 4b77318 t0301: actually test credential-cache on Windows
108: 5a86cb6 = 102: bed395e credential: advertise NTLM suppression and allow helpers to re-enable
109: 3016fcf = 103: d8f9296 mingw: Windows Docker volumes are not symbolic links
110: 685b3de = 104: 8305399 clean: do not traverse mount points
87: 0ff66fe = 105: 2e54232 read-cache: stop truncating index blob sizes on Windows
111: 6de82ff = 106: 15a3568 pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
74: a19a236 = 107: 55a7d69 mingw: do load libcurl dynamically by default
75: dfe8926 = 108: 5338df0 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
76: 8726a7d = 109: f4eb41e mingw: suggest
windows.appendAtomicallyin more cases77: f63a9ce = 110: 1dd16b1 win32: use native ANSI sequence processing, if possible
78: ce15de6 = 111: affcbdc common-main.c: fflush stdout buffer upon exit
79: 2105b1e = 112: a238070 t5601/t7406(mingw): do run tests with symlink support
80: 22f9d2d = 113: 5e29e51 Fallback to AppData if XDG_CONFIG_HOME is unset
312: 13caba6 = 114: ab94020 survey: turn into a thin shim over
git repo structure121: 1004bac = 115: 50830c7 credential-cache: handle ECONNREFUSED gracefully
122: 16bbbf0 = 116: 3353fb6 reftable: do make sure to use custom allocators
123: 877a5a0 = 117: e4ee60d check-whitespace: avoid alerts about upstream commits
124: 078375f = 118: b2d3af8 t/t5571-prep-push-hook.sh: Add test with writing to stderr
125: 7b28e83 = 119: 9448c15 dir: do not traverse mount points
126: 2a728c5 = 120: 10e5d5e win32: thread-utils: handle multi-socket systems
127: 07d733d = 121: 1a99232 t5563: add tests for http.emptyAuth with Negotiate
128: 2dfcbd5 = 122: 0b971a3 entry: flush fscache after creating directories and writing files
129: b7438f9 = 123: 1b36f6d ci(macos): skip the
git p4tests130: a2dcc96 = 124: ea82551 mingw: work around rename() failing on a read-only file
131: 9b08f3d = 125: e4330ab clean: remove mount points when possible
132: 0713635 = 126: 16cab7c mingw: optionally enable wsl compability file mode bits
133: 4158e99 = 127: 868d940 Refuse to follow invalid paths in
.gitfiles92: 38bdcbc = 128: 1c03152 xdiff-interface: widen buffer_is_binary() size parameter to size_t
93: 73173bf = 129: ddb5637 tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
98: 3c4a6f4 = 130: b752cea combine-diff: stop truncating combined-diff blob sizes on Windows
99: e9fdeda = 131: d378f9e tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
104: cc2886e = 132: eaca0fb diff: widen textconv_object() size out-param to size_t
134: b920827 = 133: 5fad24a Merge branch 'size-t/pack-objects-delta'
105: 0c04a43 = 134: 5ceccb5 pack-objects: drop the two tree-walk casts in the preferred-base path
112: 5cb88e4 = 135: 39e5c68 diffcore: widen struct diff_filespec.size to size_t
135: f52e6ae = 136: 26a35d1 Merge branch 'size-t/pack-bitmap'
113: 607f6c2 = 137: dfb4a33 tree: widen struct tree.size and parse_tree_buffer() to size_t
136: f4e6fc2 = 138: 6069921 Merge branch 'size-t/diff'
114: f2fb387 = 139: 4a6fa0f commit: widen the commit-buffer API to size_t
137: f6a19f6 = 140: bfb964d Merge branch 'size-t/tree'
115: 8f20174 = 141: f38ee55 blame: widen find_line_starts() len parameter to size_t
139: 90885d0 = 142: fb52d0e Merge branch 'size-t/commit'
116: 25d3451 = 143: d85444f grep: widen struct grep_source.size and grep_buffer() to size_t
141: 77c868a = 144: 10f1797 Merge branch 'size-t/blame'
117: 1aff690 = 145: 033aabd fast-export: drop the export_blob() size cast and widen anonymize_blob()
143: afd08c2 = 146: 8f6b2d8 Merge branch 'size-t/grep'
118: 04e4f8c = 147: 07f1c98 repo: drop the inflated-size cast in count_objects()
145: 64cbaad = 148: a785e2b Merge branch 'size-t/fast-export'
119: bfe0f5f = 149: 0a8a14a unpack-objects: widen the size-passing infrastructure to size_t
138: 91e6afd < -: ---------- Merge branch 'bump-ci-actions/checkout-from-6-to-7'
147: e8ed4cd = 150: d64f4fa Merge branch 'size-t/repo'
149: d06c83b = 151: 1a03258 Merge branch 'size-t/unpack-objects'
151: 99911e4 = 152: 4ef4d7d Merge branch 'topic/size-t' into size-t-followups
153: dd7bf20 = 153: c240505 pack-objects: drop cast_size_t_to_ulong shims in get_delta()
155: 165a8ee = 154: ab19f79 pack-objects: drop cast_size_t_to_ulong shims in try_delta()
157: 3ad13ea = 155: eabffa8 pack-objects: drop the last size shim in write_no_reuse_object()
159: 906b5ea = 156: 0904490 blame: widen struct blame_scoreboard.final_buf_size to size_t
161: 30dc9f7 = 157: 52ec6a8 fast-import: drop the six size casts in the object-read paths
163: 51f7afe = 158: 93b89d9 t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
319: 142cb6c = 159: c731f5f Merge tag 'v2.55.0.windows.4'
165: 4e35c0c = 160: 20b4938 Drop the
cast_size_t_to_ulong()helper166: b59870b = 161: 1735f9c Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
-: ---------- > 162: 3657e1c Merge branch 'bump-ci-actions'
168: 089cf64 = 163: 2cd5456 Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
140: 5c81673 = 164: 9d20707 Merge 'remote-hg-prerequisites' into HEAD
314: 5ae0f00 = 165: ca4eb54 mingw: handle staging 4GB+ files correctly
142: a67369c = 166: ac09572 Merge branch 'drive-prefix'
315: 6885530 = 167: c216777 mingw: support unpacking loose 4GB+ objects
144: c73f8ca = 168: 3b18671 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
317: 3e9409d = 169: dc6d29f t: add an expensive test to verify that 4GB+ blobs can be staged/read
146: 30400ec = 170: f6dfce4 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
320: 179c463 = 171: fa7f08d object-file: use size_t for object size in check_object_signature()
169: 85448b4 = 172: b20bf64 coverity: skip building with Rust, for now
148: 109be54 = 173: 190552d Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
150: fd7bcaf = 174: 059b28a Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction152: 92a9b30 = 175: 7e17896 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
154: 4e9bf26 = 176: 1231302 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
156: 3f61a1d = 177: ba07ae2 Merge 'add-p-many-files'
158: b7eba26 = 178: e64fd1f Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
160: 017ff1c = 179: 49bc14f Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
162: 0dcdd70 = 180: 90acb6c Merge 'git-gui/js/intent-to-add'
164: c3f5c8c = 181: 6a1bab6 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
167: d0230e9 = 182: f4f5374 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
170: 76ca431 = 183: e5892a3 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
171: 0773ad5 = 184: b8e37a6 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path172: f3be226 = 185: 280b328 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
173: 512d687 = 186: 14a8048 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
174: 855ac66 = 187: 634ac61 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests175: e52518c = 188: ee84b9d Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
176: dc26256 < -: ---------- Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t177: e63a7cf = 189: a64d2cb Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory178: 6de0114 = 190: 121babb Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
179: d7408c5 = 191: 155ab99 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
180: a22b779 = 192: 318bf9e Merge branch 'optionally-dont-append-atomically-on-windows'
181: a14cc1b = 193: 50d43d8 Merge branch 'fsync-object-files-always'
182: 4217542 = 194: f11057b Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
183: 1152e20 = 195: 4bd5dc5 Fix Windows version resources (Fix Windows version resources git#4092)
184: 27ec957 = 196: 35cf033 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
185: a278262 = 197: 81a7aaf Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)186: f3b3b2d = 198: 885c61b Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283187: 02e5584 = 199: 9c0e403 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
188: a1879c2 = 200: 3984e5b ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
189: 4f40ee2 = 201: 0dfa5ed Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
190: 7703527 = 202: eac127f Merge branch 'nano-server'
191: 919cadb = 203: 6b2b237 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
192: a9abe26 = 204: 65c4b2c win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
193: b42e449 = 205: d091b9b common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
194: 22dbe15 = 206: c27c9e4 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
195: 7239568 = 207: 5dfb8cd Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
196: 6dec7ad = 208: d994984 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
197: 27325c3 = 209: 5586ab5 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
313: 69495ac = 210: 75ae051 Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)198: 5fcec9d = 211: 2849209 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
199: 1a706ae = 212: 11a1b15 Merge branch 'reftable-vs-custom-allocators'
200: 74ba801 = 213: 4153da9 Merge branch 'check-whitespace-only-downstream'
201: a5a5203 = 214: 76bc2db 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)
202: 92545b7 = 215: 74884fa Merge branch 'disallow-ntlm-auth-by-default'
203: fc360c8 = 216: 541ed1a Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)204: 78f7bc8 = 217: ea41053 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
205: 7c4800e = 218: d563c90 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
206: db06b79 = 219: e38bcd9 entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
207: f02b3bd = 220: 3d4b940 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)208: eead9c6 = 221: eac1044 Merge branch 'msys2'
209: c21cfe9 = 222: 1899e39 Merge 'docker-volumes-are-no-symlinks'
210: d68926a = 223: 7215303 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
211: 410eaea = 224: e45c5de Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
212: 9ca48fe = 225: 38808e3 Merge branch 'dont-clean-junctions'
213: 7e5db7f = 226: d1f1fb1 Merge branch 'wsl-file-mode-bits'
214: cde530f = 227: 9a97bd0 Merge branch 'validate-dotgit'
215: a0396ef = 228: f3970ad Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
322: dcb512e = 229: 9a6b51e Support loose 4GB+ objects (Support loose 4GB+ objects git#6353)
216: 8da0383 = 230: 46b44e6 Merge branch 'skip-rust-in-the-coverity-builds'
217: f30c6bf = 231: c968f48 Merge branch 'ready-for-upstream'
218: 9a8f685 = 232: 1a3b724 Win32: make FILETIME conversion functions public
219: 6b31f72 = 233: 97b3d51 Win32: dirent.c: Move opendir down
220: 11564d1 = 234: 07b4b73 mingw: make the dirent implementation pluggable
221: 110f0b9 = 235: 323d365 Win32: make the lstat implementation pluggable
222: 222cfe1 = 236: 28a93e3 mingw: add infrastructure for read-only file system level caches
223: 845521a = 237: 9850ddb mingw: add a cache below mingw's lstat and dirent implementations
224: 615662f = 238: dda243d fscache: load directories only once
225: 3383ef5 = 239: 1491cf4 fscache: add key for GIT_TRACE_FSCACHE
243: ca46158 = 240: 83433d5 git-gui--askyesno: fix funny text wrapping
226: 348e347 = 241: 49806aa fscache: remember not-found directories
245: f719f0b = 242: 51848eb git-gui--askyesno (mingw): use Git for Windows' icon, if available
227: cce95eb = 243: 895d896 fscache: add a test for the dir-not-found optimization
228: 776c879 = 244: db8cb71 add: use preload-index and fscache for performance
229: 6e2bb00 = 245: 417ea1c dir.c: make add_excludes aware of fscache during status
230: c903f0e = 246: 41c597a fscache: make fscache_enabled() public
231: 80b7250 = 247: a498969 dir.c: regression fix for add_excludes with fscache
232: 05b0342 = 248: 20c06c0 fetch-pack.c: enable fscache for stats under .git/objects
233: 7c1eb35 = 249: ffaec5d checkout.c: enable fscache for checkout again
234: 5475040 = 250: 77cf7b6 Enable the filesystem cache (fscache) in refresh_index().
235: 8330188 = 251: 969ab84 fscache: use FindFirstFileExW to avoid retrieving the short name
236: 3c5d47e = 252: 0198009 fscache: add GIT_TEST_FSCACHE support
237: baeddb1 = 253: 7461ab3 fscache: add fscache hit statistics
238: d12cf58 = 254: 121b8eb unpack-trees: enable fscache for sparse-checkout
239: cd3af1b = 255: 1549d1b status: disable and free fscache at the end of the status command
240: 5455ca1 = 256: 29a2bdd mem_pool: add GIT_TRACE_MEMPOOL support
241: 22ef151 = 257: c0a0c4d fscache: fscache takes an initial size
242: e55039f = 258: 6f80a72 fscache: update fscache to be thread specific instead of global
244: f55743a = 259: b5d6673 fscache: teach fscache to use mempool
246: 217a923 = 260: 6a313d9 fscache: make fscache_enable() thread safe
247: 46c2179 = 261: 3fc5aa5 fscache: teach fscache to use NtQueryDirectoryFile
248: 46dd4a9 = 262: 5677635 fscache: remember the reparse tag for each entry
249: d52d181 = 263: 56619c3 fscache: Windows Docker volumes are not symbolic links
250: 8427440 = 264: a29f1e4 fscache: optionally enable wsl compability file mode bits
251: a4539b2 = 265: 6eb932c fscache: implement an FSCache-aware is_mount_point()
252: 85f5c1a = 266: 21a02bc clean: make use of FSCache
253: 25b3404 = 267: 319f36c Merge branch 'fscache'
254: f8607c8 = 268: 89a6548 compat/poll: do not collect more handles than the wait supports
255: 6737678 = 269: d1855e2 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
256: 74690a2 = 270: 2064823 parallel-checkout: limit worker count to what poll() can wait on
257: c6fa893 = 271: ac07397 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
258: d6ade3d = 272: 860dd91 run-command: limit concurrent children to what poll() can wait on
259: e38e9e4 = 273: 1657875 Merge branch 'dont-clean-junctions-fscache'
260: e8188a3 = 274: 00a523f 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)
261: 0e2914b = 275: f955397 pack-objects (mingw): demonstrate a segmentation fault with large deltas
262: 993f998 = 276: e657260 mingw: support long paths
263: bd9608b = 277: 69d581d win32(long path support): leave drive-less absolute paths intact
264: 41cf597 = 278: 40f22d4 compat/fsmonitor/fsm-*-win32: support long paths
265: 967830d = 279: 211e582 clean: suggest using
core.longPathsif paths are too long to remove266: b8b6a71 = 280: db051f5 mingw: explicitly specify with which cmd to prefix the cmdline
267: 1eac7ea = 281: 71e23cd mingw: when path_lookup() failed, try BusyBox
268: 04fccdb = 282: 21c7013 test-tool: learn to act as a drop-in replacement for
iconv269: 81d2a44 = 283: 7184327 tests(mingw): if
iconvis unavailable, usetest-helper --iconv270: 192146a = 284: 8483af9 gitattributes: mark .png files as binary
271: bdd3554 = 285: 3c676be tests: move test PNGs into t/lib-diff/
272: b76f83a = 286: af04f8f tests: only override sort & find if there are usable ones in /usr/bin/
273: 54abf3b = 287: b3da4c9 tests: use the correct path separator with BusyBox
274: 4d19616 = 288: 3914e7e mingw: only use Bash-ism
builtin pwd -Wwhen available275: e203b49 = 289: 83004d0 tests (mingw): remove Bash-specific pwd option
276: e28bbbc = 290: 16982f3 test-lib: add BUSYBOX prerequisite
277: 6630b9b = 291: bbea78b t5003: use binary file from t/lib-diff/
278: 2271fef = 292: 071f461 t5532: workaround for BusyBox on Windows
279: 20c4431 = 293: 8280d99 t5605: special-case hardlink test for BusyBox-w32
280: 3d66cd9 = 294: aa8ae17 t5813: allow for $PWD to be a Windows path
281: c784105 = 295: e3b378f t9200: skip tests when $PWD contains a colon
290: f64f21c = 296: 0d691bb Add a GitHub workflow to monitor component updates
293: 0c05d5f = 297: 43d45b5 Partially un-revert "editor: save and reset terminal after calling EDITOR"
294: b1861cc = 298: 03d904d reset: reinstate support for the deprecated --stdin option
295: a8c49d1 = 299: fa1c007 fsmonitor: reintroduce core.useBuiltinFSMonitor
296: 84db503 = 300: 0a05eb5 dependabot: help keeping GitHub Actions versions up to date
282: 8d0f7c1 = 301: ad46790 Describe Git for Windows' architecture
283: 73ebb02 = 302: 2e15377 Add an AGENTS.md file to help with AI-assisted debugging/development
284: e70c491 = 303: db28e6c Modify the Code of Conduct for Git for Windows
289: f38dbb8 = 304: ff995a3 Merge branch 'gitk-and-git-gui-patches'
285: ada955e = 305: 0ad392b CONTRIBUTING.md: add guide for first-time contributors
292: 3373699 = 306: 770b37c Merge branch 'long-paths'
286: 0444e66 = 307: 9f4ebd0 README.md: Add a Windows-specific preamble
298: cdab319 = 308: dd00758 Merge branch 'busybox-w32'
287: 1631f24 = 309: a5d500e Add an issue template
299: 8bd0544 = 310: f2cdb94 Merge branch 'un-revert-editor-save-and-reset'
288: 3c1c34f = 311: 1b171d9 Modify the GitHub Pull Request template (to reflect Git for Windows)
300: 96c6c61 = 312: da8eba7 Merge branch 'phase-out-reset-stdin'
291: 05f5552 = 313: d1d6350 SECURITY.md: document Git for Windows' policies
301: 278dc88 = 314: 4e76a79 Merge branch 'deprecate-core.useBuiltinFSMonitor'
297: ba420a7 = 315: c755957 ci: only run the expensive tests in the Windows tests for now
302: b31c1c3 = 316: a94573e Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
303: 31c516b = 317: cc29cd6 Merge 'readme' into HEAD
305: 2393a7a < -: ---------- build(deps): bump actions/cache from 5 to 6 (build(deps): bump actions/cache from 5 to 6 git#6303)
318: f4af51c < -: ---------- git-for-windows: prepare for 2.55.0(5)
321: 0c0057c < -: ---------- Merge tag 'v2.55.0.windows.5'