Rebase shears/next (#36373233356) - #487
Open
gitforwindowshelper[bot] wants to merge 319 commits into
Open
gitforwindowshelper[bot] wants to merge 319 commits into
gitforwindowshelper[bot] wants to merge 319 commits into
Conversation
By default, the buffer type of Windows' `stdout` is unbuffered (_IONBF), and there is no need to manually fflush `stdout`. But some programs, such as the Windows Filtering Platform driver provided by the security software, may change the buffer type of `stdout` to full buffering. This nees `fflush(stdout)` to be called manually, otherwise there will be no output to `stdout`. Signed-off-by: MinarKotonoha <chengzhuo5@qq.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A long time ago, we decided to run tests in Git for Windows' SDK with the default `winsymlinks` mode: copying instead of linking. This is still the default mode of MSYS2 to this day. However, this is not how most users run Git for Windows: As the majority of Git for Windows' users seem to be on Windows 10 and newer, likely having enabled Developer Mode (which allows creating symbolic links without administrator privileges), they will run with symlink support enabled. This is the reason why it is crucial to get the fixes for CVE-2024-? to the users, and also why it is crucial to ensure that the test suite exercises the related test cases. This commit ensures the latter. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Start work on a new 'git survey' command to scan the repository for monorepo performance and scaling problems. The goal is to measure the various known "dimensions of scale" and serve as a foundation for adding additional measurements as we learn more about Git monorepo scaling problems. The initial goal is to complement the scanning and analysis performed by the GO-based 'git-sizer' (https://github.com/github/git-sizer) tool. It is hoped that by creating a builtin command, we may be able to take advantage of internal Git data structures and code that is not accessible from GO to gain further insight into potential scaling problems. Co-authored-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
By default we will scan all references in "refs/heads/", "refs/tags/" and "refs/remotes/". Add command line opts let the use ask for all refs or a subset of them and to include a detached HEAD. Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
When 'git survey' provides information to the user, this will be presented in one of two formats: plaintext and JSON. The JSON implementation will be delayed until the functionality is complete for the plaintext format. The most important parts of the plaintext format are headers specifying the different sections of the report and tables providing concreted data. Create a custom table data structure that allows specifying a list of strings for the row values. When printing the table, check each column for the maximum width so we can create a table of the correct size from the start. The table structure is designed to be flexible to the different kinds of output that will be implemented in future changes. Signed-off-by: Derrick Stolee <stolee@gmail.com>
Continue the size_t evacuation around large object handling: with deflate_it() and the locals around it widened, the cast_size_t_to_ulong() shim the prior delta_delta() widening had to leave behind in emit_binary_diff_body() goes away. deflate_it() is file-static; the only callers are the two in emit_binary_diff_body() already touched here. emit_diff_symbol() formats the resulting sizes via uintmax_t / %"PRIuMAX", so the diff output is not affected; only the per-process upper bound on a binary patch chunk that this function can address grows beyond 4 GiB on Windows. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
At the moment, nothing is obvious about the reason for the use of the
path-walk API, but this will become more prevelant in future iterations. For
now, use the path-walk API to sum up the counts of each kind of object.
For example, this is the reachable object summary output for my local repo:
REACHABLE OBJECT SUMMARY
========================
Object Type | Count
------------+-------
Tags | 1343
Commits | 179344
Trees | 314350
Blobs | 184030
Signed-off-by: Derrick Stolee <stolee@gmail.com>
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>
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>
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>
Continue the size_t evacuation. read_blob_data_from_index() reads the blob through the size_t odb_read_object() API but writes the size back through an unsigned long out-parameter, silently truncating anything past 4 GiB on Windows. Widen the out-parameter, drop the cast_size_t_to_ulong() shim, and move the matching locals in the two convert.c callers and the one in attr.c. Their downstream consumers (gather_convert_stats() widened in the prior commit and read_attr_from_buf() already size_t) take the new type directly. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
`git survey` distinguishes itself from `git repo structure` largely by its path-level reporting: in addition to whole-repo totals it lists the paths whose object histories dominate the repository, ranked by raw count, on-disk size, and inflated size, separately for trees and blobs. That is often the most actionable output from `git survey`, since it points an operator at the directories and files that should be reviewed for cleanup, sparse-checkout exclusion, or rewriting. `git repo structure` already drives the same path-walk traversal that `git survey` uses to gather its per-path numbers; the callback simply discards the path. Aggregate per-(path, type) summaries inside that existing callback and add a bounded, descending-sorted "top-N" table keyed by each of the three axes. Gate the feature behind a new `--top=<n>` option, defaulting to 0, so unadorned invocations are unaffected and pay no extra work for the top-N tracking. Mirror the sort and eviction strategy from `builtin/survey.c`: keep an array of at most N entries sorted from largest to smallest, walk it from the bottom on each candidate, and shift entries down when a new one belongs. Compared to `builtin/survey.c`, drop the void-pointer indirection in the table data, type the comparator's arguments, and fold the trivial comparators into the `(a > b) - (a < b)` idiom. For the human-readable `table` output, extend the existing nested bullet layout with two new top-level sections, `* Top trees` and `* Top blobs`, each containing three sub-tables (`Top by count`, `Top by disk size`, `Top by inflated size`). The path becomes the row name and the relevant scalar becomes the value, reusing `stats_table_count_addf` and `stats_table_size_addf` so units and column alignment match the rest of the table. For the `lines`/`nul` key-value formats, emit one `objects.<type>.top.by_<axis>.<rank>.path=<path>` entry alongside an `objects.<type>.top.by_<axis>.<rank>.<axis>=<value>` entry per ranked path, so consumers can dispatch by axis without parsing the schema. The root tree's path is the empty string as produced by the path-walk machinery; preserve that as-is to stay faithful to the upstream representation rather than fabricating a placeholder. This is the first piece of folding `git survey`'s functionality into `git repo structure`. Subsequent commits will add the corresponding configuration knob and, eventually, turn `git survey` into a thin deprecated shim over `git repo structure`. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The winsock2 library provides functions that work on different data types than file descriptors, therefore we wrap them. But that is not the only difference: they also do not set `errno` but expect the callers to enquire about errors via `WSAGetLastError()`. Let's translate that into appropriate `errno` values whenever the socket operations fail so that Git's code base does not have to change its expectations. This closes git-for-windows#2404 Helped-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Prep for the widenings of its callers, where size-receiving locals will become size_t (combine-diff's result_size in the immediately following commit, struct diff_filespec.size in a later topic). Body caps the parameter at 8000 anyway, so the type change is mechanical. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In future changes, we will make use of these methods. The intention is to keep track of the top contributors according to some metric. We don't want to store all of the entries and do a sort at the end, so track a constant-size table and remove rows that get pushed out depending on the chosen sorting algorithm. Co-authored-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by; Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
The preceding commit added `--top=<n>` to `git repo structure`,
reporting the top-N paths per type ranked by count, on-disk size, and
inflated size. Cover the three behaviors that matter for that option:
* Without `--top`, the key-value output emits no `top.*` keys, so
existing parsers stay unaffected.
* `--top=N` produces exactly N ranked entries on each of the six
`objects.<type>.top.by_<axis>` axes (count/disk_size/inflated_size
crossed with trees/blobs), and a constructed input where one blob
is several orders of magnitude bigger than the other lets us
assert the ordering on the disk-size and inflated-size axes.
* A negative `--top` is rejected with a non-zero exit and a message
naming the constraint, so a typo cannot silently degrade into the
default zero.
Avoid grep patterns starting with `--`; grep would parse the leading
double dash as an option terminator.
Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
We map WSAGetLastError() errors to errno errors in winsock_error_to_errno(), but the MSVC strerror() implementation only produces "Unknown error" for most of them. Produce some more meaningful error messages in these cases. Our builds for ARM64 link against the newer UCRT strerror() that does know these errors, so we won't change the strerror() used there. The wording of the messages is copied from glibc strerror() messages. Reported-by: M Hickford <mirth.hickford@gmail.com> Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Although NTLM authentication is considered weak (extending even to
NTLMv2, which purportedly allows brute-forcing reasonably complex
8-character passwords in a matter of days, given ample compute
resources), it _is_ one of the authentication methods supported by
libcurl.
Note: The added test case *cannot* reuse the existing `custom_auth`
facility. The reason is that that facility is backed by an NPH script
("No Parse Headers"), which does not allow handling the 3-phase NTLM
authentication correctly (in my hands, the NPH script would not even be
called upon the Type 3 message, a "200 OK" would be returned, but no
headers, let alone the `git http-backend` output as payload). Having a
separate NTLM authentication script makes the exact workings clearer and
more readable, anyway.
Co-authored-by: Matthew John Cheetham <mjcheetham@outlook.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This will come in handy in the next commit. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Bert Belder <bertbelder@gmail.com>
Smallest piece of the tree topic. link_len is only used as strbuf_splice()'s size_t length and as an array index; widening it outright removes the cast_size_t_to_ulong() shim and the bridge local that fed it. odb_read_object() now writes straight into link_len. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue the size_t evacuation. With buffer_is_binary() widened in the prior commit, every consumer that the size flows into in combine-diff.c is size_t-ready, so widen grab_blob()'s out-param outright and move the matching locals at its three call sites together. grab_blob()'s body collapses to a direct odb_read_object(&size) since the bridge variable is no longer needed. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Since we are already walking our reachable objects using the path-walk API,
let's now collect lists of the paths that contribute most to different
metrics. Specifically, we care about
* Number of versions.
* Total size on disk.
* Total inflated size (no delta or zlib compression).
This information can be critical to discovering which parts of the
repository are causing the most growth, especially on-disk size. Different
packing strategies might help compress data more efficiently, but the toal
inflated size is a representation of the raw size of all snapshots of those
paths. Even when stored efficiently on disk, that size represents how much
information must be processed to complete a command such as 'git blame'.
The exact disk size seems to be not quite robust enough for testing, as
could be seen by the `linux-musl-meson` job consistently failing, possibly
because of zlib-ng deflates differently: t8100.4(git survey
(default)) was failing with a symptom like this:
TOTAL OBJECT SIZES BY TYPE
===============================================
Object Type | Count | Disk Size | Inflated Size
------------+-------+-----------+--------------
- Commits | 10 | 1523 | 2153
+ Commits | 10 | 1528 | 2153
Trees | 10 | 495 | 1706
Blobs | 10 | 191 | 101
- Tags | 4 | 510 | 528
+ Tags | 4 | 547 | 528
This means: the disk size is unlikely something we can verify robustly.
Since zlib-ng seems to increase the disk size of the tags from 528 to
547, we cannot even assume that the disk size is always smaller than the
inflated size. We will most likely want to either skip verifying the
disk size altogether, or go for some kind of fuzzy matching, say, by
replacing `s/ 1[45][0-9][0-9] / ~1.5k /` and `s/ [45][0-9][0-9] / ~½k /`
or something like that.
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` exposes its `--top` default via `survey.top` so that a site or per-repository operator can switch the detail tables on once and have every subsequent invocation include them. Mirror that ergonomics for `git repo structure` so that, as `git survey`'s functionality is folded into `git repo structure`, the configuration side of the migration story stays equivalent. Add a small `git_config_int` callback bound to `repo.structure.top` and invoke it before `parse_options()`, so a `--top=<N>` on the command line cleanly overrides the configured default (including `--top=0` to opt out of the detail tables when configuration enables them). Reject negative configured values with the same wording as the command-line guard, since `git_config_int()` happily returns negative integers. Document the new variable in a fresh `Documentation/config/repo.adoc` and wire it into the alphabetical includes in `Documentation/config.adoc` between `repack.adoc` and `rerere.adoc`. Cover the precedence behaviour with a t1901 test: a configured value enables the tables by default, and a command-line `--top=0` suppresses them again. Note that the reported paths respect the `core.quotePath` setting. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This comment has been true for the longest time; The combination of the two preceding commits made it incorrect, so let's drop that comment. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NTLM authentication is relatively weak. This is the case even with the
default setting of modern Windows versions, where NTLMv1 and LanManager
are disabled and only NTLMv2 is enabled: NTLMv2 hashes of even
reasonably complex 8-character passwords can be broken in a matter of
days, given enough compute resources.
Even worse: On Windows, NTLM authentication uses Security Support
Provider Interface ("SSPI"), which provides the credentials without
requiring the user to type them in.
Which means that an attacker could talk an unsuspecting user into
cloning from a server that is under the attacker's control and extracts
the user's NTLMv2 hash without their knowledge.
For that reason, let's disallow NTLM authentication by default.
NTLM authentication is quite simple to set up, though, and therefore
there are still some on-prem Azure DevOps setups out there whose users
and/or automation rely on this type of authentication. To give them an
escape hatch, introduce the `http.<url>.allowNTLMAuth` config setting
that can be set to `true` to opt back into using NTLM for a specific
remote repository.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `git_terminal_prompt()` function expects the terminal window to be attached to a Win32 Console. However, this is not the case with terminal windows other than `cmd.exe`'s, e.g. with MSys2's own `mintty`. Non-cmd terminals such as `mintty` still have to have a Win32 Console to be proper console programs, but have to hide the Win32 Console to be able to provide more flexibility (such as being resizeable not only vertically but also horizontally). By writing to that Win32 Console, `git_terminal_prompt()` manages only to send the prompt to nowhere and to wait for input from a Console to which the user has no access. This commit introduces a function specifically to support `mintty` -- or other terminals that are compatible with MSys2's `/dev/tty` emulation. We use the `TERM` environment variable as an indicator for that: if the value starts with "xterm" (such as `mintty`'s "xterm_256color"), we prefer to let `xterm_prompt()` handle the user interaction. The most prominent user of `git_terminal_prompt()` is certainly `git-remote-https.exe`. It is an interesting use case because both `stdin` and `stdout` are redirected when Git calls said executable, yet it still wants to access the terminal. When running inside a `mintty`, the terminal is not accessible to the `git-remote-https.exe` program, though, because it is a MinGW program and the `mintty` terminal is not backed by a Win32 console. To solve that problem, we simply call out to the shell -- which is an *MSys2* program and can therefore access `/dev/tty`. Helped-by: nalla <nalla@hamal.uberspace.de> Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is a known issue that a rename() can fail with an "Access denied" error at times, when copying followed by deleting the original file works. Let's just fall back to that behavior. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
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>
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 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
The upstream Git project changed the guidance in 16b2924 (MyFirstContribution: recommend shallow threading of cover letters, 2026-06-15) to prefer arrangement where all cover letters are direct replies to the v1 cover letter. Update CONTRIBUTING.md to reflect that. Signed-off-by: Tuomas Ahola <taahol@utu.fi>
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: next
From: 914b75f4b9 (CONTRIBUTING.md: recommend shallow threading of cover letters (git-for-windows#6429), 2026-09-26) (1c42df7c19..914b75f4b9)
To: ddd968db65 (CONTRIBUTING.md: recommend shallow threading of cover letters (git-for-windows#6429), 2026-09-26) (9fc5968827..ddd968db65)
Statistics
Range-diff (click to expand)
1: 919758f = 1: f0b79ef unix-socket: avoid leak when initialization fails
2: e1e599a = 2: f3deeb1 grep: prevent
^$false match at end of file3: 0f793bb = 3: 03e221b Merge branch 'fixes-from-the-git-mailing-list'
4: 3a4e03d = 4: 9c54de3 t9350: point out that refs are not updated correctly
6: b7cdfe5 = 5: cb7f874 transport-helper: add trailing --
10: 4b0a048 = 6: 0d5f245 ci: bump actions/checkout from 6 to 7
11: c7e3536 = 7: 241873b remote-helper: check helper status after import/export
16: 2a1310a = 8: 1fb4202 bundle-uri: refuse advertised URIs by protocol
17: 3a433fb = 9: 4acae1d ci(coverity): bump actions/cache from 5 to 6
18: 774d86b = 10: 645c754 Always auto-gc after calling a fast-import transport
19: c411e76 = 11: 043ee4b mingw: prevent regressions with "drive-less" absolute paths
5: 147299c = 12: 2b8f130 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
8: 140f2c4 = 13: adbfe1f vcpkg_install: detect lack of Git
13: dc5413f = 14: 370a87f vcpkg_install: add comment regarding slow network connections
9: 72747fb = 15: 17d67de t5505/t5516: allow running without
.git/branches/in the templates35: e099841 = 16: 67492a6 max_tree_depth: lower it for clang builds in general on Windows
37: 0571a00 = 17: a1cc624 vcbuild: install ARM64 dependencies when building ARM64 binaries
14: fc5f912 = 18: 55352f5 t5505/t5516: fix white-space around redirectors
38: e607c0a = 19: 662d038 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
40: 3c61fbb = 20: b85b75d vcbuild: add an option to install individual 'features'
41: 93fd5a6 = 21: e5ebda3 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
43: 3905544 = 22: 9fe3b6b cmake: allow building for Windows/ARM64
44: 11d3f49 = 23: 1ce60c7 clink.pl: fix libexpatd.lib link error when using MSVC
46: b206e2c = 24: 24df9b3 ci(vs-build) also build Windows/ARM64 artifacts
47: 8439e50 = 25: d2d3d2f Makefile: clean up .ilk files when MSVC=1
49: c2f3669 = 26: 3c8ac2f vcbuild: stop hard-coding OpenSSL as a dependency
50: f62c80d = 27: 5c4dd54 vcbuild: add support for compiling Windows resource files
52: 12c7301 = 28: febcf0e cmake(): allow setting HOST_CPU for cross-compilation
53: 05e4e8b = 29: 69695c3 config.mak.uname: add git.rc to MSVC builds
54: e1c02fc = 30: 875627d MinGW: link as terminal server aware
58: 66ea82d = 31: 920a8a6 CMake: default Visual Studio generator has changed
59: 5ed6527 = 32: abe0fc9 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
60: a4f38e8 = 33: 7b1d3b4 http: optionally load libcurl lazily
7: 0c0d7ae = 34: bd015f7 mingw: demonstrate a
git addissue with NTFS junctions65: fb54207 = 35: 7802274 .gitignore: add Visual Studio CMakeSetting.json file
66: ee7ca8b = 36: eda9447 clink.pl: move default linker options for MSVC=1 builds
67: a9845a4 = 37: ad602d8 http: support lazy-loading libcurl also on Windows
12: 27e0626 = 38: 87521a6 strbuf_realpath(): use platform-dependent API if available
15: f115059 = 39: 21a840b http: use new "best effort" strategy for Secure Channel revoke checking
72: 09a844c = 40: a23ad4a subtree: update
contrib/subtreetesttarget73: e8c56b7 = 41: f8d7e54 CMakeLists: add default "x64-windows" arch for Visual Studio
74: 8b8aee1 = 42: ab952b8 setup: properly use "%(prefix)/" when in WSL
75: 0ee43ef = 43: 0893d14 Add config option
windows.appendAtomically76: c50999a = 44: 301b613 cmake: install headless-git.
77: 44c9b88 = 45: ee59c85 http: when loading libcurl lazily, allow for multiple SSL backends
20: 4793d44 = 46: c709441 transport: optionally disable side-band-64k
21: cd8781c = 47: 9310c99 mingw: fix fatal error working on mapped network drives on Windows
22: 4b9ad27 = 48: 8f33dbc clink.pl: fix MSVC compile script to handle libcurl-d.lib
23: 91b6e55 = 49: 15eb061 mingw: implement a platform-specific
strbuf_realpath()24: ccfb8e4 = 50: 078aaf8 t3701: verify that we can add lots of files interactively
25: 9033506 = 51: 00d40da commit: accept "scissors" with CR/LF line endings
26: f186fc4 = 52: 53894a7 t0014: fix indentation
27: 8bd8130 = 53: a8b7244 git-gui: accommodate for intent-to-add files
82: 80fb122 = 54: 5380a89 mingw: allow for longer paths in
parse_interpreter()83: df14bff = 55: 95780fc compat/vcbuild: document preferred way to build in Visual Studio
84: 9f960db = 56: 8d7f268 http: optionally send SSL client certificate
85: a074bc7 ! 57: 427f23e ci: run
contrib/subtreetests in CI builds86: 3234af3 = 58: d624652 CMake: show Win32 and Generator_platform build-option values
87: c6ee6e0 = 59: e410e97 compat/mingw.c: do not warn when failing to get owner
88: 33ab9fe = 60: a8bfc5c mingw: $env:TERM="xterm-256color" for newer OSes
89: d976968 = 61: 692ae79 winansi: check result and Buffer before using Name
90: 5161e28 = 62: 870f6d5 mingw: change core.fsyncObjectFiles = 1 by default
91: c07418c = 63: 83184ac Fix Windows version resources
92: d94e46f = 64: 3fdff33 status: fix for old-style submodules with commondir
93: 22d79eb = 65: d01d11b git.rc: include winuser.h
94: bb9407e = 66: 545450c mingw: do load libcurl dynamically by default
95: f3fe948 = 67: 778e324 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
96: 3850f9f = 68: 5d8273b mingw: suggest
windows.appendAtomicallyin more cases97: e009888 = 69: 03f58a6 win32: use native ANSI sequence processing, if possible
98: 854c0c2 = 70: b11c9ed common-main.c: fflush stdout buffer upon exit
99: 80b9935 = 71: 57b19ee t5601/t7406(mingw): do run tests with symlink support
28: 1898d0c = 72: 09170e9 revision: create mark_trees_uninteresting_dense()
29: 37ab52b = 73: ffc7eaa survey: stub in new experimental 'git-survey' command
30: 3eeddb5 = 74: e40c721 survey: add command line opts to select references
31: 64c27a0 = 75: 641a8fd survey: start pretty printing data in table form
32: 9dafa43 = 76: c7801eb survey: add object count summary
33: 427e112 = 77: 3172000 survey: summarize total sizes by object type
34: 76a4293 = 78: da2ef3c survey: show progress during object walk
36: 606af40 = 79: d98922b survey: add ability to track prioritized lists
39: 406775e = 80: 8a28f7f survey: add report of "largest" paths
42: ad22d3d = 81: 2b20ca0 survey: add --top= option and config
64: 01f9e11 = 82: e410eb2 mingw: Support
git_terminal_promptwith more terminals45: f405161 = 83: 7b2f20f survey: clearly note the experimental nature in the output
71: cc8fd81 = 84: f7064f5 compat/terminal.c: only use the Windows console if bash 'read -r' fails
111: 43c9db6 = 85: 28aba77 diff: stop truncating the deflated-binary-diff size on Windows
48: c41f03a = 86: 5913738 repo: split annotated tags out from total tag count in structure
81: 4995b18 = 87: 0f815f7 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
112: 3b83cef = 88: 4cdc96c convert: widen gather_convert_stats() helpers to size_t
51: 9e436fb = 89: 728b09c repo: filter the structure scope via --ref-filter=
146: 9ffc6be = 90: deb217c Win32: symlink: move phantom symlink creation to a separate function
113: eda01dd = 91: c0330f9 read-cache: stop truncating index blob sizes on Windows
55: ca9ac6f = 92: 908939e repo: report top-N paths by count, disk, and inflated size in structure
56: b5d543b = 93: fe9498b mingw: make sure
errnois set correctly when socket operations fail57: 489eaea = 94: 5c6b08c t5563: verify that NTLM authentication works
149: f8c138d = 95: 388f57f mingw: introduce code to detect whether we're inside a Windows container
150: 5c5b77c = 96: 9edecaa Introduce helper to create symlinks that knows about index_state
114: eabcdd5 = 97: 72cbd25 xdiff-interface: widen buffer_is_binary() size parameter to size_t
61: 3d03fc6 = 98: 8e0d02a t1901: cover the --top option of
git repo structure62: 24d4421 = 99: 8169726 compat/mingw: handle WSA errors in strerror
63: b3fd875 = 100: 93bd14f http: disallow NTLM authentication by default
152: b88f15e = 101: e61b900 mingw: when running in a Windows container, try to rename() harder
153: c57348e = 102: c479e19 mingw: allow to specify the symlink type in .gitattributes
115: 05d4458 = 103: 5f3c8d9 tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
116: 45c9021 = 104: 0d658f5 combine-diff: stop truncating combined-diff blob sizes on Windows
68: b5feaf4 = 105: 10b9160 repo: read the
--topdefault fromrepo.structure.top69: 96df0f9 = 106: fce42d6 compat/mingw: drop outdated comment
70: b6ee6ff = 107: 80511b5 http: warn if might have failed because of NTLM
155: 3e226f0 = 108: 00cb26d mingw: move the file_attr_to_st_mode() function definition
156: a1e253e = 109: 6757a76 Win32: symlink: add test for
symlinkattribute117: dd96871 = 110: da7b694 tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
118: 283db9f = 111: 3d15010 diff: widen textconv_object() size out-param to size_t
78: 9c2eae3 = 112: 3047bb0 git-survey: announce the upcoming pivot into
git repo structure79: 5b31052 = 113: 6b54325 t0301: actually test credential-cache on Windows
80: e1eb0f3 = 114: 223b7e3 credential: advertise NTLM suppression and allow helpers to re-enable
158: 9486749 = 115: cf4b4d3 mingw: Windows Docker volumes are not symbolic links
159: c913947 = 116: ee41e37 clean: do not traverse mount points
119: afe56fe = 117: 74331d0 pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
121: 6179d41 = 118: 666484a pack-objects: drop the two tree-walk casts in the preferred-base path
122: c7ff5f2 = 119: 6440825 diffcore: widen struct diff_filespec.size to size_t
100: a20f719 = 120: 96b30e4 Fallback to AppData if XDG_CONFIG_HOME is unset
101: 06bdb16 = 121: 36ce531 survey: turn into a thin shim over
git repo structure102: 9d2d0b0 = 122: 4e242c2 credential-cache: handle ECONNREFUSED gracefully
103: 4ccca05 = 123: d079400 reftable: do make sure to use custom allocators
104: 3fe4efd = 124: 937d4df check-whitespace: avoid alerts about upstream commits
105: a3a2987 = 125: 15e823b t/t5571-prep-push-hook.sh: Add test with writing to stderr
106: 3aa14de = 126: 184f3b6 dir: do not traverse mount points
107: 7a3a8ba = 127: 3dcbdb2 win32: thread-utils: handle multi-socket systems
108: ef9daa3 = 128: e8a2bfe t5563: add tests for http.emptyAuth with Negotiate
109: 7cf5fba = 129: 1bdb89f entry: flush fscache after creating directories and writing files
110: b81765f = 130: c0caf18 ci(macos): skip the
git p4tests162: 9cb1e8a = 131: 4342ea6 mingw: work around rename() failing on a read-only file
163: 900377b = 132: 480c4bb clean: remove mount points when possible
164: f329d01 = 133: e6b7c41 mingw: optionally enable wsl compability file mode bits
165: 1eeec39 = 134: 5563b8a Refuse to follow invalid paths in
.gitfiles120: fb4bf97 = 135: 7a8457d Merge branch 'size-t/pack-objects-delta'
123: 46903bc = 136: 6a8a440 Merge branch 'size-t/pack-bitmap'
124: 0ba0e6b = 137: 2c976ef tree: widen struct tree.size and parse_tree_buffer() to size_t
125: cc8ed39 = 138: b8df84a Merge branch 'size-t/diff'
126: 2abc127 = 139: 02d4510 commit: widen the commit-buffer API to size_t
127: 362fd24 = 140: 0f56e8d Merge branch 'size-t/tree'
128: f199637 = 141: 1173c7d blame: widen find_line_starts() len parameter to size_t
129: 123f7b9 = 142: 133a519 Merge branch 'size-t/commit'
130: 22218a6 = 143: d270a27 grep: widen struct grep_source.size and grep_buffer() to size_t
131: 27c2663 = 144: 530d0ce Merge branch 'size-t/blame'
132: a0abb93 = 145: d8f16ab fast-export: drop the export_blob() size cast and widen anonymize_blob()
133: f6a3437 = 146: 4c297c4 Merge branch 'size-t/grep'
134: 476b116 = 147: 9dc36fd repo: drop the inflated-size cast in count_objects()
135: 7a0a05a = 148: 4174cd8 Merge branch 'size-t/fast-export'
136: 50360a2 = 149: d2a5b88 unpack-objects: widen the size-passing infrastructure to size_t
137: c2ce060 = 150: b7b6720 Merge branch 'size-t/repo'
138: a2be2f6 = 151: 68cacf6 Merge branch 'size-t/unpack-objects'
139: afe17e3 = 152: 35f78a6 Merge branch 'topic/size-t' into size-t-followups
140: 1a1e323 = 153: bdeb089 pack-objects: drop cast_size_t_to_ulong shims in get_delta()
141: bf56522 = 154: 4071a08 pack-objects: drop cast_size_t_to_ulong shims in try_delta()
142: 57b8e58 = 155: 09ba6b3 pack-objects: drop the last size shim in write_no_reuse_object()
143: eecd623 = 156: c22256e blame: widen struct blame_scoreboard.final_buf_size to size_t
161: f94483a = 157: fa87773 Merge tag 'v2.55.0.windows.4'
144: 913f8e1 = 158: 57910ba fast-import: drop the six size casts in the object-read paths
168: 083bd13 = 159: ea0ec02 Merge branch 'bump-ci-actions'
145: 30b430d = 160: 8d9493a t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
169: 5078001 = 161: 4cc8bb4 Merge 'remote-hg-prerequisites' into HEAD
147: ec88abd = 162: a5f3e75 Drop the
cast_size_t_to_ulong()helper148: 2df05a8 = 163: 04c6aad Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
170: 123f0f2 = 164: 0596f41 Merge branch 'drive-prefix'
151: 3accd7f = 165: 2b99d14 Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
171: e763bc3 = 166: ae8a3d2 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
154: 313f929 = 167: d6ef536 mingw: handle staging 4GB+ files correctly
172: eb8ef6b = 168: e9d096d Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
157: 65be984 = 169: 6ac326a mingw: support unpacking loose 4GB+ objects
173: 69bf969 = 170: dd3cbee Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
160: 049aa11 = 171: 4151f1e t: add an expensive test to verify that 4GB+ blobs can be staged/read
174: 6b24cdc = 172: fb0c5ad Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction166: 84b88da = 173: a564600 object-file: use size_t for object size in check_object_signature()
167: 1532a62 = 174: e0d7a75 coverity: skip building with Rust, for now
175: 1eb56bf = 175: 673d730 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
176: e6faa2c = 176: e319e67 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
177: 1eac482 = 177: a555892 Merge 'add-p-many-files'
178: b135a38 = 178: 7ad47e9 Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
179: 76d40d9 = 179: 8389a2d Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
180: 6ee3719 = 180: 6f3d743 Merge 'git-gui/js/intent-to-add'
181: 2893731 = 181: 1f34ae1 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
182: 1fc24c9 = 182: 68ecca2 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
183: dc591c9 = 183: be893b3 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
184: df6d9e1 = 184: 3f88231 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path185: 3e99939 = 185: 47e6ae5 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
186: ebae8db = 186: 12c9ba0 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
187: a824942 = 187: 7e85d0f Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests188: 9e971d9 = 188: 194470a Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
189: 3a406a3 = 189: 0ceea0a Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory190: b890f91 = 190: a9975ac Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
191: bdc35c8 = 191: f735a99 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
192: d2127da = 192: 9c8cdbf Merge branch 'optionally-dont-append-atomically-on-windows'
193: 734b59f = 193: 355d218 Merge branch 'fsync-object-files-always'
194: dfa78d2 = 194: 9140827 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
195: aba05b5 = 195: e7294c5 Fix Windows version resources (Fix Windows version resources git#4092)
196: 9984ad7 = 196: fb52578 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
197: 5ba3a2f = 197: ffa9cf0 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)198: e3405d2 = 198: 4dda8ec Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283199: fd7af82 = 199: 23e452e Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
200: a677de1 = 200: 7108919 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
201: bb54e12 = 201: 1b4ac3a Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
202: bd49acc = 202: 83828ed Merge branch 'nano-server'
203: 1ac5daa = 203: 1e42209 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
204: 8cbc56a = 204: d056fbb win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
205: 226dffa = 205: 65264fe common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
206: df2cfcb = 206: b30cf31 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
207: 1da451c = 207: 893ab0c Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
208: 85d34b3 = 208: f482d6f Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
209: bfefeb2 = 209: bde438d Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
210: 7cdda0d = 210: 743bc0c Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)211: bcfbaec = 211: 69dd25f credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
212: 78fcd54 = 212: f082598 Merge branch 'reftable-vs-custom-allocators'
213: e3714f5 = 213: 2160b10 Merge branch 'check-whitespace-only-downstream'
214: 80f2973 = 214: d667227 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)
215: 6730953 = 215: 83c0938 Merge branch 'disallow-ntlm-auth-by-default'
216: eddae37 = 216: 65162d5 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)217: 1d602b6 = 217: d29eadf Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
218: cc3ed55 = 218: f3f6ac6 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
219: b21f45d = 219: 1f4e52c entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
220: d0e772b = 220: 04da18d ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)221: 62c1fbf = 221: 97d7500 Merge branch 'msys2'
222: 9a72e1f = 222: 32cbbb3 Merge 'docker-volumes-are-no-symlinks'
223: 8dc7348 = 223: f2f3f20 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
224: a01dd99 = 224: 29eb430 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
225: b716662 = 225: bacc5d3 Merge branch 'dont-clean-junctions'
226: fa79033 = 226: 4fba3db Merge branch 'wsl-file-mode-bits'
227: 5aaf052 = 227: ed90901 Merge branch 'validate-dotgit'
228: ae51f50 = 228: 15f691d Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
229: a016140 = 229: 0a7a9f0 Support loose 4GB+ objects (Support loose 4GB+ objects git#6353)
230: 82679d0 = 230: b12fa5a Merge branch 'skip-rust-in-the-coverity-builds'
231: f562538 = 231: 06a71a1 Merge branch 'ready-for-upstream'
232: 23c0f46 = 232: 25f3fb6 Win32: make FILETIME conversion functions public
233: 3a88464 = 233: d9e4993 Win32: dirent.c: Move opendir down
234: 50557fc = 234: 8c415cf mingw: make the dirent implementation pluggable
235: 1fdc834 = 235: 6a219b6 Win32: make the lstat implementation pluggable
236: 6148c33 = 236: 47e92a1 mingw: add infrastructure for read-only file system level caches
237: 64eef9b = 237: 44762ea mingw: add a cache below mingw's lstat and dirent implementations
238: 0d2acd8 = 238: 8797396 fscache: load directories only once
239: 07ba61b = 239: 130089d fscache: add key for GIT_TRACE_FSCACHE
240: 6339354 = 240: fea7b5c fscache: remember not-found directories
241: 38129ba = 241: 6dc9ff5 fscache: add a test for the dir-not-found optimization
242: 1e683fb = 242: 9051a70 add: use preload-index and fscache for performance
243: dae70e9 = 243: 97ed98e dir.c: make add_excludes aware of fscache during status
267: c11d491 = 244: f8933af git-gui--askyesno: fix funny text wrapping
244: 57c1bd3 = 245: f45e709 fscache: make fscache_enabled() public
269: 6bca9ce = 246: e4848fe git-gui--askyesno (mingw): use Git for Windows' icon, if available
245: 0a38fd9 = 247: 548abb7 dir.c: regression fix for add_excludes with fscache
246: c7242b9 = 248: 6ee4aec fetch-pack.c: enable fscache for stats under .git/objects
247: e59348b = 249: 3570a00 checkout.c: enable fscache for checkout again
248: 8d4419f = 250: 2322ba3 Enable the filesystem cache (fscache) in refresh_index().
249: 8e67b73 = 251: b2625a0 fscache: use FindFirstFileExW to avoid retrieving the short name
250: c9240ef = 252: b344808 fscache: add GIT_TEST_FSCACHE support
251: 8706c8c = 253: 56433b4 fscache: add fscache hit statistics
252: 188f1fc = 254: 8d357df unpack-trees: enable fscache for sparse-checkout
253: 646d6bb = 255: 81e14f3 status: disable and free fscache at the end of the status command
254: 63cf1cb = 256: 0d167ff mem_pool: add GIT_TRACE_MEMPOOL support
255: 9e543ca = 257: 9aa128b fscache: fscache takes an initial size
256: aebc6ec = 258: 63654c1 fscache: update fscache to be thread specific instead of global
257: 7e928a4 = 259: d9d5f3c fscache: teach fscache to use mempool
258: e6041b1 = 260: a72a943 fscache: make fscache_enable() thread safe
259: 2279d69 = 261: 1380b6d fscache: teach fscache to use NtQueryDirectoryFile
260: ab44b73 = 262: 2b2d704 fscache: remember the reparse tag for each entry
261: 082e016 = 263: c5005b3 fscache: Windows Docker volumes are not symbolic links
262: c0c201b = 264: e1fb80f fscache: optionally enable wsl compability file mode bits
263: f87e928 = 265: 55f7d7e fscache: implement an FSCache-aware is_mount_point()
264: 02d596f = 266: a918e52 clean: make use of FSCache
270: 646cecc = 267: 31e216a Merge branch 'fscache'
265: 932830d = 268: 07027d8 compat/poll: do not collect more handles than the wait supports
271: 848cd41 = 269: 4aa962f Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
266: c216cca = 270: 032f3eb parallel-checkout: limit worker count to what poll() can wait on
272: a0ae9db = 271: 720215f Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
268: a1d894a = 272: 23f57cb run-command: limit concurrent children to what poll() can wait on
273: 1c7c398 = 273: 068578f Merge branch 'dont-clean-junctions-fscache'
274: fab8229 = 274: bc9a17b 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)
275: 9ba2c48 = 275: b6a2546 pack-objects (mingw): demonstrate a segmentation fault with large deltas
276: 1864745 = 276: 368d10c mingw: support long paths
277: 7fd9f68 = 277: ab14679 win32(long path support): leave drive-less absolute paths intact
278: bd9bf4a = 278: 8e65777 compat/fsmonitor/fsm-*-win32: support long paths
279: ba17edc = 279: 595bdd0 clean: suggest using
core.longPathsif paths are too long to remove280: 5246802 = 280: 780763f mingw: explicitly specify with which cmd to prefix the cmdline
281: 4718967 = 281: e53f239 mingw: when path_lookup() failed, try BusyBox
282: 5d5f7a6 = 282: 1ddd424 test-tool: learn to act as a drop-in replacement for
iconv283: 120d2ca = 283: 15c5f1e tests(mingw): if
iconvis unavailable, usetest-helper --iconv284: 7a8fcb9 = 284: 80159fd gitattributes: mark .png files as binary
285: 1eee4b0 = 285: cfce4dc tests: move test PNGs into t/lib-diff/
286: 932f945 = 286: 45ce4e7 tests: only override sort & find if there are usable ones in /usr/bin/
287: ef93cc7 = 287: 377e774 tests: use the correct path separator with BusyBox
288: 490a213 = 288: 48394b5 mingw: only use Bash-ism
builtin pwd -Wwhen available289: c84ed71 = 289: f26670d tests (mingw): remove Bash-specific pwd option
290: 594a659 = 290: 5aab1d6 test-lib: add BUSYBOX prerequisite
291: 4dfd210 = 291: 122ed7b t5003: use binary file from t/lib-diff/
292: dd2dbc4 = 292: b593608 t5532: workaround for BusyBox on Windows
293: 137befb = 293: 765d26c t5605: special-case hardlink test for BusyBox-w32
294: 1d9b81c = 294: 294bad0 t5813: allow for $PWD to be a Windows path
295: 8a49544 = 295: e00e9cc t9200: skip tests when $PWD contains a colon
296: f4cf373 = 296: 1c9c95c Describe Git for Windows' architecture
309: d3b6d50 = 297: 7c462b9 Add a GitHub workflow to monitor component updates
297: e6973c5 = 298: 09f0494 Add an AGENTS.md file to help with AI-assisted debugging/development
303: 2809837 = 299: e28d070 Partially un-revert "editor: save and reset terminal after calling EDITOR"
306: e50e191 = 300: 56f765e reset: reinstate support for the deprecated --stdin option
310: 12c2848 = 301: dac85d1 fsmonitor: reintroduce core.useBuiltinFSMonitor
313: 47ad18e = 302: 01edab6 dependabot: help keeping GitHub Actions versions up to date
298: ff1662a = 303: 7f3110f Modify the Code of Conduct for Git for Windows
299: 12f9988 = 304: dc19773 Merge branch 'gitk-and-git-gui-patches'
300: 158bedd = 305: 03f417d CONTRIBUTING.md: add guide for first-time contributors
301: bf3bd86 = 306: f2ab84e Merge branch 'long-paths'
302: 4ffae2f = 307: 17523b5 README.md: Add a Windows-specific preamble
304: fc2bc5d = 308: 564a99e Merge branch 'busybox-w32'
305: ecc44cc = 309: faa66d1 Add an issue template
307: ac653bc = 310: 46ff009 Merge branch 'un-revert-editor-save-and-reset'
308: 2b51d97 = 311: cff00d0 Modify the GitHub Pull Request template (to reflect Git for Windows)
311: 7f18d32 = 312: 773f94e Merge branch 'phase-out-reset-stdin'
312: 4c0287e = 313: 2fe49d1 SECURITY.md: document Git for Windows' policies
314: 4048f8e = 314: 4027540 Merge branch 'deprecate-core.useBuiltinFSMonitor'
315: 093649b = 315: 26d52a9 ci: only run the expensive tests in the Windows tests for now
316: f7f417e = 316: 4597d73 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
317: 62e66a8 = 317: c2d77df Merge 'readme' into HEAD
-: ---------- > 318: 10692d6 fixup! CONTRIBUTING.md: add guide for first-time contributors
-: ---------- > 319: ddd968d CONTRIBUTING.md: recommend shallow threading of cover letters (CONTRIBUTING.md: recommend shallow threading of cover letters git#6429)