Rebase to v2.46.2 #5169
Merged
Rebase to v2.46.2 #5169
Conversation
This file contains 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
These refactorings are really gifts that keep on giving. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is not useful because we do not have any persisted directory anymore, not since dropping our Travis CI support. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
... so that we can test a MinGit backport in a private repository (with GitHub Actions, minutes and parallel jobs are limited way more than with Azure Pipelines in private repositories). In this commit, we reinstate the exact version of `azure-pipelines.yml` as 6081d38 (ci: retire the Azure Pipelines definition, 2020-04-11) deleted. Naturally, many adjustments are required to make it work again. Some of the changes are actually outside of that file (such as the `runs_on_pool` changes that are needed in the Azure Pipelines part of `ci/lib.sh`) and they were made in the commits leading up to this here commit. However, other adjustments are required in the `azure-pipelines.yml` file itself, and for ease of review (read: to build confidence in those changes) they will be made in subsequent, individual commits that explain the intent, context, implementation and justification like every good commit message should do. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is a follow-up to 6c280b4 (ci: remove GETTEXT_POISON jobs, 2021-01-20) after reinstating the Azure Pipeline. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
We have `ci/install-dependencies.sh` for that. Incidentally, this avoids
the following error in the linux-* jobs:
The following packages have unmet dependencies:
git-email : Depends: git (< 1:2.25.1-.) but 1:2.35.1-0ppa1~ubuntu20.04.1 is to be installed
Recommends: libemail-valid-perl but it is not going to be installed
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
We haven't used this feature in ages, we don't actually need to. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…imal-sdk The Azure Pipeline `git-sdk-64-minimal` was retired... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
These many refactorings in Git sure are gifts that keep on giving. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
From the documentation of said setting: This boolean will enable fsync() when writing object files. This is a total waste of time and effort on a filesystem that orders data writes properly, but can be useful for filesystems that do not use journalling (traditional UNIX filesystems) or that only journal metadata and not file contents (OS X’s HFS+, or Linux ext3 with "data=writeback"). The most common file system on Windows (NTFS) does not guarantee that order, therefore a sudden loss of power (or any other event causing an unclean shutdown) would cause corrupt files (i.e. files filled with NULs). Therefore we need to change the default. Note that the documentation makes it sound as if this causes really bad performance. In reality, writing loose objects is something that is done only rarely, and only a handful of files at a time. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is inspired by d051ed7 (.github/workflows/main.yml: run static-analysis on bionic, 2021-02-08) and by ef46584 (ci: update 'static-analysis' to Ubuntu 22.04, 2022-08-23), adapted to the Azure Pipeline. When Azure Pipelines' build agents transitioned 'ubuntu-latest' from 18.04 to 20.04, it broke our `static-analysis` job, since Coccinelle was not madeavailable on Ubuntu focal (it is only available in the universe suite). This is not an issue with Ubuntu 22.04, but we will only know whether it is an issue with 24.04 when _that_ comes out. So let's play it safe and pin the `static_analysis` job to the latest Ubuntu version that we know to offer a working Coccinelle package. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This compile-time option allows to ask Git to load libcurl dynamically at runtime. Together with a follow-up patch that optionally overrides the file name depending on the `http.sslBackend` setting, this kicks open the door for installing multiple libcurl flavors side by side, and load the one corresponding to the (runtime-)configured SSL/TLS backend. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
CLANGARM64 is a relatively new MSYSTEM added by the MSYS2 team. In order to have Git build correctly for this platform, let's add some configuration for it to config.mak.uname. Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
This implements the Windows-specific support code, because everything is slightly different on Windows, even loading shared libraries. Note: I specifically do _not_ use the code from `compat/win32/lazyload.h` here because that code is optimized for loading individual functions from various system DLLs, while we specifically want to load _many_ functions from _one_ DLL here, and distinctly not a system DLL (we expect libcurl to be located outside `C:\Windows\system32`, something `INIT_PROC_ADDR` refuses to work with). Also, the `curl_easy_getinfo()`/`curl_easy_setopt()` functions are declared as vararg functions, which `lazyload.h` cannot handle. Finally, we are about to optionally override the exact file name that is to be loaded, which is a goal contrary to `lazyload.h`'s design. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Whith Windows 2000, Microsoft introduced a flag to the PE header to mark executables as "terminal server aware". Windows terminal servers provide a redirected Windows directory and redirected registry hives when launching legacy applications without this flag set. Since we do not use any INI files in the Windows directory and don't write to the registry, we don't need this additional preparation. Telling the OS that we don't need this should provide slightly improved startup times in terminal server environments. When building for supported Windows Versions with MSVC the /TSAWARE linker flag is automatically set, but MinGW requires us to set the --tsaware flag manually. This partially addresses git-for-windows#3935. Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Add FileVersion, which is a required field As not all required fields were present, none were being included Fixes git-for-windows#4090 Signed-off-by: Kiel Hurley <kielhurley@gmail.com>
Newer compiler versions, like GCC 10 and Clang 12, have built-in functions for bswap32 and bswap64. This comes in handy, for example, when targeting CLANGARM64 on Windows, which would not be supported without this logic. Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
No GitHub-hosted ARM64 runners are available at the moment of writing, but folks can leverage self-hosted runners of this architecture. This CI pipeline comes in handy for forks of the git-for-windows/git project that have such runners available. The pipeline can be kicked off manually through a workflow_dispatch. Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
In f9b7573 (repository: free fields before overwriting them, 2017-09-05), Git was taught to release memory before overwriting it, but 357a03e (repository.c: move env-related setup code back to environment.c, 2018-03-03) changed the code so that it would not _always_ be overwritten. As a consequence, the `commondir` attribute would point to already-free()d memory. This seems not to cause problems in core Git, but there are add-on patches in Git for Windows where the `commondir` attribute is subsequently used and causing invalid memory accesses e.g. in setups containing old-style submodules (i.e. the ones with a `.git` directory within theirs worktrees) that have `commondir` configured. This fixes git-for-windows#4083. Signed-off-by: Andrey Zabavnikov <zabavnikov@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is merely a historical wart that, say, `git-commit` exists in the `libexec/git-core/` directory, a tribute to the original idea to let Git be essentially a bunch of Unix shell scripts revolving around very few "plumbing" (AKA low-level) commands. Git has evolved a lot from there. These days, most of Git's functionality is contained within the `git` executable, in the form of "built-in" commands. To accommodate for scripts that use the "dashed" form of Git commands, even today, Git provides hard-links that make the `git` executable available as, say, `git-commit`, just in case that an old script has not been updated to invoke `git commit`. Those hard-links do not come cheap: they take about half a minute for every build of Git on Windows, they are mistaken for taking up huge amounts of space by some Windows Explorer versions that do not understand hard-links, and therefore many a "bug" report had to be addressed. The "dashed form" has been officially deprecated in Git version 1.5.4, which was released on February 2nd, 2008, i.e. a very long time ago. This deprecation was never finalized by skipping these hard-links, but we can start the process now, in Git for Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Since Git v2.39.1, we are a bit more stringent in searching the PATH. In particular, we specifically require the `.exe` suffix. However, the `Repository>Explore Working Copy` command asks for `explorer.exe` to be found on the `PATH`, which _already_ has that suffix. Let's unstartle the PATH-finding logic about this scenario. This fixes git-for-windows#4356 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>
This will help with Git for Windows' maintenance going forward: It allows Git for Windows to switch its primary libcurl to a variant without the OpenSSL backend, while still loading an alternate when setting `http.sslBackend = openssl`. This is necessary to avoid maintenance headaches with upgrading OpenSSL: its major version name is encoded in the shared library's file name and hence major version updates (temporarily) break libraries that are linked against the OpenSSL library. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In Git for Windows v2.39.0, we fixed a regression where `git.exe` would no longer work in Windows Nano Server (frequently used in Docker containers). This GitHub workflow can be used to verify manually that the Git/Scalar executables work in Nano Server. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When running Git for Windows on a remote APFS filesystem, it would appear that the `mingw_open_append()`/`write()` combination would fail almost exactly like on some CIFS-mounted shares as had been reported in git-for-windows#2753, albeit with a different `errno` value. Let's handle that `errno` value just the same, by suggesting to set `windows.appendAtomically=false`. Signed-off-by: David Lomas <dl3@pale-eds.co.uk> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Windows 10 version 1511 (also known as Anniversary Update), according to https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences introduced native support for ANSI sequence processing. This allows using colors from the entire 24-bit color range. All we need to do is test whether the console's "virtual processing support" can be enabled. If it can, we do not even need to start the `console_thread` to handle ANSI sequences. Or, almost all we need to do: When `console_thread()` does its work, it uses the Unicode-aware `write_console()` function to write to the Win32 Console, which supports Git for Windows' implicit convention that all text that is written is encoded in UTF-8. The same is not necessarily true if native ANSI sequence processing is used, as the output is then subject to the current code page. Let's ensure that the code page is set to `CP_UTF8` as long as Git writes to it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
winuser.h contains the definition of RT_MANIFEST that our LLVM based toolchain needs to understand that we want to embed compat/win32/git.manifest as an application manifest. It currently just embeds it as additional data that Windows doesn't understand. This also helps our GCC based toolchain understand that we only want one copy embedded. It currently embeds one working assembly manifest and one nearly identical, but useless copy as additional data. This also teaches our Visual Studio based buildsystems to pick up the manifest file from git.rc. This means we don't have to explicitly specify it in contrib/buildsystems/Generators/Vcxproj.pm anymore. Slightly counter-intuitively this also means we have to explicitly tell Cmake not to embed a default manifest. This fixes git-for-windows#4707 Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
By default, the buffer type of Windows' `stdout` is unbuffered (_IONBF), and there is no need to manually fflush `stdout`. But some programs, such as the Windows Filtering Platform driver provided by the security software, may change the buffer type of `stdout` to full buffering. This nees `fflush(stdout)` to be called manually, otherwise there will be no output to `stdout`. Signed-off-by: MinarKotonoha <chengzhuo5@qq.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A long time ago, we decided to run tests in Git for Windows' SDK with the default `winsymlinks` mode: copying instead of linking. This is still the default mode of MSYS2 to this day. However, this is not how most users run Git for Windows: As the majority of Git for Windows' users seem to be on Windows 10 and newer, likely having enabled Developer Mode (which allows creating symbolic links without administrator privileges), they will run with symlink support enabled. This is the reason why it is crucial to get the fixes for CVE-2024-? to the users, and also why it is crucial to ensure that the test suite exercises the related test cases. This commit ensures the latter. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `__MINGW64__` constant is defined, surprise, surprise, only when
building for a 64-bit CPU architecture.
Therefore using it as a guard to define `_POSIX_C_SOURCE` (so that
`localtime_r()` is declared, among other functions) is not enough, we
also need to check `__MINGW32__`.
Technically, the latter constant is defined even for 64-bit builds. But
let's make things a bit easier to understand by testing for both
constants.
Making it so fixes this compile warning (turned error in GCC v14.1):
archive-zip.c: In function 'dos_time':
archive-zip.c:612:9: error: implicit declaration of function 'localtime_r';
did you mean 'localtime_s'? [-Wimplicit-function-declaration]
612 | localtime_r(&time, &tm);
| ^~~~~~~~~~~
| localtime_s
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The pack_name_hash() method has not been materially changed since it was introduced in ce0bd64 (pack-objects: improve path grouping heuristics., 2006-06-05). The intention here is to group objects by path name, but also attempt to group similar file types together by making the most-significant digits of the hash be focused on the final characters. Here's the crux of the implementation: /* * This effectively just creates a sortable number from the * last sixteen non-whitespace characters. Last characters * count "most", so things that end in ".c" sort together. */ while ((c = *name++) != 0) { if (isspace(c)) continue; hash = (hash >> 2) + (c << 24); } As the comment mentions, this only cares about the last sixteen non-whitespace characters. This cause some filenames to collide more than others. Here are some examples that I've seen while investigating repositories that are growing more than they should be: * "/CHANGELOG.json" is 15 characters, and is created by the beachball [1] tool. Only the final character of the parent directory can differntiate different versions of this file, but also only the two most-significant digits. If that character is a letter, then this is always a collision. Similar issues occur with the similar "/CHANGELOG.md" path, though there is more opportunity for differences in the parent directory. * Localization files frequently have common filenames but differentiate via parent directories. In C#, the name "/strings.resx.lcl" is used for these localization files and they will all collide in name-hash. [1] https://github.com/microsoft/beachball I've come across many other examples where some internal tool uses a common name across multiple directories and is causing Git to repack poorly due to name-hash collisions. It is clear that the existing name-hash algorithm is optimized for repositories with short path names, but also is optimized for packing a single snapshot of a repository, not a repository with many versions of the same file. In my testing, this has proven out where the name-hash algorithm does a good job of finding peer files as delta bases when unable to use a historical version of that exact file. However, for repositories that have many versions of most files and directories, it is more important that the objects that appear at the same path are grouped together. Create a new pack_full_name_hash() method and a new --full-name-hash option for 'git pack-objects' to call that method instead. Add a simple pass-through for 'git repack --full-name-hash' for additional testing in the context of a full repack, where I expect this will be most effective. The hash algorithm is as simple as possible to be reasonably effective: for each character of the path string, add a multiple of that character and a large prime number (chosen arbitrarily, but intended to be large relative to the size of a uint32_t). Then, shift the current hash value to the right by 5, with overlap. The addition and shift parameters are standard mechanisms for creating hard-to-predict behaviors in the bits of the resulting hash. This is not meant to be cryptographic at all, but uniformly distributed across the possible hash values. This creates a hash that appears pseudorandom. There is no ability to consider similar file types as being close to each other. In a later change, a test-tool will be added so the effectiveness of this hash can be demonstrated directly. For now, let's consider how effective this mechanism is when repacking a repository with and without the --full-name-hash option. Specifically, let's use 'git repack -adf [--full-name-hash]' as our test. On the Git repository, we do not expect much difference. All path names are short. This is backed by our results: | Stage | Pack Size | Repack Time | |-----------------------|-----------|-------------| | After clone | 260 MB | N/A | | Standard Repack | 127MB | 106s | | With --full-name-hash | 126 MB | 99s | This example demonstrates how there is some natural overhead coming from the cloned copy because the server is hosting many forks and has not optimized for exactly this set of reachable objects. But the full repack has similar characteristics with and without --full-name-hash. However, we can test this in a repository that uses one of the problematic naming conventions above. The fluentui [2] repo uses beachball to generate CHANGELOG.json and CHANGELOG.md files, and these files have very poor delta characteristics when comparing against versions across parent directories. | Stage | Pack Size | Repack Time | |-----------------------|-----------|-------------| | After clone | 694 MB | N/A | | Standard Repack | 438 MB | 728s | | With --full-name-hash | 168 MB | 142s | [2] https://github.com/microsoft/fluentui In this example, we see significant gains in the compressed packfile size as well as the time taken to compute the packfile. Using a collection of repositories that use the beachball tool, I was able to make similar comparisions with dramatic results. While the fluentui repo is public, the others are private so cannot be shared for reproduction. The results are so significant that I find it important to share here: | Repo | Standard Repack | With --full-name-hash | |----------|-----------------|-----------------------| | fluentui | 438 MB | 168 MB | | Repo B | 6,255 MB | 829 MB | | Repo C | 37,737 MB | 7,125 MB | | Repo D | 130,049 MB | 6,190 MB | Future changes could include making --full-name-hash implied by a config value or even implied by default during a full repack. Signed-off-by: Derrick Stolee <stolee@gmail.com>
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>
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>
The sentiment bot will help detect when things get too heated. Hopefully. 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>
Git documentation refers to $HOME and $XDG_CONFIG_HOME often, but does not specify how or where these values come from on Windows where neither is set by default. The new documentation reflects the behavior of setup_windows_environment() in compat/mingw.c. Signed-off-by: Alejandro Barreto <alejandro.barreto@ni.com>
This is the recommended way on GitHub to describe policies revolving around security issues and about supported versions. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…dvice clean: suggest using `core.longPaths` if paths are too long to remove
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This was pull request git-for-windows#1645 from ZCube/master Support windows container. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ws#4527) With this patch, Git for Windows works as intended on mounted APFS volumes (where renaming read-only files would fail). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Specify symlink type in .gitattributes
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This patch introduces support to set special NTFS attributes that are interpreted by the Windows Subsystem for Linux as file mode bits, UID and GID. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Handle Ctrl+C in Git Bash nicely Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Switch to batched fsync by default
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
/git-artifacts The The |
This comment was marked as outdated.
This comment was marked as outdated.
|
/release The |
gitforwindowshelper
bot
merged commit 1e20af0
into
git-for-windows:main
65 of 71 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The usual pre-release PR.
Range-diff relative to main
1: c3458b0 = 1: f09bdca gitk(Windows): avoid inadvertently calling executables in the worktree
246: cba7e0d = 2: f35db51 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
248: 42b4225 = 3: e346cc0 t5512.40 sometimes dies by SIGPIPE
2: 86802eb = 4: 0d5ed89 t9350: point out that refs are not updated correctly
3: f9372db = 5: fc564e3 transport-helper: add trailing --
4: 9a0537d = 6: 0a8e3f5 remote-helper: check helper status after import/export
7: a165dca = 7: 17bba8e mingw: demonstrate a problem with certain absolute paths
8: bf29ea6 = 8: d806221 clean: do not traverse mount points
6: 7299e07 = 9: 5686029 mingw: include the Python parts in the build
5: c875431 = 10: e6653f9 Always auto-gc after calling a fast-import transport
10: 68477eb = 11: 9ff3a3d mingw: allow absolute paths without drive prefix
11: 6498bc6 = 12: 8bb6c1e clean: remove mount points when possible
9: 1f45254 = 13: 672e4f2 win32/pthread: avoid name clashes with winpthread
12: 199592b = 14: 09876dd git-compat-util: avoid redeclaring _DEFAULT_SOURCE
13: e7da041 = 15: d68cf6d Import the source code of mimalloc v2.1.2
14: 7940371 = 16: b9c4eb2 mimalloc: adjust for building inside Git
15: eb0f080 = 17: d5ee8ff mimalloc: offer a build-time option to enable it
16: 8be8dec = 18: 4530a6b mimalloc: use "weak" random seed when statically linked
17: 6ea34cc = 19: 721eec2 mingw: use mimalloc
18: ffcf774 = 20: 31160bb transport: optionally disable side-band-64k
19: f5100a6 = 21: 3ba8c79 mingw: make sure
errnois set correctly when socket operations fail20: 007ede4 = 22: afee39f mingw: do resolve symlinks in
getcwd()21: c300d5e = 23: 32bad31 mingw: fix fatal error working on mapped network drives on Windows
27: 0898dca = 24: e6ec509 clink.pl: fix MSVC compile script to handle libcurl-d.lib
29: 4ee453c = 25: 8801afc vcxproj: unclash project directories with build outputs
22: a688f81 = 26: c561389 mingw: ensure valid CTYPE
23: 0dcd919 = 27: 14c3501 mingw: demonstrate a
git addissue with NTFS junctions30: 234e711 = 28: 189d1cd t5505/t5516: allow running without
.git/branches/in the templates24: 2b23718 = 29: b314796 mingw: allow
git.exeto be used instead of the "Git wrapper"25: 5f51144 = 30: 367af8a strbuf_realpath(): use platform-dependent API if available
31: df9e510 = 31: fc86e02 t5505/t5516: fix white-space around redirectors
26: f2131b2 = 32: d83f5e8 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
32: e712200 = 33: 27e161a http: use new "best effort" strategy for Secure Channel revoke checking
28: 1afb7a6 = 34: 884fbfb mingw: implement a platform-specific
strbuf_realpath()33: 8972cd7 = 35: 68c871f t3701: verify that we can add lots of files interactively
38: c2deb3c = 36: d0963a2 clink.pl: fix libexpatd.lib link error when using MSVC
39: af45d36 = 37: 347d2d3 Makefile: clean up .ilk files when MSVC=1
40: 96c1f69 = 38: c6ee424 vcbuild: add support for compiling Windows resource files
41: d62f09e = 39: 3f1f131 config.mak.uname: add git.rc to MSVC builds
42: 236daaa = 40: 3a12e6d clink.pl: ignore no-stack-protector arg on MSVC=1 builds
34: 90d2072 = 41: c7efa04 git add -i: handle CR/LF line endings in the interactive input
35: 2dbe355 = 42: 96f3555 commit: accept "scissors" with CR/LF line endings
36: d42d78a = 43: 2415aa8 t0014: fix indentation
37: 7b2e2b9 = 44: caaf8ac git-gui: accommodate for intent-to-add files
48: bfde5e9 = 45: de50978 vcpkg_install: detect lack of Git
49: 7175027 = 46: 12048b5 vcpkg_install: add comment regarding slow network connections
50: f537112 = 47: 3a2a268 vcxproj: support building Windows/ARM64 binaries
43: 5723dd0 = 48: bbdb2e3 clink.pl: move default linker options for MSVC=1 builds
51: 4c775c0 = 49: e1cdf71 vcbuild: install ARM64 dependencies when building ARM64 binaries
44: 1941190 = 50: 5dcf680 buildsystems: remove duplicate clause
52: 8456f8c = 51: e63298f vcbuild: add an option to install individual 'features'
45: 68dab01 = 52: e7b1310 vcxproj: handle resource files, too
53: fb77fca = 53: 99c4bda cmake: allow building for Windows/ARM64
46: 7c3c91c = 54: 1f8310d vcxproj: ignore -fno-stack-protector and -fno-common
54: ce1f802 = 55: abb12a3 ci(vs-build) also build Windows/ARM64 artifacts
47: 5c194da = 56: 179e8ac vcxproj: handle GUI programs, too
56: b5ae0a0 = 57: 14b7459 Add schannel to curl installation
55: 0b15fed = 58: 00848d0 cmake: install headless-git.
57: 7ea5028 = 59: 7e4f229 cmake(): allow setting HOST_CPU for cross-compilation
61: 1a39b65 = 60: b38a487 CMake: default Visual Studio generator has changed
62: d99334c = 61: 5ba4177 .gitignore: add Visual Studio CMakeSetting.json file
63: 2819b4f = 62: 9282eff subtree: update
contrib/subtreetesttarget64: 80c9b3f = 63: 8cfea37 CMakeLists: add default "x64-windows" arch for Visual Studio
58: c038faf = 64: b8b1296 mingw: allow for longer paths in
parse_interpreter()59: e52d8ed = 65: cab2b72 compat/vcbuild: document preferred way to build in Visual Studio
60: 866758a = 66: ed39322 http: optionally send SSL client certificate
66: 3800a28 = 67: c7cf32d ci: run
contrib/subtreetests in CI builds67: 30158eb = 68: 4ad003d CMake: show Win32 and Generator_platform build-option values
68: 30c9806 = 69: 404d93b init: do parse all core.* settings early
65: 150fc9e = 70: f02954c hash-object: demonstrate a >4GB/LLP64 problem
70: 00b8037 = 71: 7eff60f write_object_file_literally(): use size_t
71: d5dc8b2 = 72: eb7bc6b object-file.c: use size_t for header lengths
72: 3b81095 = 73: 6faae20 hash algorithms: use size_t for section lengths
73: 138987c = 74: fc3e62e hash-object --stdin: verify that it works with >4GB/LLP64
74: 03b4d54 = 75: 0f5221e hash-object: add another >4GB/LLP64 test case
75: 6caf7c9 = 76: 1023670 setup: properly use "%(prefix)/" when in WSL
90: fae12b0 = 77: 14c432a Add config option
windows.appendAtomically69: b6675e0 = 78: a77fce4 Enable the built-in FSMonitor as an experimental feature
76: 065337c = 79: c4fe288 hash-object: add a >4GB/LLP64 test case using filtered input
77: 301048a = 80: f86fa9f compat/mingw.c: do not warn when failing to get owner
78: 4d925f5 = 81: f5db3d8 mingw: $env:TERM="xterm-256color" for newer OSes
79: a4dc735 = 82: cb96a6e winansi: check result and Buffer before using Name
80: 38a219e = 83: 340965d vcxproj: allow building with
NO_PERLagain81: 0cd5262 = 84: b399e4d vcxproj: require C11
82: 1d0780b = 85: da2f86c vcxproj: ignore the
-pedanticoption83: 4c51d47 = 86: dae1de2 vcxproj: include reftable when committing
.vcxprojfiles84: ba05b17 = 87: 22cf792 vcxproj: handle libreftable_test, too
85: 85874a1 = 88: 2d16464 vcxproj: avoid escaping double quotes in the defines
86: 65c7df4 = 89: ca24900 ci: adjust Azure Pipeline for
runs_on_pool87: 60e1dc4 = 90: d43e0c8 ci: stop linking the
provecache88: d33fb7d = 91: 800490f ci: reinstate Azure Pipelines support
89: 074f591 = 92: a599e1b azure-pipeline: drop the
GETTEXT_POISONjob91: 06e2381 = 93: 1fa3bab azure-pipeline: stop hard-coding
apt-getcalls93: dd78210 = 94: 2fa96e0 azure-pipeline: drop the code to write to/read from a file share
94: ae18a1c = 95: f10d160 azure-pipeline: use partial clone/parallel checkout to initialize minimal-sdk
96: 57cbc42 = 96: fac5243 azure-pipeline: downcase the job name of the
Linux32job92: 30899bf = 97: d6c73a5 mingw: change core.fsyncObjectFiles = 1 by default
99: a4f6141 = 98: dd17e89 azure-pipeline: run static-analysis on jammy
98: be6056f = 99: b528f18 MinGW: link as terminal server aware
95: 3c8827b = 100: f28be8b bswap.h: add support for built-in bswap functions
102: 7eeb802 = 101: 6f296a1 http: optionally load libcurl lazily
97: 9c686c9 = 102: c8feee1 config.mak.uname: add support for clangarm64
103: 00f1088 = 103: 7015b7e http: support lazy-loading libcurl also on Windows
100: 40fe633 = 104: 7be890e Fix Windows version resources
101: f3d1c55 = 105: 1dd84d1 ci: create clangarm64-build.yml
105: 1aa651e = 106: 521b0e0 status: fix for old-style submodules with commondir
106: f5fc17d = 107: 6697363 windows: skip linking
git-<command>for built-ins107: d656540 = 108: 8266ae8 windows: fix Repository>Explore Working Copy
104: 6d8e07c = 109: e463c5f http: when loading libcurl lazily, allow for multiple SSL backends
108: 9780d3a = 110: 246c049 mingw: do load libcurl dynamically by default
109: 4325885 = 111: 6f841b3 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
110: 6f70ef4 = 112: 54f725f mingw: suggest
windows.appendAtomicallyin more cases111: f1898a0 = 113: ba87a0d win32: use native ANSI sequence processing, if possible
112: 9b44ed4 = 114: e9fc25a git.rc: include winuser.h
113: afecd4a = 115: db40bb9 common-main.c: fflush stdout buffer upon exit
114: 377cb33 = 116: 55a95de t5601/t7406(mingw): do run tests with symlink support
115: 5042e2d = 117: 0b4961d win32: ensure that
localtime_r()is declared even in i686 builds236: d5c8636 ! 118: 3f2c20a pack-objects: add --full-name-hash option
116: a56147b = 119: 391cd2a Fallback to AppData if XDG_CONFIG_HOME is unset
117: 112efba = 120: 2d4c3f4 run-command: be helpful with Git LFS fails on Windows 7
118: a7dcca5 (upstream: 90f2c72) < -: ------------ ci: remove 'Upload failed tests' directories' step from linux32 jobs
237: ba4e2f9 ! 121: 10680be repack: test --full-name-hash option
@@ t/test-lib-functions.sh: test_subcommand () { + shift + fi + -+ local expr="$(printf '"%s",.*' "$@")" ++ local expr="$(printf '"%s".*' "$@")" + + if test -n "$negate" + then238: 866e5b1 ! 122: 2d1854f pack-objects: add GIT_TEST_FULL_NAME_HASH
239: 8b20104 = 123: 8f25388 git-repack: update usage to match docs
240: 9cc8282 ! 124: d2791c1 p5313: add size comparison test
241: 02d577f ! 125: 5f29863 test-tool: add helper for name-hash values
@@ t/helper/test-name-hash.c (new) + printf("%10"PRIu32"\t%10"PRIu32"\t%s\n", name_hash, full_hash, line.buf); + } + ++ strbuf_release(&line); + return 0; +}247: 4900749 = 126: d020fb4 repack/pack-objects: mark
--full-name-hashas experimental119: cec19bb = 127: 20bfc1f Win32: make FILETIME conversion functions public
120: 237f9dd = 128: 58f9dfe Win32: dirent.c: Move opendir down
121: dc626be = 129: 071ce86 mingw: make the dirent implementation pluggable
122: cc74000 = 130: 1913d2b Win32: make the lstat implementation pluggable
123: 711da7f = 131: 6d42e40 mingw: add infrastructure for read-only file system level caches
124: 91d2040 = 132: e574b79 mingw: add a cache below mingw's lstat and dirent implementations
125: da8579d = 133: 1d30c43 fscache: load directories only once
126: 3fb0e0b = 134: 583d8aa fscache: add key for GIT_TRACE_FSCACHE
127: db1763d = 135: 61d45de fscache: remember not-found directories
128: 3d53293 = 136: 664e8ac fscache: add a test for the dir-not-found optimization
129: a598846 = 137: 0ae9145 add: use preload-index and fscache for performance
130: 6cc1649 = 138: 851b171 dir.c: make add_excludes aware of fscache during status
131: 5a2c256 = 139: 0a4e8f8 fscache: make fscache_enabled() public
132: 07cec99 = 140: 5ea907f dir.c: regression fix for add_excludes with fscache
133: f16ef35 = 141: 4579d69 fetch-pack.c: enable fscache for stats under .git/objects
134: 0b3cb86 = 142: af3cee0 checkout.c: enable fscache for checkout again
135: 56cf170 = 143: 532b6f5 Enable the filesystem cache (fscache) in refresh_index().
136: 747bfe0 = 144: baf0136 fscache: use FindFirstFileExW to avoid retrieving the short name
137: d45c22b = 145: 174e972 status: disable and free fscache at the end of the status command
138: fc7b9bf ! 146: 26798fc fscache: add GIT_TEST_FSCACHE support
139: 284eb3e = 147: 57d95da fscache: add fscache hit statistics
140: 2b1802f = 148: 203101d mem_pool: add GIT_TRACE_MEMPOOL support
141: 5505563 = 149: 1746116 fscache: fscache takes an initial size
142: 3972d4c = 150: db35cf5 fscache: update fscache to be thread specific instead of global
143: a6a4906 = 151: ea24769 fscache: teach fscache to use mempool
144: 29054d2 = 152: e01925b fscache: make fscache_enable() thread safe
147: 949503d = 153: 614b54a git-gui: provide question helper for retry fallback on Windows
145: 8be5c62 = 154: f0ac738 fscache: teach fscache to use NtQueryDirectoryFile
149: 26cb463 = 155: 55a60a1 git gui: set GIT_ASKPASS=git-gui--askpass if not set yet
146: 8b5b156 = 156: c702d42 unpack-trees: enable fscache for sparse-checkout
151: d74467f = 157: 302c46d git-gui--askyesno: fix funny text wrapping
148: dd188fa = 158: a39b0cb fscache: remember the reparse tag for each entry
155: 0792487 = 159: bb4a2c1 git-gui--askyesno: allow overriding the window title
150: 87a73ce = 160: 0275f96 fscache: implement an FSCache-aware is_mount_point()
153: 193fea2 = 161: 9014b9b gitk: Unicode file name support
157: f57f1f1 = 162: c5d4535 git-gui--askyesno (mingw): use Git for Windows' icon, if available
152: 7d7c8d2 = 163: cbc3820 clean: make use of FSCache
154: edebad2 = 164: 0a75037 gitk: Use an external icon file on Windows
156: 5040e8b = 165: 95ad775 gitk: fix arrow keys in input fields with Tcl/Tk >= 8.6
158: 2dfff15 = 166: 0f60870 gitk: make the "list references" default window width wider
159: ed4cdb7 = 167: 44f756b pack-objects (mingw): demonstrate a segmentation fault with large deltas
160: 90a0bd5 = 168: 021726e mingw: support long paths
161: f0c7c00 = 169: f4942ce Win32: fix 'lstat("dir/")' with long paths
162: 2a1b191 = 170: b6b464a win32(long path support): leave drive-less absolute paths intact
163: b1eb679 = 171: 781e463 mingw: Support
git_terminal_promptwith more terminals164: 6e351ec = 172: fc0ca2b compat/terminal.c: only use the Windows console if bash 'read -r' fails
165: 3dab29b = 173: 7a21b9d mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
166: 08d520d = 174: a77944a Unbreak interactive GPG prompt upon signing
167: 12a0a6f = 175: c867250 compat/fsmonitor/fsm-*-win32: support long paths
168: caae38a = 176: 21c96ac clean: suggest using
core.longPathsif paths are too long to remove169: a1f7c57 = 177: f2c265b strbuf_readlink: don't call readlink twice if hint is the exact link size
170: 5bcdd25 = 178: 25eee7c strbuf_readlink: support link targets that exceed PATH_MAX
171: 0ccd0dd = 179: 1925b12 lockfile.c: use is_dir_sep() instead of hardcoded '/' checks
172: a1ba0b3 = 180: b40940a Win32: don't call GetFileAttributes twice in mingw_lstat()
173: 6cc554f = 181: e22994d Win32: implement stat() with symlink support
174: bfb6c70 = 182: a05b027 Win32: remove separate do_lstat() function
175: f027e0c = 183: 6ac21c8 Win32: let mingw_lstat() error early upon problems with reparse points
176: 793e318 = 184: 0240aa2 mingw: teach fscache and dirent about symlinks
177: ba6cfb4 = 185: d78d40a Win32: lstat(): return adequate stat.st_size for symlinks
178: 4cac428 = 186: 07ad87a Win32: factor out retry logic
179: a2d3f15 = 187: 4d77b6c Win32: change default of 'core.symlinks' to false
180: 9bc14e2 = 188: 93348ea Win32: add symlink-specific error codes
181: d34eeb7 = 189: fb3c384 Win32: mingw_unlink: support symlinks to directories
182: ab63096 = 190: 1802cf2 Win32: mingw_rename: support renaming symlinks
183: d40f2b0 = 191: b32ff9a Win32: mingw_chdir: change to symlink-resolved directory
184: fd2b6ed = 192: 0137e5b Win32: implement readlink()
185: c75bdec = 193: 7cbbc7e mingw: lstat: compute correct size for symlinks
186: 5e2eb17 = 194: d9676dc Win32: implement basic symlink() functionality (file symlinks only)
187: 102cf11 = 195: 3d785fc Win32: symlink: add support for symlinks to directories
188: c96e816 = 196: db59bc4 mingw: try to create symlinks without elevated permissions
189: c582bd8 = 197: 1ebcc99 mingw: emulate stat() a little more faithfully
190: 97d618e = 198: dc6fbc7 mingw: special-case index entries for symlinks with buggy size
191: f763ec7 = 199: 410c9d4 mingw: introduce code to detect whether we're inside a Windows container
194: 41f035f = 200: b9b2adc Win32: symlink: move phantom symlink creation to a separate function
192: b1a2f3c = 201: 0c61ae8 mingw: when running in a Windows container, try to rename() harder
195: ceee7f1 = 202: 9e51a9a Introduce helper to create symlinks that knows about index_state
193: 38d49a6 = 203: c394ccc mingw: move the file_attr_to_st_mode() function definition
196: 9f76016 = 204: 38f7ed5 mingw: allow to specify the symlink type in .gitattributes
202: e86fe24 = 205: 722a834 mingw: Windows Docker volumes are not symbolic links
197: 1cf49e5 = 206: bda809d Win32: symlink: add test for
symlinkattribute204: 0becea9 = 207: fba86f6 mingw: work around rename() failing on a read-only file
198: 6b1d24d = 208: 850e3ca mingw: explicitly specify with which cmd to prefix the cmdline
199: a850248 = 209: 4127450 mingw: when path_lookup() failed, try BusyBox
200: 78a45cd = 210: 864e8d8 test-lib: avoid unnecessary Perl invocation
201: 4bcaf18 = 211: 0542732 test-tool: learn to act as a drop-in replacement for
iconv203: b72eed6 = 212: 2d2de6c tests(mingw): if
iconvis unavailable, usetest-helper --iconv205: f6a5a9a = 213: d2062cc gitattributes: mark .png files as binary
206: ab6ffcf = 214: fb41649 tests: move test PNGs into t/lib-diff/
207: a07c026 = 215: a78bf1f tests: only override sort & find if there are usable ones in /usr/bin/
208: b4cfcbc = 216: 06fc9fc tests: use the correct path separator with BusyBox
209: 68ff010 = 217: ec5232f mingw: only use Bash-ism
builtin pwd -Wwhen available210: cfa1803 = 218: 91d1456 tests (mingw): remove Bash-specific pwd option
211: d48d5f2 = 219: 3d148a6 test-lib: add BUSYBOX prerequisite
212: da65a4f = 220: c282e1d t5003: use binary file from t/lib-diff/
213: b67f7f0 = 221: 1faeaf0 t5532: workaround for BusyBox on Windows
214: 103d7b3 = 222: 4623aee t5605: special-case hardlink test for BusyBox-w32
215: 14c9d27 = 223: b0095e8 t5813: allow for $PWD to be a Windows path
216: 3c78f25 = 224: 401cb93 t9200: skip tests when $PWD contains a colon
217: 66f7a2d = 225: bdf7fec mingw: add a Makefile target to copy test artifacts
218: 19430b7 = 226: a3a2b32 mingw: kill child processes in a gentler way
220: e315485 = 227: 703d0da mingw: optionally enable wsl compability file mode bits
221: 034eb03 = 228: c9076df mingw: really handle SIGINT
224: 2d20861 = 229: 25eeae7 Describe Git for Windows' architecture [no ci]
225: 79d8838 = 230: a4538e1 Modify the Code of Conduct for Git for Windows
219: cfce051 = 231: a34a4d3 mingw: do not call xutftowcs_path in mingw_mktemp
231: 4b11981 = 232: 4d02bc6 Add a GitHub workflow to monitor component updates
226: 56ce15a = 233: dd7859a CONTRIBUTING.md: add guide for first-time contributors
222: d9da48c = 234: 778b3f0 Partially un-revert "editor: save and reset terminal after calling EDITOR"
223: 69a6f8e = 235: aed93ff reset: reinstate support for the deprecated --stdin option
233: 7337fe1 = 236: c841d6e fsmonitor: reintroduce core.useBuiltinFSMonitor
234: b347f2c = 237: 12224bb dependabot: help keeping GitHub Actions versions up to date
227: 46a6c34 = 238: 89a6099 README.md: Add a Windows-specific preamble
228: 34bbb92 = 239: 2a5e47a Add an issue template
229: b0d782a = 240: 8a0c069 Modify the GitHub Pull Request template (to reflect Git for Windows)
230: 79df07f = 241: 526471d .github: Add configuration for the Sentiment Bot
232: 15f95ac = 242: e2b472d Document how $HOME is set on Windows
235: 95bf514 = 243: d726d6c SECURITY.md: document Git for Windows' policies
242: 2ff44f2 < -: ------------ fixup! pack-objects: add --full-name-hash option
243: aa104fd < -: ------------ fixup! repack: test --full-name-hash option
244: 458ad63 < -: ------------ fixup! p5313: add size comparison test
245: 01dbf18 < -: ------------ fixup! test-tool: add helper for name-hash values
The differences are explained by the
fixup!s of #5157 and by reordering theGIT_TEST_FULL_NAME_HASHpatch before theGIT_TEST_FSCACHEpatch.