Rebase shears/next (#36494956103) - #490
Open
gitforwindowshelper[bot] wants to merge 321 commits into
Open
gitforwindowshelper[bot] wants to merge 321 commits into
gitforwindowshelper[bot] wants to merge 321 commits into
Conversation
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>
Continue the size_t evacuation. With buffer_is_binary() widened in the prior commit, every consumer that the size flows into in combine-diff.c is size_t-ready, so widen grab_blob()'s out-param outright and move the matching locals at its three call sites together. grab_blob()'s body collapses to a direct odb_read_object(&size) since the bridge variable is no longer needed. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Since we are already walking our reachable objects using the path-walk API,
let's now collect lists of the paths that contribute most to different
metrics. Specifically, we care about
* Number of versions.
* Total size on disk.
* Total inflated size (no delta or zlib compression).
This information can be critical to discovering which parts of the
repository are causing the most growth, especially on-disk size. Different
packing strategies might help compress data more efficiently, but the toal
inflated size is a representation of the raw size of all snapshots of those
paths. Even when stored efficiently on disk, that size represents how much
information must be processed to complete a command such as 'git blame'.
The exact disk size seems to be not quite robust enough for testing, as
could be seen by the `linux-musl-meson` job consistently failing, possibly
because of zlib-ng deflates differently: t8100.4(git survey
(default)) was failing with a symptom like this:
TOTAL OBJECT SIZES BY TYPE
===============================================
Object Type | Count | Disk Size | Inflated Size
------------+-------+-----------+--------------
- Commits | 10 | 1523 | 2153
+ Commits | 10 | 1528 | 2153
Trees | 10 | 495 | 1706
Blobs | 10 | 191 | 101
- Tags | 4 | 510 | 528
+ Tags | 4 | 547 | 528
This means: the disk size is unlikely something we can verify robustly.
Since zlib-ng seems to increase the disk size of the tags from 528 to
547, we cannot even assume that the disk size is always smaller than the
inflated size. We will most likely want to either skip verifying the
disk size altogether, or go for some kind of fuzzy matching, say, by
replacing `s/ 1[45][0-9][0-9] / ~1.5k /` and `s/ [45][0-9][0-9] / ~½k /`
or something like that.
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` exposes its `--top` default via `survey.top` so that a site or per-repository operator can switch the detail tables on once and have every subsequent invocation include them. Mirror that ergonomics for `git repo structure` so that, as `git survey`'s functionality is folded into `git repo structure`, the configuration side of the migration story stays equivalent. Add a small `git_config_int` callback bound to `repo.structure.top` and invoke it before `parse_options()`, so a `--top=<N>` on the command line cleanly overrides the configured default (including `--top=0` to opt out of the detail tables when configuration enables them). Reject negative configured values with the same wording as the command-line guard, since `git_config_int()` happily returns negative integers. Document the new variable in a fresh `Documentation/config/repo.adoc` and wire it into the alphabetical includes in `Documentation/config.adoc` between `repack.adoc` and `rerere.adoc`. Cover the precedence behaviour with a t1901 test: a configured value enables the tables by default, and a command-line `--top=0` suppresses them again. Note that the reported paths respect the `core.quotePath` setting. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This comment has been true for the longest time; The combination of the two preceding commits made it incorrect, so let's drop that comment. Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NTLM authentication is relatively weak. This is the case even with the
default setting of modern Windows versions, where NTLMv1 and LanManager
are disabled and only NTLMv2 is enabled: NTLMv2 hashes of even
reasonably complex 8-character passwords can be broken in a matter of
days, given enough compute resources.
Even worse: On Windows, NTLM authentication uses Security Support
Provider Interface ("SSPI"), which provides the credentials without
requiring the user to type them in.
Which means that an attacker could talk an unsuspecting user into
cloning from a server that is under the attacker's control and extracts
the user's NTLMv2 hash without their knowledge.
For that reason, let's disallow NTLM authentication by default.
NTLM authentication is quite simple to set up, though, and therefore
there are still some on-prem Azure DevOps setups out there whose users
and/or automation rely on this type of authentication. To give them an
escape hatch, introduce the `http.<url>.allowNTLMAuth` config setting
that can be set to `true` to opt back into using NTLM for a specific
remote repository.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `git_terminal_prompt()` function expects the terminal window to be attached to a Win32 Console. However, this is not the case with terminal windows other than `cmd.exe`'s, e.g. with MSys2's own `mintty`. Non-cmd terminals such as `mintty` still have to have a Win32 Console to be proper console programs, but have to hide the Win32 Console to be able to provide more flexibility (such as being resizeable not only vertically but also horizontally). By writing to that Win32 Console, `git_terminal_prompt()` manages only to send the prompt to nowhere and to wait for input from a Console to which the user has no access. This commit introduces a function specifically to support `mintty` -- or other terminals that are compatible with MSys2's `/dev/tty` emulation. We use the `TERM` environment variable as an indicator for that: if the value starts with "xterm" (such as `mintty`'s "xterm_256color"), we prefer to let `xterm_prompt()` handle the user interaction. The most prominent user of `git_terminal_prompt()` is certainly `git-remote-https.exe`. It is an interesting use case because both `stdin` and `stdout` are redirected when Git calls said executable, yet it still wants to access the terminal. When running inside a `mintty`, the terminal is not accessible to the `git-remote-https.exe` program, though, because it is a MinGW program and the `mintty` terminal is not backed by a Win32 console. To solve that problem, we simply call out to the shell -- which is an *MSys2* program and can therefore access `/dev/tty`. Helped-by: nalla <nalla@hamal.uberspace.de> Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is a known issue that a rename() can fail with an "Access denied" error at times, when copying followed by deleting the original file works. Let's just fall back to that behavior. Signed-off-by: JiSeop Moon <zcube@zcube.kr> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, symbolic links actually have a type depending on the target: it can be a file or a directory. In certain circumstances, this poses problems, e.g. when a symbolic link is supposed to point into a submodule that is not checked out, so there is no way for Git to auto-detect the type. To help with that, we will add support over the course of the next commits to specify that symlink type via the Git attributes. This requires an index_state, though, something that Git for Windows' `symlink()` replacement cannot know about because the function signature is defined by the POSIX standard and not ours to change. So let's introduce a helper function to create symbolic links that *does* know about the index_state. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue the size_t evacuation. textconv_object() fills its out-parameter from fill_textconv()'s size_t return through an unsigned long*; widen the API to match, then take advantage of the new shape where callers can. cat-file's 'c' and batch-mode 'c' branches lose their size_ul bridge variables (one site becomes a direct call, the other collapses an if/else into a single negated condition that reads as "try textconv, fall back to a raw read"). blame.c likewise drops the file_size_st bridge in fill_origin_blob() and hoists final_buf_size_st to bracket both branches in setup_scoreboard(). The latter keeps a cast_size_t_to_ulong() shim because struct blame_scoreboard.final_buf_size is still unsigned long; that field is its own topic. log.c just widens its local from unsigned long to size_t. 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>
There is a problem in the way 9ac3f0e (pack-objects: fix performance issues on packing large deltas, 2018-07-22) initializes that mutex in the `packing_data` struct. The problem manifests in a segmentation fault on Windows, when a mutex (AKA critical section) is accessed without being initialized. (With pthreads, you apparently do not really have to initialize them?) This was reported in git-for-windows#1839. Signed-off-by: Doug Kelly <dougk.ff7@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
At some stage, t5003-archive-zip wants to add a file that is not ASCII. To that end, it uses /bin/sh. But that file may actually not exist (it is too easy to forget that not all the world is Unix/Linux...)! Besides, we already have perfectly fine binary files intended for use solely by the tests. So let's use one of them instead. 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>
Windows paths are typically limited to MAX_PATH = 260 characters, even
though the underlying NTFS file system supports paths up to 32,767 chars.
This limitation is also evident in Windows Explorer, cmd.exe and many
other applications (including IDEs).
Particularly annoying is that most Windows APIs return bogus error codes
if a relative path only barely exceeds MAX_PATH in conjunction with the
current directory, e.g. ERROR_PATH_NOT_FOUND / ENOENT instead of the
infinitely more helpful ERROR_FILENAME_EXCED_RANGE / ENAMETOOLONG.
Many Windows wide char APIs support longer than MAX_PATH paths through the
file namespace prefix ('\\?\' or '\\?\UNC\') followed by an absolute path.
Notable exceptions include functions dealing with executables and the
current directory (CreateProcess, LoadLibrary, Get/SetCurrentDirectory) as
well as the entire shell API (ShellExecute, SHGetSpecialFolderPath...).
Introduce a handle_long_path function to check the length of a specified
path properly (and fail with ENAMETOOLONG), and to optionally expand long
paths using the '\\?\' file namespace prefix. Short paths will not be
modified, so we don't need to worry about device names (NUL, CON, AUX).
Contrary to MSDN docs, the GetFullPathNameW function doesn't seem to be
limited to MAX_PATH (at least not on Win7), so we can use it to do the
heavy lifting of the conversion (translate '/' to '\', eliminate '.' and
'..', and make an absolute path).
Add long path error checking to xutftowcs_path for APIs with hard MAX_PATH
limit.
Add a new MAX_LONG_PATH constant and xutftowcs_long_path function for APIs
that support long paths.
While improved error checking is always active, long paths support must be
explicitly enabled via 'core.longpaths' option. This is to prevent end
users from shooting themselves in the foot by checking out files that Windows
Explorer, cmd/bash or their favorite IDE cannot handle.
Test suite:
Test the case is when the full pathname length of a dir is close
to 260 (MAX_PATH).
Bug report and an original reproducer by Andrey Rogozhnikov:
msysgit#122 (comment)
[jes: adjusted test number to avoid conflicts, added support for
chdir(), etc]
Thanks-to: Martin W. Kirst <maki@bitkings.de>
Thanks-to: Doug Kelly <dougk.ff7@gmail.com>
Original-test-by: Andrey Rogozhnikov <rogozhnikov.andrey@gmail.com>
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Josh Soref <jsoref@gmail.com>
While it may seem super convenient to some old Unix hands to simpy require Perl to be available when running the test suite, this is a major hassle on Windows, where we want to verify that Perl is not, actually, required in a NO_PERL build. As a super ugly workaround, we "install" a script into /usr/bin/perl reading like this: #!/bin/sh # We'd much rather avoid requiring Perl altogether when testing # an installed Git. Oh well, that's why we cannot have nice # things. exec c:/git-sdk-64/usr/bin/perl.exe "$@" The problem with that is that BusyBox assumes that the #! line in a script refers to an executable, not to a script. So when it encounters the line #!/usr/bin/perl in t5532's proxy-get-cmd, it barfs. Let's help this situation by simply executing the Perl script with the "interpreter" specified explicitly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. 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>
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>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, git repositories may have extra files which need cleaned (e.g., a build directory) that may be arbitrarily deep. Suggest using `core.longPaths` if such situations are encountered. Fixes: git-for-windows#2715 Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
On Windows, the current working directory is pretty much guaranteed to contain a colon. If we feed that path to CVS, it mistakes it for a separator between host and port, though. This has not been a problem so far because Git for Windows uses MSYS2's Bash using a POSIX emulation layer that also pretends that the current directory is a Unix path (at least as long as we're in a shell script). However, that is rather limiting, as Git for Windows also explores other ports of other Unix shells. One of those is BusyBox-w32's ash, which is a native port (i.e. *not* using any POSIX emulation layer, and certainly not emulating Unix paths). So let's just detect if there is a colon in $PWD and punt in that case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
These are Git for Windows' Git GUI and gitk patches. We will have to decide at some point what to do about them, but that's a little lower priority (as Git GUI seems to be unmaintained for the time being, and the gitk maintainer keeps a very low profile on the Git mailing list, too). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Helped-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: next
From: 49d759b698 (Merge 'readme' into HEAD, 2018-06-07) (53ed4fe874..49d759b698)
To: 137c414ec9 (Merge 'readme' into HEAD, 2018-06-07) (7850fdd597..137c414ec9)
Statistics
Range-diff (click to expand)
-: ---------- > 1: 0455aa4 difftool: do not crash on a path rejected by verify_path()
1: f0b79ef = 2: a44bf61 unix-socket: avoid leak when initialization fails
-: ---------- > 3: 4ef8b38 difftool: avoid memory leak when
run_dir_diff()fails2: f3deeb1 = 4: a7ee262 grep: prevent
^$false match at end of file-: ---------- > 5: e95a36a difftool: avoid invalid memory access by an atexit handler
8: 1fb4202 = 6: 9a274dc bundle-uri: refuse advertised URIs by protocol
3: 03e221b = 7: 549faeb Merge branch 'fixes-from-the-git-mailing-list'
12: 2b8f130 = 8: 09476f8 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
13: adbfe1f = 9: 0061535 vcpkg_install: detect lack of Git
14: 370a87f = 10: e87283a vcpkg_install: add comment regarding slow network connections
15: 17d67de = 11: b05d817 t5505/t5516: allow running without
.git/branches/in the templates16: 67492a6 = 12: de2763c max_tree_depth: lower it for clang builds in general on Windows
17: a1cc624 = 13: 93257a2 vcbuild: install ARM64 dependencies when building ARM64 binaries
18: 55352f5 = 14: d39dfe4 t5505/t5516: fix white-space around redirectors
19: 662d038 = 15: 216b586 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
20: b85b75d = 16: 22eed6c vcbuild: add an option to install individual 'features'
21: e5ebda3 = 17: 141943f Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
22: 9fe3b6b = 18: 1449f58 cmake: allow building for Windows/ARM64
23: 1ce60c7 = 19: 21daa25 clink.pl: fix libexpatd.lib link error when using MSVC
24: 24df9b3 = 20: dd1c0dd ci(vs-build) also build Windows/ARM64 artifacts
25: d2d3d2f = 21: 9a4e545 Makefile: clean up .ilk files when MSVC=1
26: 3c8ac2f = 22: c8f1860 vcbuild: stop hard-coding OpenSSL as a dependency
27: 5c4dd54 = 23: 9d74252 vcbuild: add support for compiling Windows resource files
28: febcf0e = 24: f80b31e cmake(): allow setting HOST_CPU for cross-compilation
29: 69695c3 = 25: 07fb756 config.mak.uname: add git.rc to MSVC builds
4: 9c54de3 = 26: de9dc0f t9350: point out that refs are not updated correctly
31: 920a8a6 = 27: ea441d2 CMake: default Visual Studio generator has changed
32: abe0fc9 = 28: 5134375 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
30: 875627d = 29: 2bdb6bb MinGW: link as terminal server aware
5: cb7f874 = 30: 0cf8d2f transport-helper: add trailing --
34: bd015f7 = 31: 459a86a mingw: demonstrate a
git addissue with NTFS junctions35: 7802274 = 32: 00f2d02 .gitignore: add Visual Studio CMakeSetting.json file
36: eda9447 = 33: f2402ff clink.pl: move default linker options for MSVC=1 builds
33: 7b1d3b4 = 34: 47304d8 http: optionally load libcurl lazily
6: 0d5f245 = 35: 7d96244 ci: bump actions/checkout from 6 to 7
7: 241873b = 36: ef88d46 remote-helper: check helper status after import/export
38: 87521a6 = 37: aa094d7 strbuf_realpath(): use platform-dependent API if available
39: 21a840b = 38: 88f70fb http: use new "best effort" strategy for Secure Channel revoke checking
40: a23ad4a = 39: ad189b7 subtree: update
contrib/subtreetesttarget41: f8d7e54 = 40: b822537 CMakeLists: add default "x64-windows" arch for Visual Studio
42: ab952b8 = 41: c39b3bb setup: properly use "%(prefix)/" when in WSL
43: 0893d14 = 42: 81ef414 Add config option
windows.appendAtomically44: 301b613 = 43: 391fe0c cmake: install headless-git.
37: ad602d8 = 44: a0c5df2 http: support lazy-loading libcurl also on Windows
9: 4acae1d = 45: 9f75f70 ci(coverity): bump actions/cache from 5 to 6
10: 645c754 = 46: 1855b13 Always auto-gc after calling a fast-import transport
11: 043ee4b = 47: 57a7a09 mingw: prevent regressions with "drive-less" absolute paths
46: c709441 = 48: c26ccd2 transport: optionally disable side-band-64k
47: 9310c99 = 49: e81374c mingw: fix fatal error working on mapped network drives on Windows
48: 8f33dbc = 50: e871a08 clink.pl: fix MSVC compile script to handle libcurl-d.lib
49: 15eb061 = 51: dedabee mingw: implement a platform-specific
strbuf_realpath()50: 078aaf8 = 52: 884d15f t3701: verify that we can add lots of files interactively
51: 00d40da = 53: 0b720f6 commit: accept "scissors" with CR/LF line endings
52: 53894a7 = 54: 0ed7632 t0014: fix indentation
53: a8b7244 = 55: b0fe188 git-gui: accommodate for intent-to-add files
54: 5380a89 = 56: af5f65f mingw: allow for longer paths in
parse_interpreter()55: 95780fc = 57: c053f5a compat/vcbuild: document preferred way to build in Visual Studio
56: 8d7f268 = 58: 08dd6e6 http: optionally send SSL client certificate
57: 427f23e = 59: e7ea8f9 ci: run
contrib/subtreetests in CI builds58: d624652 = 60: 6ef9fd8 CMake: show Win32 and Generator_platform build-option values
59: e410e97 = 61: fe8f119 compat/mingw.c: do not warn when failing to get owner
60: a8bfc5c = 62: 1539fec mingw: $env:TERM="xterm-256color" for newer OSes
61: 692ae79 = 63: b67e760 winansi: check result and Buffer before using Name
62: 870f6d5 = 64: 128357c mingw: change core.fsyncObjectFiles = 1 by default
63: 83184ac = 65: 3e30d34 Fix Windows version resources
64: 3fdff33 = 66: 8d5cd8f status: fix for old-style submodules with commondir
65: d01d11b = 67: e688e88 git.rc: include winuser.h
72: 09170e9 = 68: d74c4c8 revision: create mark_trees_uninteresting_dense()
73: ffc7eaa = 69: 7c9b1d7 survey: stub in new experimental 'git-survey' command
74: e40c721 = 70: da75139 survey: add command line opts to select references
75: 641a8fd = 71: e2689ac survey: start pretty printing data in table form
76: c7801eb = 72: 7b459c3 survey: add object count summary
77: 3172000 = 73: e9cfe1e survey: summarize total sizes by object type
78: da2ef3c = 74: cb92b71 survey: show progress during object walk
79: d98922b = 75: 08004dd survey: add ability to track prioritized lists
80: 8a28f7f = 76: 2a039d4 survey: add report of "largest" paths
81: 2b20ca0 = 77: 71c3ca9 survey: add --top= option and config
82: e410eb2 = 78: 29b3a4f mingw: Support
git_terminal_promptwith more terminals83: 7b2f20f = 79: a58b0f2 survey: clearly note the experimental nature in the output
84: f7064f5 = 80: 25d834c compat/terminal.c: only use the Windows console if bash 'read -r' fails
85: 28aba77 = 81: 39c7292 diff: stop truncating the deflated-binary-diff size on Windows
86: 5913738 = 82: faf35db repo: split annotated tags out from total tag count in structure
87: 0f815f7 = 83: 7d565e7 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
88: 4cdc96c = 84: cc88711 convert: widen gather_convert_stats() helpers to size_t
89: 728b09c = 85: 06c4b24 repo: filter the structure scope via --ref-filter=
90: deb217c = 86: 0d54b3c Win32: symlink: move phantom symlink creation to a separate function
91: c0330f9 = 87: e97b95b read-cache: stop truncating index blob sizes on Windows
92: 908939e = 88: fc58b0b repo: report top-N paths by count, disk, and inflated size in structure
93: fe9498b = 89: ef46c3c mingw: make sure
errnois set correctly when socket operations fail94: 5c6b08c = 90: 4c39480 t5563: verify that NTLM authentication works
95: 388f57f = 91: a892027 mingw: introduce code to detect whether we're inside a Windows container
96: 9edecaa = 92: d6c8e8c Introduce helper to create symlinks that knows about index_state
97: 72cbd25 = 93: 272c020 xdiff-interface: widen buffer_is_binary() size parameter to size_t
98: 8e0d02a = 94: 144d0a7 t1901: cover the --top option of
git repo structure99: 8169726 = 95: 5afd5b1 compat/mingw: handle WSA errors in strerror
100: 93bd14f = 96: 2c23df0 http: disallow NTLM authentication by default
101: e61b900 = 97: fa9e6b1 mingw: when running in a Windows container, try to rename() harder
102: c479e19 = 98: 6b2cca2 mingw: allow to specify the symlink type in .gitattributes
104: 0d658f5 = 99: ca24082 combine-diff: stop truncating combined-diff blob sizes on Windows
105: 10b9160 = 100: 9049a69 repo: read the
--topdefault fromrepo.structure.top106: fce42d6 = 101: a0094d8 compat/mingw: drop outdated comment
107: 80511b5 = 102: 81f0d5e http: warn if might have failed because of NTLM
108: 00cb26d = 103: 83c866a mingw: move the file_attr_to_st_mode() function definition
109: 6757a76 = 104: 79b4925 Win32: symlink: add test for
symlinkattribute111: 3d15010 = 105: 1656752 diff: widen textconv_object() size out-param to size_t
45: ee59c85 = 106: 67383f5 http: when loading libcurl lazily, allow for multiple SSL backends
112: 3047bb0 = 107: 4000cfa git-survey: announce the upcoming pivot into
git repo structure113: 6b54325 = 108: ebfbc6e t0301: actually test credential-cache on Windows
114: 223b7e3 = 109: c8547dd credential: advertise NTLM suppression and allow helpers to re-enable
115: cf4b4d3 = 110: fc875b1 mingw: Windows Docker volumes are not symbolic links
116: ee41e37 = 111: 399c37f clean: do not traverse mount points
117: 74331d0 = 112: aa06c45 pack-bitmap: stop truncating blob sizes used by --filter=blob:limit
119: 6440825 = 113: f55a599 diffcore: widen struct diff_filespec.size to size_t
66: 545450c = 114: 64f5dec mingw: do load libcurl dynamically by default
67: 778e324 = 115: 4ef4aca Add a GitHub workflow to verify that Git/Scalar work in Nano Server
68: 5d8273b = 116: 9587667 mingw: suggest
windows.appendAtomicallyin more cases69: 03f58a6 = 117: 75b0f63 win32: use native ANSI sequence processing, if possible
70: b11c9ed = 118: dad2f43 common-main.c: fflush stdout buffer upon exit
71: 57b19ee = 119: 1ee4060 t5601/t7406(mingw): do run tests with symlink support
120: 96b30e4 = 120: 8eaaaf7 Fallback to AppData if XDG_CONFIG_HOME is unset
121: 36ce531 = 121: 9d6ab65 survey: turn into a thin shim over
git repo structure122: 4e242c2 = 122: 0315cf4 credential-cache: handle ECONNREFUSED gracefully
123: d079400 = 123: f1b56a1 reftable: do make sure to use custom allocators
124: 937d4df = 124: 8285fdb check-whitespace: avoid alerts about upstream commits
125: 15e823b = 125: 82f0db2 t/t5571-prep-push-hook.sh: Add test with writing to stderr
126: 184f3b6 = 126: eb3467a dir: do not traverse mount points
127: 3dcbdb2 = 127: ba8b328 win32: thread-utils: handle multi-socket systems
128: e8a2bfe = 128: d167610 t5563: add tests for http.emptyAuth with Negotiate
129: 1bdb89f = 129: b0ce3f5 entry: flush fscache after creating directories and writing files
130: c0caf18 = 130: 591a803 ci(macos): skip the
git p4tests131: 4342ea6 = 131: 56f00a9 mingw: work around rename() failing on a read-only file
132: 480c4bb = 132: c2de9c3 clean: remove mount points when possible
133: e6b7c41 = 133: ecb8f65 mingw: optionally enable wsl compability file mode bits
134: 5563b8a = 134: b987745 Refuse to follow invalid paths in
.gitfiles103: 5f3c8d9 = 135: 003a3ca tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()
110: da7b694 = 136: 57b88fc tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t
135: 7a8457d = 137: c8f41e8 Merge branch 'size-t/pack-objects-delta'
118: 666484a = 138: dd7855b pack-objects: drop the two tree-walk casts in the preferred-base path
136: 6a8a440 = 139: da3e71b Merge branch 'size-t/pack-bitmap'
137: 2c976ef = 140: 925d210 tree: widen struct tree.size and parse_tree_buffer() to size_t
138: b8df84a = 141: 4fba565 Merge branch 'size-t/diff'
139: 02d4510 = 142: a9486ef commit: widen the commit-buffer API to size_t
140: 0f56e8d = 143: 6aa9407 Merge branch 'size-t/tree'
141: 1173c7d = 144: b4b0bc0 blame: widen find_line_starts() len parameter to size_t
142: 133a519 = 145: 6a247d7 Merge branch 'size-t/commit'
143: d270a27 = 146: 5da22c0 grep: widen struct grep_source.size and grep_buffer() to size_t
144: 530d0ce = 147: 8a9ba16 Merge branch 'size-t/blame'
145: d8f16ab = 148: 80672fc fast-export: drop the export_blob() size cast and widen anonymize_blob()
146: 4c297c4 = 149: ea3848c Merge branch 'size-t/grep'
147: 9dc36fd = 150: 851c80f repo: drop the inflated-size cast in count_objects()
148: 4174cd8 = 151: e9d0ff4 Merge branch 'size-t/fast-export'
149: d2a5b88 = 152: 258ab3f unpack-objects: widen the size-passing infrastructure to size_t
150: b7b6720 = 153: 0d04370 Merge branch 'size-t/repo'
151: 68cacf6 = 154: 3c62815 Merge branch 'size-t/unpack-objects'
152: 35f78a6 = 155: 8ec547f Merge branch 'topic/size-t' into size-t-followups
153: bdeb089 = 156: aaee920 pack-objects: drop cast_size_t_to_ulong shims in get_delta()
154: 4071a08 = 157: 66c0f35 pack-objects: drop cast_size_t_to_ulong shims in try_delta()
155: 09ba6b3 = 158: 325ce81 pack-objects: drop the last size shim in write_no_reuse_object()
-: ---------- > 159: 81d82d9 difftool: do not crash on a path rejected by verify_path() (difftool: do not crash on a path rejected by verify_path() git#6426)
156: c22256e = 160: b62ea3b blame: widen struct blame_scoreboard.final_buf_size to size_t
157: fa87773 = 161: 3e978dc Merge tag 'v2.55.0.windows.4'
158: 57910ba = 162: 89bd2f6 fast-import: drop the six size casts in the object-read paths
159: ea0ec02 = 163: d5623e5 Merge branch 'bump-ci-actions'
160: 8d9493a = 164: 53b2801 t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()
161: 4cc8bb4 = 165: 2d79888 Merge 'remote-hg-prerequisites' into HEAD
162: a5f3e75 = 166: 1abe60f Drop the
cast_size_t_to_ulong()helper163: 04c6aad = 167: ded3b4c Merge branch 'topic/size-t' (size_t evacuation, upstream-bound)
164: 0596f41 = 168: 005622e Merge branch 'drive-prefix'
165: 2b99d14 = 169: d43d370 Merge branch 'topic/size-t-followups' (size_t followups depending on seen topics)
166: ae8a3d2 = 170: b4b5485 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
167: d6ef536 = 171: a7cfaf3 mingw: handle staging 4GB+ files correctly
168: e9d096d = 172: e52da5e Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
169: 6ac326a = 173: 8dc2e69 mingw: support unpacking loose 4GB+ objects
170: dd3cbee = 174: 99951fd Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
171: 4151f1e = 175: 54a6137 t: add an expensive test to verify that 4GB+ blobs can be staged/read
172: fb0c5ad = 176: 6324cc7 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction173: a564600 = 177: 7eed8b5 object-file: use size_t for object size in check_object_signature()
174: e0d7a75 = 178: dc8a2a6 coverity: skip building with Rust, for now
175: 673d730 = 179: 9152edc 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: e319e67 = 180: 0533682 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
177: a555892 = 181: 2aa9153 Merge 'add-p-many-files'
178: 7ad47e9 = 182: f25792f Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
179: 8389a2d = 183: 1d4bce4 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
180: 6f3d743 = 184: 24d1e58 Merge 'git-gui/js/intent-to-add'
181: 1f34ae1 = 185: d0aa969 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
182: 68ecca2 = 186: 3746e3f Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
183: be893b3 = 187: e72991a Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
184: 3f88231 = 188: fd442a1 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path185: 47e6ae5 = 189: 3d71d6e 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: 12c9ba0 = 190: 72465ea 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: 7e85d0f = 191: 3173397 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests188: 194470a = 192: 848849c Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
189: 0ceea0a = 193: 3da243a Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory190: a9975ac = 194: 31c77dc Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
191: f735a99 = 195: e34823c Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
192: 9c8cdbf = 196: 6c1850c Merge branch 'optionally-dont-append-atomically-on-windows'
193: 355d218 = 197: 0da0c33 Merge branch 'fsync-object-files-always'
194: 9140827 = 198: 435dffa Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
195: e7294c5 = 199: dcbd3d6 Fix Windows version resources (Fix Windows version resources git#4092)
196: fb52578 = 200: e89a6e3 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
197: ffa9cf0 = 201: f4dcb97 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)198: 4dda8ec = 202: 83b9da8 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283199: 23e452e = 203: 1350869 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
200: 7108919 = 204: 184a087 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
201: 1b4ac3a = 205: 7d76405 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: 83828ed = 206: 20c53fa Merge branch 'nano-server'
203: 1e42209 = 207: ac2d03b Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
204: d056fbb = 208: 9d4c7c7 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
205: 65264fe = 209: 206a44f common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
206: b30cf31 = 210: b78828e Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
207: 893ab0c = 211: f1cdf5b Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
208: f482d6f = 212: 97b119d 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: bde438d = 213: 96fbe68 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
210: 743bc0c = 214: 6c15561 Turn
git surveyinto a deprecated shim overgit repo structure(Turngit surveyinto a deprecated shim overgit repo structuregit#6268)211: 69dd25f = 215: 8546b38 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
212: f082598 = 216: af62de4 Merge branch 'reftable-vs-custom-allocators'
213: 2160b10 = 217: a47eff1 Merge branch 'check-whitespace-only-downstream'
214: d667227 = 218: 7a3481d 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: 83c0938 = 219: 0675751 Merge branch 'disallow-ntlm-auth-by-default'
216: 65162d5 = 220: 9905d85 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)217: d29eadf = 221: a62ce62 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
218: f3f6ac6 = 222: 7048a34 http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
219: 1f4e52c = 223: 4ca28b1 entry: flush fscache after creating directories and writing files (entry: flush fscache after creating directories and writing files git#6250)
220: 04da18d = 224: a82c00c ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)221: 97d7500 = 225: efbc03a Merge branch 'msys2'
222: 32cbbb3 = 226: a827ee2 Merge 'docker-volumes-are-no-symlinks'
223: f2f3f20 = 227: d039d37 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
224: 29eb430 = 228: da40800 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
225: bacc5d3 = 229: dae22ad Merge branch 'dont-clean-junctions'
226: 4fba3db = 230: 38fd5dd Merge branch 'wsl-file-mode-bits'
227: ed90901 = 231: 6fa068d Merge branch 'validate-dotgit'
228: 15f691d = 232: e73cd02 Continue improving support for 4GB+ packs/clones/objects (Continue improving support for 4GB+ packs/clones/objects git#6289)
229: 0a7a9f0 = 233: ef15a92 Support loose 4GB+ objects (Support loose 4GB+ objects git#6353)
230: b12fa5a = 234: 9137699 Merge branch 'skip-rust-in-the-coverity-builds'
231: 06a71a1 = 235: e777d78 Merge branch 'ready-for-upstream'
232: 25f3fb6 = 236: d604be2 Win32: make FILETIME conversion functions public
233: d9e4993 = 237: 50bb96f Win32: dirent.c: Move opendir down
234: 8c415cf = 238: 74ae754 mingw: make the dirent implementation pluggable
235: 6a219b6 = 239: 39e36bf Win32: make the lstat implementation pluggable
236: 47e92a1 = 240: b8ec606 mingw: add infrastructure for read-only file system level caches
237: 44762ea = 241: b1e49f4 mingw: add a cache below mingw's lstat and dirent implementations
238: 8797396 = 242: 9fd3b77 fscache: load directories only once
239: 130089d = 243: 48ff6dd fscache: add key for GIT_TRACE_FSCACHE
240: fea7b5c = 244: 3b777dd fscache: remember not-found directories
241: 6dc9ff5 = 245: 826cb71 fscache: add a test for the dir-not-found optimization
242: 9051a70 = 246: c2f10bb add: use preload-index and fscache for performance
243: 97ed98e = 247: 0e25e56 dir.c: make add_excludes aware of fscache during status
245: f45e709 = 248: d013f86 fscache: make fscache_enabled() public
247: 548abb7 = 249: ef52b5a dir.c: regression fix for add_excludes with fscache
248: 6ee4aec = 250: e32fe86 fetch-pack.c: enable fscache for stats under .git/objects
249: 3570a00 = 251: 9bc3f44 checkout.c: enable fscache for checkout again
244: f8933af = 252: 949daa5 git-gui--askyesno: fix funny text wrapping
250: 2322ba3 = 253: b61a0ff Enable the filesystem cache (fscache) in refresh_index().
246: e4848fe = 254: efaf659 git-gui--askyesno (mingw): use Git for Windows' icon, if available
251: b2625a0 = 255: 1c61d34 fscache: use FindFirstFileExW to avoid retrieving the short name
252: b344808 = 256: ab58d07 fscache: add GIT_TEST_FSCACHE support
253: 56433b4 = 257: 4254cc0 fscache: add fscache hit statistics
254: 8d357df = 258: 87a6731 unpack-trees: enable fscache for sparse-checkout
255: 81e14f3 = 259: 718c320 status: disable and free fscache at the end of the status command
256: 0d167ff = 260: d794c76 mem_pool: add GIT_TRACE_MEMPOOL support
257: 9aa128b = 261: 9915c8b fscache: fscache takes an initial size
258: 63654c1 = 262: e509c52 fscache: update fscache to be thread specific instead of global
259: d9d5f3c = 263: 71e6499 fscache: teach fscache to use mempool
260: a72a943 = 264: 7213da2 fscache: make fscache_enable() thread safe
261: 1380b6d = 265: 5246495 fscache: teach fscache to use NtQueryDirectoryFile
262: 2b2d704 = 266: 6e5f6b7 fscache: remember the reparse tag for each entry
263: c5005b3 = 267: 8129080 fscache: Windows Docker volumes are not symbolic links
264: e1fb80f = 268: 24acbc0 fscache: optionally enable wsl compability file mode bits
265: 55f7d7e = 269: 8416c9f fscache: implement an FSCache-aware is_mount_point()
266: a918e52 = 270: 09800a8 clean: make use of FSCache
267: 31e216a = 271: d4d1877 Merge branch 'fscache'
268: 07027d8 = 272: d6e328d compat/poll: do not collect more handles than the wait supports
269: 4aa962f = 273: b2e4c0a Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
270: 032f3eb = 274: 22a57ca parallel-checkout: limit worker count to what poll() can wait on
271: 720215f = 275: f557103 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
272: 23f57cb = 276: fb4f282 run-command: limit concurrent children to what poll() can wait on
273: 068578f = 277: 6dd0a47 Merge branch 'dont-clean-junctions-fscache'
274: bc9a17b = 278: cb6be8f 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: b6a2546 = 279: c6dbf98 pack-objects (mingw): demonstrate a segmentation fault with large deltas
276: 368d10c = 280: aaf8d17 mingw: support long paths
277: ab14679 = 281: 43f718b win32(long path support): leave drive-less absolute paths intact
278: 8e65777 = 282: 7561dfc compat/fsmonitor/fsm-*-win32: support long paths
279: 595bdd0 = 283: 9959258 clean: suggest using
core.longPathsif paths are too long to remove280: 780763f = 284: 273baa3 mingw: explicitly specify with which cmd to prefix the cmdline
281: e53f239 = 285: 8bbed25 mingw: when path_lookup() failed, try BusyBox
282: 1ddd424 = 286: 26d09b5 test-tool: learn to act as a drop-in replacement for
iconv283: 15c5f1e = 287: d25eb55 tests(mingw): if
iconvis unavailable, usetest-helper --iconv284: 80159fd = 288: e02cf01 gitattributes: mark .png files as binary
285: cfce4dc = 289: 606064d tests: move test PNGs into t/lib-diff/
286: 45ce4e7 = 290: b79df26 tests: only override sort & find if there are usable ones in /usr/bin/
287: 377e774 = 291: b0c15d4 tests: use the correct path separator with BusyBox
288: 48394b5 = 292: 4d233b2 mingw: only use Bash-ism
builtin pwd -Wwhen available289: f26670d = 293: 9696da1 tests (mingw): remove Bash-specific pwd option
290: 5aab1d6 = 294: 03279a4 test-lib: add BUSYBOX prerequisite
291: 122ed7b = 295: e32a571 t5003: use binary file from t/lib-diff/
292: b593608 = 296: 63d1be7 t5532: workaround for BusyBox on Windows
293: 765d26c = 297: a427881 t5605: special-case hardlink test for BusyBox-w32
294: 294bad0 = 298: 1b49f9d t5813: allow for $PWD to be a Windows path
295: e00e9cc = 299: fffcd58 t9200: skip tests when $PWD contains a colon
296: 1c9c95c = 300: 6daff43 Describe Git for Windows' architecture
298: 09f0494 = 301: abe5633 Add an AGENTS.md file to help with AI-assisted debugging/development
303: 7f3110f = 302: c873da6 Modify the Code of Conduct for Git for Windows
305: 03f417d ! 303: 69b680d CONTRIBUTING.md: add guide for first-time contributors
307: 17523b5 = 304: b879ecb README.md: Add a Windows-specific preamble
309: faa66d1 = 305: b8affe0 Add an issue template
297: 7c462b9 = 306: b135175 Add a GitHub workflow to monitor component updates
299: e28d070 = 307: 9c25cc3 Partially un-revert "editor: save and reset terminal after calling EDITOR"
300: 56f765e = 308: 16ddf0b reset: reinstate support for the deprecated --stdin option
311: cff00d0 = 309: ed3cbe0 Modify the GitHub Pull Request template (to reflect Git for Windows)
301: dac85d1 = 310: a9b9838 fsmonitor: reintroduce core.useBuiltinFSMonitor
302: 01edab6 = 311: 8a3963c dependabot: help keeping GitHub Actions versions up to date
304: dc19773 = 312: 15f2f78 Merge branch 'gitk-and-git-gui-patches'
306: f2ab84e = 313: aece8a0 Merge branch 'long-paths'
308: 564a99e = 314: f8b7e4f Merge branch 'busybox-w32'
310: 46ff009 = 315: 46ebaa5 Merge branch 'un-revert-editor-save-and-reset'
312: 773f94e = 316: 41858ff Merge branch 'phase-out-reset-stdin'
313: 2fe49d1 = 317: 8e7e634 SECURITY.md: document Git for Windows' policies
314: 4027540 = 318: c1e33ec Merge branch 'deprecate-core.useBuiltinFSMonitor'
315: 26d52a9 = 319: 5c93f6e ci: only run the expensive tests in the Windows tests for now
316: 4597d73 = 320: c4cfabf Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
317: c2d77df = 321: 137c414 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)