Repository navigation
Rebase shears/seen: 2 conflict(s) (0 skipped, 2 resolved) (#38476327277) - #525
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
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>
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>
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>
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>
It seems to be not exactly rare on Windows to install NTFS junction points (the equivalent of "bind mounts" on Linux/Unix) in worktrees, e.g. to map some development tools into a subdirectory. In such a scenario, it is pretty horrible if `git clean -dfx` traverses into the mapped directory and starts to "clean up". Let's just not do that. Let's make sure before we traverse into a directory that it is not a mount point (or junction). This addresses git-for-windows#607 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>
Same theme as the preceding pack-objects series: get_size_by_pos() returns an unsigned long but reads its size out of packed_object_info() / odb_read_object_info_extended() via a size_t out-parameter, so on Windows it would silently truncate the very sizes filter_bitmap_blob_limit() then compares against the --filter=blob:limit threshold to decide which blobs to elide from the bitmap-backed traversal. Drop the cast_size_t_to_ulong() and return size_t directly. The two callers' limit comparison promotes to size_t cleanly. limit itself stays unsigned long; it is part of a filter API ripple of its own. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This will help with Git for Windows' maintenance going forward: It allows Git for Windows to switch its primary libcurl to a variant without the OpenSSL backend, while still loading an alternate when setting `http.sslBackend = openssl`. This is necessary to avoid maintenance headaches with upgrading OpenSSL: its major version name is encoded in the shared library's file name and hence major version updates (temporarily) break libraries that are linked against the OpenSSL library. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In Git for Windows v2.39.0, we fixed a regression where `git.exe` would no longer work in Windows Nano Server (frequently used in Docker containers). This GitHub workflow can be used to verify manually that the Git/Scalar executables work in Nano Server. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When 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>
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>
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>
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>
Git for Windows uses MSYS2's Bash to run the test suite, which comes with benefits but also at a heavy price: on the plus side, MSYS2's POSIX emulation layer allows us to continue pretending that we are on a Unix system, e.g. use Unix paths instead of Windows ones, yet this is bought at a rather noticeable performance penalty. There *are* some more native ports of Unix shells out there, though, most notably BusyBox-w32's ash. These native ports do not use any POSIX emulation layer (or at most a *very* thin one, choosing to avoid features such as fork() that are expensive to emulate on Windows), and they use native Windows paths (usually with forward slashes instead of backslashes, which is perfectly legal in almost all use cases). And here comes the problem: with a $PWD looking like, say, C:/git-sdk-64/usr/src/git/t/trash directory.t5813-proto-disable-ssh Git's test scripts get quite a bit confused, as their assumptions have been shattered. Not only does this path contain a colon (oh no!), it also does not start with a slash. This is a problem e.g. when constructing a URL as t5813 does it: ssh://remote$PWD. Not only is it impossible to separate the "host" from the path with a $PWD as above, even prefixing $PWD by a slash won't work, as /C:/git-sdk-64/... is not a valid path. As a workaround, detect when $PWD does not start with a slash on Windows, and simply strip the drive prefix, using an obscure feature of Windows paths: if an absolute Windows path starts with a slash, it is implicitly prefixed by the drive prefix of the current directory. As we are talking about the current directory here, anyway, that strategy works. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, git repositories may have extra files which need cleaned (e.g., a build directory) that may be arbitrarily deep. Suggest using `core.longPaths` if such situations are encountered. Fixes: git-for-windows#2715 Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
These are Git for Windows' Git GUI and gitk patches. We will have to decide at some point what to do about them, but that's a little lower priority (as Git GUI seems to be unmaintained for the time being, and the gitk maintainer keeps a very low profile on the Git mailing list, too). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and Philip Oakley. Helped-by: Clive Chan <cc@clive.io> Helped-by: Adric Norris <landstander668@gmail.com> Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com> Helped-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Brendan Forster <brendan@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we need to adjust the template (because it only matches core Git's project management style, not ours). Also: direct Git for Windows enhancements to their contributions page, space out the text for easy reading, and clarify that the mailing list is plain text, not HTML. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
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>
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: 225297ac26 (ci: bump actions/setup-python from 6 to 7, 2026-10-05) (97ecae55af..225297ac26)
Resolved: 18952b7 (checkout.c: enable fscache for checkout again, 2018-01-30)
preserved upstream merge preparation and enabled fscache around checkout processing
Range-diff
1: 18952b7 ! 1: f1bab55 checkout.c: enable fscache for checkout again
Resolved: 4759689 (fscache: fscache takes an initial size, 2018-11-02)
preserved upstream merge setup and initialized fscache from the index size
Range-diff
1: 4759689 ! 1: c8f71ec fscache: fscache takes an initial size
To: b2d0e4f321 (ci: bump actions/setup-python from 6 to 7, 2026-10-05) (58f6c53ccb..b2d0e4f321)
Statistics
Range-diff (click to expand)
5: e14d82f = 1: 231bc7e difftool: do not crash on a path rejected by verify_path()
1: fbc3279 = 2: 7a4509f unix-socket: avoid leak when initialization fails
7: e27c4f3 = 3: 62121cd difftool: avoid memory leak when
run_dir_diff()fails2: 7417835 = 4: ef50939 grep: prevent
^$false match at end of file11: 54e27c8 = 5: f9a30a5 difftool: avoid invalid memory access by an atexit handler
12: 353d368 = 6: 1f3006d bundle-uri: refuse advertised URIs by protocol
3: ecd8ede = 7: 831ec80 Merge branch 'fixes-from-the-git-mailing-list'
19: 099775b = 8: 8e74f3c ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
20: b58c056 = 9: 0ae9eff vcpkg_install: detect lack of Git
21: fa7152c = 10: 1b16c46 vcpkg_install: add comment regarding slow network connections
22: 14f1f30 = 11: f83b0c3 t5505/t5516: allow running without
.git/branches/in the templates23: fa695ba = 12: 794f4c1 max_tree_depth: lower it for clang builds in general on Windows
24: 8ad62c4 = 13: b775692 vcbuild: install ARM64 dependencies when building ARM64 binaries
25: 9ea4c90 = 14: 2d148cd t5505/t5516: fix white-space around redirectors
26: 1d75575 = 15: 506b063 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
27: ee886ed = 16: a52db43 vcbuild: add an option to install individual 'features'
28: 25f277a = 17: 05ab767 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
29: 66b803d = 18: d5eb1be cmake: allow building for Windows/ARM64
30: 9c308b6 = 19: 47c58ae clink.pl: fix libexpatd.lib link error when using MSVC
31: 33b236c = 20: bbecf6c ci(vs-build) also build Windows/ARM64 artifacts
32: f59a658 = 21: 28c359b Makefile: clean up .ilk files when MSVC=1
33: 310e327 = 22: efe5635 vcbuild: stop hard-coding OpenSSL as a dependency
34: 191be17 = 23: f1c13aa vcbuild: add support for compiling Windows resource files
35: f91d4eb = 24: ddc482e cmake(): allow setting HOST_CPU for cross-compilation
36: c6609f0 = 25: b054842 config.mak.uname: add git.rc to MSVC builds
4: 886b168 = 26: 452b987 t9350: point out that refs are not updated correctly
38: 599c30c = 27: 961ef8e CMake: default Visual Studio generator has changed
39: 6c864ae = 28: 2bdf635 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
37: f663ab1 = 29: 4be3c8e MinGW: link as terminal server aware
6: c4ca76b = 30: 279c295 transport-helper: add trailing --
10: e3d550b = 31: b93724a mingw: demonstrate a
git addissue with NTFS junctions41: 192f8d0 = 32: 6a20283 .gitignore: add Visual Studio CMakeSetting.json file
42: 4850dcc = 33: 07c6c08 clink.pl: move default linker options for MSVC=1 builds
40: 9b56142 = 34: 9adb7b0 http: optionally load libcurl lazily
8: abfffe6 = 35: 225e749 ci: bump actions/checkout from 6 to 7
9: e390491 = 36: d52c5c0 remote-helper: check helper status after import/export
45: 03ea4eb = 37: e1b0bd8 strbuf_realpath(): use platform-dependent API if available
46: 64520c5 = 38: 5767039 http: use new "best effort" strategy for Secure Channel revoke checking
47: c7ae3e8 = 39: ca31a28 subtree: update
contrib/subtreetesttarget48: 82fa8a4 = 40: 40c368e CMakeLists: add default "x64-windows" arch for Visual Studio
49: d3d3f7e = 41: 83b1b4c setup: properly use "%(prefix)/" when in WSL
50: aa3fd92 = 42: 502c86c Add config option
windows.appendAtomically51: 5e00968 = 43: aeb75d8 cmake: install headless-git.
43: 7b78855 = 44: e297419 http: support lazy-loading libcurl also on Windows
13: 0556d18 = 45: 314190d ci(coverity): bump actions/cache from 5 to 6
14: 4aa2379 = 46: bf16176 Always auto-gc after calling a fast-import transport
15: fcbb1f0 = 47: 49ddcf0 mingw: prevent regressions with "drive-less" absolute paths
16: 698941b = 48: e4846e5 transport: optionally disable side-band-64k
17: faff9fa = 49: 8b0dd90 mingw: fix fatal error working on mapped network drives on Windows
18: 5f5f34a = 50: d8c5c78 clink.pl: fix MSVC compile script to handle libcurl-d.lib
54: 760967e = 51: 1d597c7 mingw: implement a platform-specific
strbuf_realpath()55: 3fe1c7b = 52: 514e5aa t3701: verify that we can add lots of files interactively
56: 51fd2b3 = 53: 946a3b5 commit: accept "scissors" with CR/LF line endings
57: b34671d = 54: 733503b t0014: fix indentation
58: 6c4a8ee = 55: b3c2749 git-gui: accommodate for intent-to-add files
59: 3ab3ede = 56: 7615cbb mingw: allow for longer paths in
parse_interpreter()60: 516997d = 57: 05619d2 compat/vcbuild: document preferred way to build in Visual Studio
61: 8b88461 = 58: ff6e212 http: optionally send SSL client certificate
62: 66d0786 = 59: 76ddd82 ci: run
contrib/subtreetests in CI builds63: 52ea9da = 60: 0a3fffe CMake: show Win32 and Generator_platform build-option values
64: 01bf314 = 61: ddea298 compat/mingw.c: do not warn when failing to get owner
65: 68cf4b1 = 62: 6b6a4b5 mingw: $env:TERM="xterm-256color" for newer OSes
66: 271cae1 = 63: 85e6471 winansi: check result and Buffer before using Name
67: 24c40fb = 64: b7bbbb0 mingw: change core.fsyncObjectFiles = 1 by default
68: f6b6b9a = 65: 261a031 Fix Windows version resources
69: 1952f0b = 66: a267e9a status: fix for old-style submodules with commondir
70: 469205d = 67: 0f4a052 git.rc: include winuser.h
44: 4b2dc49 = 68: b9cd5bd revision: create mark_trees_uninteresting_dense()
53: feb94cc = 69: cac62cd survey: stub in new experimental 'git-survey' command
78: 3874595 = 70: 62c0865 survey: add command line opts to select references
79: d5e76ea = 71: d25b49f survey: start pretty printing data in table form
80: f5aa668 = 72: c4e3cca survey: add object count summary
81: 3135fe6 = 73: f17f7b4 survey: summarize total sizes by object type
82: 72574b2 = 74: 3734a27 survey: show progress during object walk
83: d8ad7ce = 75: 34017a5 survey: add ability to track prioritized lists
84: 491487e = 76: 1054763 survey: add report of "largest" paths
85: 2fe7447 = 77: b3a8784 survey: add --top= option and config
86: 4d9693d = 78: 01cea5a mingw: Support
git_terminal_promptwith more terminals87: a30b066 = 79: b79cfb2 survey: clearly note the experimental nature in the output
88: bb43c53 = 80: 6ce9004 compat/terminal.c: only use the Windows console if bash 'read -r' fails
90: 60db9e0 = 81: 43d51f1 repo: split annotated tags out from total tag count in structure
91: 1c4bb47 = 82: 5384acb mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
93: 8d7d59d = 83: 35742e2 repo: filter the structure scope via --ref-filter=
94: 1e23dd9 = 84: aa5a0a9 Win32: symlink: move phantom symlink creation to a separate function
96: 7d7876d = 85: 8058ae2 repo: report top-N paths by count, disk, and inflated size in structure
97: dc16c6e = 86: 400d9d8 mingw: make sure
errnois set correctly when socket operations fail98: 1be7435 = 87: a7a66f2 t5563: verify that NTLM authentication works
99: 5345972 = 88: 2f843af mingw: introduce code to detect whether we're inside a Windows container
100: dbedaf4 = 89: 1e5c120 Introduce helper to create symlinks that knows about index_state
103: 0293736 = 90: 80d9b7c t1901: cover the --top option of
git repo structure104: ce19611 = 91: 66a91b3 compat/mingw: handle WSA errors in strerror
105: e86e75d = 92: d6435a0 http: disallow NTLM authentication by default
106: 0b152e4 = 93: 17f824d mingw: when running in a Windows container, try to rename() harder
107: f17fa71 = 94: f03f815 mingw: allow to specify the symlink type in .gitattributes
110: d21bb79 = 95: 810e6eb repo: read the
--topdefault fromrepo.structure.top111: 23bc4f7 = 96: 5f80211 compat/mingw: drop outdated comment
112: 1b74b4b = 97: 115c6bf http: warn if might have failed because of NTLM
113: 79b794f = 98: 843d34b mingw: move the file_attr_to_st_mode() function definition
114: 22b839f = 99: 1ad92d3 Win32: symlink: add test for
symlinkattribute89: 4c841e2 = 100: 65d319a diff: stop truncating the deflated-binary-diff size on Windows
52: 9ff7aff = 101: 25b62b8 http: when loading libcurl lazily, allow for multiple SSL backends
117: ac330a6 = 102: 637f000 git-survey: announce the upcoming pivot into
git repo structure118: 659fb1e = 103: 724440f t0301: actually test credential-cache on Windows
119: 8693cae = 104: 370f358 credential: advertise NTLM suppression and allow helpers to re-enable
120: 809c749 = 105: 92ebcf4 mingw: Windows Docker volumes are not symbolic links
121: 688c8ae = 106: 0a8c3ae clean: do not traverse mount points
92: 0c47105 = 107: 1483caf convert: widen gather_convert_stats() helpers to size_t
122: 57bba41 = 108: a9d7925 pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
71: eabcf11 = 109: a3138f2 mingw: do load libcurl dynamically by default
72: 0236551 = 110: e260dc2 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
73: c2d9676 = 111: 57abcce mingw: suggest
windows.appendAtomicallyin more cases74: afddb40 = 112: b381898 win32: use native ANSI sequence processing, if possible
75: b1c2f3c = 113: 747d995 common-main.c: fflush stdout buffer upon exit
76: 77de475 = 114: ef2941e t5601/t7406(mingw): do run tests with symlink support
77: 6876445 = 115: dd26b47 Fallback to AppData if XDG_CONFIG_HOME is unset
126: 976ceb6 = 116: 116d89c survey: turn into a thin shim over
git repo structure127: b2489c0 = 117: 4f1a7b5 credential-cache: handle ECONNREFUSED gracefully
128: be7e153 = 118: f7d9b0f reftable: do make sure to use custom allocators
129: b28c382 = 119: 991ea2a check-whitespace: avoid alerts about upstream commits
130: 56a50a6 = 120: 1feaaae t/t5571-prep-push-hook.sh: Add test with writing to stderr
131: 51df120 = 121: 8844f71 dir: do not traverse mount points
132: e2ef4e3 = 122: b71f9b1 win32: thread-utils: handle multi-socket systems
133: a94140e = 123: b437dc1 t5563: add tests for http.emptyAuth with Negotiate
134: 48cfbeb = 124: fe1fd14 entry: flush fscache after creating directories and writing files
135: 8dfe824 = 125: 7fde7d3 ci(macos): skip the
git p4tests136: 6e5a7ce = 126: ec5eec9 mingw: work around rename() failing on a read-only file
137: 1ead8ca = 127: 2b6034a clean: remove mount points when possible
138: aeb3257 = 128: c80e831 mingw: optionally enable wsl compability file mode bits
139: 54fb0b1 = 129: d7535e7 Refuse to follow invalid paths in
.gitfiles95: 86b8155 = 130: 35c874e read-cache: stop truncating index blob sizes on Windows
101: b810b06 = 131: bff2061 xdiff-interface: widen buffer_is_binary() size parameter to size_t
102: 523e789 = 132: 95427e9 tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
108: bb3487b = 133: ed71e38 combine-diff: stop truncating combined-diff blob sizes on Windows
109: feb93da = 134: 32a90be tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
115: 5bf70f6 = 135: 3d20861 diff: widen textconv_object() size out-param to size_t
140: b846f91 = 136: 06c4be8 Merge branch 'size-t/pack-objects-delta'
116: 38a2688 = 137: e1c34a4 pack-objects: drop the two tree-walk casts in the preferred-base path
123: c26d260 = 138: a7e7e35 diffcore: widen struct diff_filespec.size to size_t
141: edc7a3f = 139: 2b0adaa Merge branch 'size-t/pack-bitmap'
124: f3d21ae = 140: a8f9828 tree: widen struct tree.size and parse_tree_buffer() to size_t
142: 7bd3a7b = 141: 803772d Merge branch 'size-t/diff'
125: d3bf547 = 142: 418627d commit: widen the commit-buffer API to size_t
143: c46eac8 = 143: 5c29424 Merge branch 'size-t/tree'
144: 205fa81 = 144: 5d9cc85 blame: widen find_line_starts() len parameter to size_t
145: 0192da9 = 145: d8e3f97 Merge branch 'size-t/commit'
146: 5a5202e = 146: b985299 grep: widen struct grep_source.size and grep_buffer() to size_t
147: 240f287 = 147: 0b0d877 Merge branch 'size-t/blame'
148: 6e5872b = 148: 9ff84f3 fast-export: drop the export_blob() size cast and widen anonymize_blob()
149: 13cf3d6 = 149: b64dc69 Merge branch 'size-t/grep'
150: fd20d2d = 150: 8c5338e repo: drop the inflated-size cast in count_objects()
151: e2e7002 = 151: c18a060 Merge branch 'size-t/fast-export'
152: 5c75458 = 152: d62fee9 unpack-objects: widen the size-passing infrastructure to size_t
153: dbe2dec = 153: 22e9140 Merge branch 'size-t/repo'
154: 9b57c86 = 154: f519981 Merge branch 'size-t/unpack-objects'
155: dad5f0a = 155: 8ed6dbd Merge branch 'topic/size-t' into size-t-followups
156: 8c07c8e = 156: a48f26c pack-objects: drop cast_size_t_to_ulong shims in get_delta()
157: 7c27770 = 157: a0a2a2e pack-objects: drop cast_size_t_to_ulong shims in try_delta()
159: a130171 = 158: 14a51c9 pack-objects: drop the last size shim in write_no_reuse_object()
161: 5461421 = 159: 6c1a08e blame: widen struct blame_scoreboard.final_buf_size to size_t
163: b29bcb4 = 160: 78e54cb fast-import: drop the six size casts in the object-read paths
165: 5f58353 = 161: 6f61a67 t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
167: 8c3502f = 162: 3b6dfac Drop the
cast_size_t_to_ulong()helper168: 82088cb = 163: ed7b08c Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
158: c10c6a8 = 164: 65f153f difftool: do not crash on a path rejected by verify_path() (difftool: do not crash on a path rejected by verify_path() git#6426)
170: b5f2978 = 165: ea92045 Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
160: 0387f44 = 166: 8b8c119 Merge tag 'v2.55.0.windows.4'
172: cbae983 = 167: 98e962c mingw: handle staging 4GB+ files correctly
162: 04c7490 = 168: ff5dc59 Merge branch 'bump-ci-actions'
174: 52b9bfb = 169: 777596c mingw: support unpacking loose 4GB+ objects
164: 65b6113 = 170: 8eb771c Merge 'remote-hg-prerequisites' into HEAD
176: 7ac1c6a = 171: 18bee29 t: add an expensive test to verify that 4GB+ blobs can be staged/read
166: 2286674 = 172: 342bf67 Merge branch 'drive-prefix'
178: 91a5676 = 173: b376012 object-file: use size_t for object size in check_object_signature()
179: 9c6da5c = 174: 2960cb9 coverity: skip building with Rust, for now
169: a11a2c7 = 175: 1994efc Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
171: 9c08e1a = 176: 18324f5 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
173: 9cbf1e3 = 177: 2be30fd Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
175: 7964ff9 = 178: 517a32b Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction177: ca4bc35 = 179: ad75b27 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
180: 1618277 = 180: f7a471a Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
181: 5575335 = 181: 7740b1e Merge 'add-p-many-files'
182: d18ce0b = 182: 3be3cee Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
183: 7d6deee = 183: fd6b22d Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
184: a8009cd = 184: ae69b7b Merge 'git-gui/js/intent-to-add'
185: 45e01e8 = 185: 854dcd5 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
186: 1795bb0 = 186: 8fbfafc Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
187: 4a99694 = 187: e35e67a Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
188: 157493d = 188: 65774ba Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path189: bd05c69 = 189: 363f8df Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
190: 48dd009 = 190: 7654251 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
191: 5f23f40 = 191: 5594359 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests192: b6ad169 = 192: 45cb941 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
193: feee960 = 193: 6a8b161 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory194: 065c41f = 194: 458b103 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
195: feae8ea = 195: e3dc3f9 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
196: eb41861 = 196: 836f4c0 Merge branch 'optionally-dont-append-atomically-on-windows'
197: 55ec3e4 = 197: 5210b3c Merge branch 'fsync-object-files-always'
198: d7b95c4 = 198: ef8ca3c Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
199: b9e31ec = 199: f15fb63 Fix Windows version resources (Fix Windows version resources git#4092)
200: 7e15c94 = 200: 36aeebc Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
201: 37f82d2 = 201: e778b20 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)202: 0ab2f06 = 202: c38165e Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283203: 6f85567 = 203: b9b589a Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
204: 1905a35 = 204: 574119f ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
205: c903ba5 = 205: 4f02396 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
206: 6353afb = 206: 3239020 Merge branch 'nano-server'
207: c85af17 = 207: 7ac8fc5 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
208: 901a9e6 = 208: 71be0b5 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
209: 397caab = 209: c977773 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
210: a3e8102 = 210: e3207a7 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
211: 728006e = 211: 933d5bb Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
212: 08e12b1 = 212: 1b28a5b Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
213: e753c7b = 213: 1cec3e6 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
214: f926bb2 = 214: c8812d1 Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)215: 1a8284e = 215: 3ce2a11 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
216: 846ea6e = 216: a8b9d3e Merge branch 'reftable-vs-custom-allocators'
217: 84af565 = 217: 3358ba5 Merge branch 'check-whitespace-only-downstream'
218: 37f5c75 = 218: 46ca4b3 t/t5571-prep-push-hook.sh: Add test with writing to stderr (t/t5571-prep-push-hook.sh: Add test with writing to stderr git#6063)
219: 4bc926c = 219: 6a4b075 Merge branch 'disallow-ntlm-auth-by-default'
220: 97be08e = 220: f200e68 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)221: 9c81437 = 221: a099207 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
222: 9e6f576 = 222: a08e65d http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
223: 34776a6 = 223: 6b78d6b entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
224: 1241cc4 = 224: a0b5709 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)225: a31b6bc = 225: 1ebbc93 Merge branch 'msys2'
226: 008454e = 226: 9dcbe5e Merge 'docker-volumes-are-no-symlinks'
227: 6f04fab = 227: 575b2e3 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
228: 658cd10 = 228: 305bc88 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
229: 8c36901 = 229: cf7b493 Merge branch 'dont-clean-junctions'
230: 294ce86 = 230: 2296000 Merge branch 'wsl-file-mode-bits'
231: 291fd9f = 231: 36559d1 Merge branch 'validate-dotgit'
232: 2097ea2 = 232: 4d8f8b4 Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
233: c81e800 = 233: 0a791c8 Support loose 4GB+ objects (Support loose 4GB+ objects git#6353)
234: 57d88bc = 234: a313cc7 Merge branch 'skip-rust-in-the-coverity-builds'
235: e5a32c9 = 235: 9dbbf35 Merge branch 'ready-for-upstream'
236: bcfb69e = 236: 4209fb1 Win32: make FILETIME conversion functions public
237: bfa3428 = 237: 91b9be7 Win32: dirent.c: Move opendir down
238: 74f6b0e = 238: a21191f mingw: make the dirent implementation pluggable
239: 5f5c749 = 239: b935086 Win32: make the lstat implementation pluggable
240: cc29b94 = 240: 7a9120c mingw: add infrastructure for read-only file system level caches
245: 7f8a206 = 241: b71bd75 git-gui--askyesno: fix funny text wrapping
241: 723ef84 = 242: 3689cfa mingw: add a cache below mingw's lstat and dirent implementations
247: 4fbe2e6 = 243: 963dfbd git-gui--askyesno (mingw): use Git for Windows' icon, if available
242: 8c24ed8 = 244: 5248512 fscache: load directories only once
243: 160420b = 245: d3a21c6 fscache: add key for GIT_TRACE_FSCACHE
244: 0b239a3 = 246: 3d0185b fscache: remember not-found directories
246: 235a237 = 247: 9f75674 fscache: add a test for the dir-not-found optimization
248: 326f99b = 248: e544c2d add: use preload-index and fscache for performance
249: e7930d6 = 249: a023353 dir.c: make add_excludes aware of fscache during status
250: 7863015 = 250: e8c1596 fscache: make fscache_enabled() public
251: 2a4b3a1 = 251: a2d28f9 dir.c: regression fix for add_excludes with fscache
252: 0fd7dbb = 252: 60aa66f fetch-pack.c: enable fscache for stats under .git/objects
253: 18952b7 ! 253: f1bab55 checkout.c: enable fscache for checkout again
254: 2bb40f2 = 254: c311edf Enable the filesystem cache (fscache) in refresh_index().
255: 9eedd47 = 255: d35a5bb fscache: use FindFirstFileExW to avoid retrieving the short name
256: bfa1ea9 = 256: ee8f837 fscache: add GIT_TEST_FSCACHE support
257: a2ca8c9 = 257: 2c6628f fscache: add fscache hit statistics
258: eb0d01c = 258: a27f89f unpack-trees: enable fscache for sparse-checkout
259: de8f3a0 = 259: b0c526e status: disable and free fscache at the end of the status command
260: 4b356b6 = 260: 87e0afb mem_pool: add GIT_TRACE_MEMPOOL support
261: 4759689 ! 261: c8f71ec fscache: fscache takes an initial size
262: 2e5fbf0 = 262: 95db1bf fscache: update fscache to be thread specific instead of global
263: aa41a45 = 263: e172c21 fscache: teach fscache to use mempool
264: 3da1fb0 = 264: 7e3ae1b fscache: make fscache_enable() thread safe
265: 5720676 = 265: cb67314 fscache: teach fscache to use NtQueryDirectoryFile
266: 8cfc75e = 266: cbb3beb fscache: remember the reparse tag for each entry
267: 7a1cbf0 = 267: 287dfe1 fscache: Windows Docker volumes are not symbolic links
268: 724f108 = 268: 254635e fscache: optionally enable wsl compability file mode bits
269: f277d15 = 269: 857f2df fscache: implement an FSCache-aware is_mount_point()
270: 81ee96c = 270: dd6de2e clean: make use of FSCache
271: 5a63e31 = 271: 7ca693c Merge branch 'fscache'
272: 9b43e0a = 272: 3bdd056 compat/poll: do not collect more handles than the wait supports
273: e32e014 = 273: 6fbbdc1 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
274: 06c0068 = 274: 96cff9c parallel-checkout: limit worker count to what poll() can wait on
275: 54a43c6 = 275: f46d182 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
276: d4a3a39 = 276: 18cc04d run-command: limit concurrent children to what poll() can wait on
277: 12b8f8e = 277: 80d2c1c Merge branch 'dont-clean-junctions-fscache'
278: b21a109 = 278: 849db00 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)
279: 94ff0b3 = 279: ca481e4 pack-objects (mingw): demonstrate a segmentation fault with large deltas
280: 19ea260 = 280: eb230c2 mingw: support long paths
281: b984a8e = 281: 105dca0 win32(long path support): leave drive-less absolute paths intact
282: 39805cb = 282: a06d3ef compat/fsmonitor/fsm-*-win32: support long paths
283: e91e621 = 283: 90b9219 clean: suggest using
core.longPathsif paths are too long to remove284: 672a630 = 284: 63e5705 mingw: explicitly specify with which cmd to prefix the cmdline
285: 549d726 = 285: 723ca10 mingw: when path_lookup() failed, try BusyBox
286: bd449a0 = 286: f111bd2 test-tool: learn to act as a drop-in replacement for
iconv287: 305ccee = 287: 66e1c64 tests(mingw): if
iconvis unavailable, usetest-helper --iconv288: f0d6f99 = 288: de89adb gitattributes: mark .png files as binary
289: 5001358 = 289: b8fb12b tests: move test PNGs into t/lib-diff/
290: 51c5d9f = 290: c26ae2c tests: only override sort & find if there are usable ones in /usr/bin/
291: d81a4e7 = 291: c027c2d tests: use the correct path separator with BusyBox
292: 005a41a = 292: 27b2e3e mingw: only use Bash-ism
builtin pwd -Wwhen available293: 9081d05 = 293: e6f6416 tests (mingw): remove Bash-specific pwd option
294: e94cbde = 294: f4b0456 test-lib: add BUSYBOX prerequisite
295: cb9a516 = 295: ec8014d t5003: use binary file from t/lib-diff/
296: 4a1abc6 = 296: fc66a9a t5532: workaround for BusyBox on Windows
297: 70f24cf = 297: 59ebf93 t5605: special-case hardlink test for BusyBox-w32
298: c699d2d = 298: 2ef34fc t5813: allow for $PWD to be a Windows path
299: fe0c20e = 299: 0b07e2b t9200: skip tests when $PWD contains a colon
301: 3edc30e = 300: dd0721b Describe Git for Windows' architecture
302: c5cb0f7 = 301: f8da275 Add an AGENTS.md file to help with AI-assisted debugging/development
303: 58bb056 = 302: 50d92c7 Modify the Code of Conduct for Git for Windows
304: 7c55a58 = 303: 376b092 Merge branch 'gitk-and-git-gui-patches'
305: 89fb8f4 = 304: b33f645 CONTRIBUTING.md: add guide for first-time contributors
306: 9e3b30c = 305: 2ddb972 Merge branch 'long-paths'
307: 08cb995 = 306: 84defa2 README.md: Add a Windows-specific preamble
300: 77ca956 = 307: 93df1dd Partially un-revert "editor: save and reset terminal after calling EDITOR"
308: 9ba7c4d = 308: 45dc645 Merge branch 'busybox-w32'
309: eaacbe8 = 309: 9098266 Add an issue template
310: d850b82 = 310: 96a2f16 reset: reinstate support for the deprecated --stdin option
311: ee777ec = 311: bd76d6e Merge branch 'un-revert-editor-save-and-reset'
312: c0c4099 = 312: 2374dbf Modify the GitHub Pull Request template (to reflect Git for Windows)
313: a8dcc58 = 313: 24d5386 Add a GitHub workflow to monitor component updates
314: 8df5434 = 314: 328b170 fsmonitor: reintroduce core.useBuiltinFSMonitor
315: ab00a7f = 315: 1f41436 Merge branch 'phase-out-reset-stdin'
316: d872cfe = 316: 981c7ef SECURITY.md: document Git for Windows' policies
317: f6a7dd9 = 317: c753c16 dependabot: help keeping GitHub Actions versions up to date
318: 1b47072 = 318: 25c659b Merge branch 'deprecate-core.useBuiltinFSMonitor'
319: f6ed4c2 = 319: 8a67030 ci: only run the expensive tests in the Windows tests for now
320: 55ddd90 = 320: de32481 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
321: 0b0f506 = 321: e8c8f95 Merge 'readme' into HEAD
322: c6b6782 = 322: 27a02e3 mingw: let
access()handlenulwhether lower-case or not323: 9aed575 = 323: 40d5d40 Allow
GIT_CONFIG_GLOBALto be set toNUL(all upper-case) (AllowGIT_CONFIG_GLOBALto be set toNUL(all upper-case) git#6450)324: 225297a = 324: b2d0e4f ci: bump actions/setup-python from 6 to 7