Rebase to v2.44.0-rc0 #4801
Merged
Rebase to v2.44.0-rc0 #4801
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
To verify that the `clean` side of the `clean`/`smudge` filter code is correct with regards to LLP64 (read: to ensure that `size_t` is used instead of `unsigned long`), here is a test case using a trivial filter, specifically _not_ writing anything to the object store to limit the scope of the test case. As in previous commits, the `big` file from previous test cases is reused if available, to save setup time, otherwise re-generated. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In the case of Git for Windows (say, in a Git Bash window) running in a Windows Subsystem for Linux (WSL) directory, the GetNamedSecurityInfoW() call in is_path_owned_By_current_side() returns an error code other than ERROR_SUCCESS. This is consistent behavior across this boundary. In these cases, the owner would always be different because the WSL owner is a different entity than the Windows user. The change here is to suppress the error message that looks like this: error: failed to get owner for '//wsl.localhost/...' (1) Before this change, this warning happens for every Git command, regardless of whether the directory is marked with safe.directory. Signed-off-by: Derrick Stolee <derrickstolee@github.com>
For Windows builds >= 15063 set $env:TERM to "xterm-256color" instead of "cygwin" because they have a more capable console system that supports this. Also set $env:COLORTERM="truecolor" if unset. $env:TERM is initialized so that ANSI colors in color.c work, see 29a3963 (Win32: patch Windows environment on startup, 2012-01-15). See git-for-windows#3629 regarding problems caused by always setting $env:TERM="cygwin". This is the same heuristic used by the Cygwin runtime. Signed-off-by: Rafael Kitover <rkitover@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NtQueryObject under Wine can return a success but fill out no name. In those situations, Wine will set Buffer to NULL, and set result to the sizeof(OBJECT_NAME_INFORMATION). Running a command such as echo "$(git.exe --version 2>/dev/null)" will crash due to a NULL pointer dereference when the code attempts to null terminate the buffer, although, weirdly, removing the subshell or redirecting stdout to a file will not trigger the crash. Code has been added to also check Buffer and Length to ensure the check is as robust as possible due to the current behavior being fragile at best, and could potentially change in the future This code is based on the behavior of NtQueryObject under wine and reactos. Signed-off-by: Christopher Degawa <ccom@randomderp.com>
Atomic append on windows is only supported on local disk files, and it may cause errors in other situations, e.g. network file system. If that is the case, this config option should be used to turn atomic append off. Co-Authored-By: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: 孙卓识 <sunzhuoshi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is another fall-out of the recent refactoring flurry. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This fixes the build after 7bc341e (git-compat-util: add a test balloon for C99 support, 2021-12-01). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is now passed by default, ever since 6a8cbc4 (developer: enable pedantic by default, 2021-09-03). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Since ef8a6c6 (reftable: utility functions, 2021-10-07) we not only have a libreftable, but also a libreftable_test. 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>
Visual Studio 2022 does not like that at all. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
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>
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>
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>
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>
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
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>
|
The range-diff looks a bit busy around mimalloc, essentially because for every mimalloc commit on the right side, there are three on the left: the v2.0.9 one, the revert thereof, and the v2.1.2 one. So that's all legitimate. I was considering to upgrade MSYS2 runtime to v3.5.0, even if it was just released end of January. But I've decided not to rush this, for at least the following reasons:
I adjusted the release notes accordingly in git-for-windows/build-extra@55dff2c0c. |
|
/git-artifacts The The |
|
/release The |
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.
Range-diff relative to main
1: 444adc1 = 1: eb7ae2c gitk(Windows): avoid inadvertently calling executables in the worktree
2: 85ae9da ! 2: 8ec1763 t9350: point out that refs are not updated correctly
@@ Commit message Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> ## t/t9350-fast-export.sh ## -@@ t/t9350-fast-export.sh: test_expect_success 'fast-export --first-parent outputs all revisions output by - ) +@@ t/t9350-fast-export.sh: test_expect_success 'fast-export handles --end-of-options' ' + test_cmp expect actual ' +cat > expected << EOF3: a805e55 = 3: b23a328 transport-helper: add trailing --
4: d7249a4 = 4: ed0a844 remote-helper: check helper status after import/export
5: 8069561 = 5: 795df89 mingw: demonstrate a problem with certain absolute paths
6: e8e8cdd = 6: cf13025 clean: do not traverse mount points
7: ba23ba8 = 7: d356b85 mingw: include the Python parts in the build
8: 7d12a3e ! 8: 4df7f74 Always auto-gc after calling a fast-import transport
9: 75dfd3f = 9: 868992b mingw: allow absolute paths without drive prefix
10: db74209 = 10: d7814f9 clean: remove mount points when possible
11: 7c787d9 = 11: 713527b win32/pthread: avoid name clashes with winpthread
12: 132b00b = 12: 3d44f17 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
13: 3003051 < -: ------------ Import the source code of mimalloc v2.0.9
14: 7e401c4 < -: ------------ mimalloc: adjust for building inside Git
15: 6b98696 < -: ------------ mimalloc: offer a build-time option to enable it
16: f73e718 < -: ------------ mimalloc: use "weak" random seed when statically linked
234: f2485ba ! 13: 349f777 amend! Import the source code of mimalloc v2.0.9
235: ab1a8a0 ! 14: e206f41 fixup! mimalloc: adjust for building inside Git
236: 64fa6e2 ! 15: f2ddbf3 fixup! mimalloc: offer a build-time option to enable it
237: 1475d9f ! 16: d31fba5 fixup! mimalloc: use "weak" random seed when statically linked
17: c5d6ddd = 17: 9ce9df3 mingw: use mimalloc
18: 462783b = 18: 24eeb18 transport: optionally disable side-band-64k
19: c6cd2ec = 19: 6a694f1 mingw: make sure
errnois set correctly when socket operations fail20: e48f6a3 = 20: c649490 mingw: do resolve symlinks in
getcwd()21: d49abb6 = 21: 76dc36c mingw: fix fatal error working on mapped network drives on Windows
23: e400b23 = 22: bab3249 mingw: ensure valid CTYPE
24: 33d289a = 23: 0110f9a mingw: demonstrate a
git addissue with NTFS junctions26: cce2ba3 = 24: 3560b11 mingw: allow
git.exeto be used instead of the "Git wrapper"27: cdb733e = 25: 9ada5de strbuf_realpath(): use platform-dependent API if available
29: 1090ed7 = 26: 1ccff87 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
31: a89c21b = 27: e53cde2 clink.pl: fix MSVC compile script to handle libcurl-d.lib
32: 2b8d16d = 28: 470a863 mingw: implement a platform-specific
strbuf_realpath()22: a9586c1 = 29: 99dfbb5 vcxproj: unclash project directories with build outputs
25: fa8ea8a = 30: 4e42bbc t5505/t5516: allow running without
.git/branches/in the templates28: 4280e73 = 31: 1764571 t5505/t5516: fix white-space around redirectors
30: 26bc710 = 32: 8617793 http: use new "best effort" strategy for Secure Channel revoke checking
33: 19664ce = 33: b432525 t3701: verify that we can add lots of files interactively
40: 7ec2d2e = 34: ff98b84 git add -i: handle CR/LF line endings in the interactive input
41: 8b0ed82 = 35: c80db0f commit: accept "scissors" with CR/LF line endings
34: 79ebcf0 = 36: d339319 clink.pl: fix libexpatd.lib link error when using MSVC
35: dc31b7e = 37: 6701301 Makefile: clean up .ilk files when MSVC=1
36: e408869 = 38: e759b02 vcbuild: add support for compiling Windows resource files
42: c5bb002 = 39: d9819aa t0014: fix indentation
43: 29f17b0 = 40: 12ec6cb git-gui: accommodate for intent-to-add files
37: b45a65c = 41: bc19814 config.mak.uname: add git.rc to MSVC builds
38: 23b55df = 42: 96d5def clink.pl: ignore no-stack-protector arg on MSVC=1 builds
39: c04992b = 43: 38be606 clink.pl: move default linker options for MSVC=1 builds
48: 7cb087c = 44: acf87e9 buildsystems: remove duplicate clause
50: e931332 = 45: f9b959b vcxproj: handle resource files, too
52: 65d1ba3 = 46: 9ad52f9 vcxproj: ignore -fno-stack-protector and -fno-common
44: 6b7a408 = 47: e447a1e vcpkg_install: detect lack of Git
54: 15b2818 = 48: e48e360 vcxproj: handle GUI programs, too
45: 92d2318 = 49: 8f19423 vcpkg_install: add comment regarding slow network connections
56: 1141548 = 50: e657e64 cmake: install headless-git.
46: b343360 = 51: b07c00c vcxproj: support building Windows/ARM64 binaries
47: 1854fdc = 52: d609b85 vcbuild: install ARM64 dependencies when building ARM64 binaries
49: 1ac32a1 = 53: 4c84da2 vcbuild: add an option to install individual 'features'
51: c633044 = 54: 8b7fdd9 cmake: allow building for Windows/ARM64
53: 14dfc96 = 55: a447767 ci(vs-build) also build Windows/ARM64 artifacts
55: 4bda34f = 56: f7954f5 Add schannel to curl installation
57: 049c05d = 57: d762b9d cmake(): allow setting HOST_CPU for cross-compilation
62: 0be4169 = 58: 05eba36 ci(vs-build): download the vcpkg artifacts using a dedicated Action
63: 690990d = 59: 1c9a318 mingw: allow for longer paths in
parse_interpreter()60: 4af23bb = 60: c855be1 subtree: update
contrib/subtreetesttarget64: 448b7b7 = 61: 95f0b13 compat/vcbuild: document preferred way to build in Visual Studio
65: 4cada36 = 62: 7aaa6dc http: optionally send SSL client certificate
66: 09d06f9 ! 63: 065c692 ci: run
contrib/subtreetests in CI builds58: fa4226a = 64: 3710340 CMake: default Visual Studio generator has changed
59: acf2d02 = 65: b23eb9f .gitignore: add Visual Studio CMakeSetting.json file
61: 43ebef0 = 66: 809634c CMakeLists: add default "x64-windows" arch for Visual Studio
67: 735d902 = 67: 414841d CMake: show Win32 and Generator_platform build-option values
75: 9a3b5de = 68: 1667cfc init: do parse all core.* settings early
76: 8231190 ! 69: 66dc4f6 Enable the built-in FSMonitor as an experimental feature
@@ repo-settings.c #include "config.h" #include "repository.h" #include "midx.h" --#include "compat/fsmonitor/fsm-listen.h" +#include "fsmonitor-ipc.h" +#include "fsmonitor-settings.h"68: a53ec05 = 70: 68bb0cc hash-object: demonstrate a >4GB/LLP64 problem
69: 2de956f = 71: 254707b write_object_file_literally(): use size_t
70: 4f94774 = 72: 0b4a921 object-file.c: use size_t for header lengths
71: 960e613 = 73: a7172a5 hash algorithms: use size_t for section lengths
72: c2ac4da = 74: bd50e8c hash-object --stdin: verify that it works with >4GB/LLP64
73: f2d6929 = 75: c752b1d hash-object: add another >4GB/LLP64 test case
74: d4e75fe = 76: 8beb33a setup: properly use "%(prefix)/" when in WSL
77: ea54e11 = 77: adfa9af hash-object: add a >4GB/LLP64 test case using filtered input
78: 0d1afb3 = 78: 4d5f6bc compat/mingw.c: do not warn when failing to get owner
79: 6a597dd = 79: 09b582e mingw: $env:TERM="xterm-256color" for newer OSes
92: 967fc79 = 80: ee67164 winansi: check result and Buffer before using Name
90: 71d2cd7 ! 81: 4194acd Add config option
windows.appendAtomically80: 75ba11c = 82: 4dd1012 vcxproj: allow building with
NO_PERLagain81: 041dd26 = 83: 75b29d5 vcxproj: require C11
82: 2ae297b = 84: 5f42f98 vcxproj: ignore the
-pedanticoption83: e8abe8c = 85: b1dce61 vcxproj: include reftable when committing
.vcxprojfiles84: e8b3a15 = 86: 1398194 vcxproj: handle libreftable_test, too
93: 84a99ff = 87: 6af63c9 mingw: change core.fsyncObjectFiles = 1 by default
85: cacf406 = 88: bdda4a9 vcxproj: avoid escaping double quotes in the defines
86: 28770b0 ! 89: 9356e8a ci: adjust Azure Pipeline for
runs_on_pool87: 639d82f = 90: e5e3418 ci: stop linking the
provecache88: 3ba4ca5 = 91: bf1de07 ci: reinstate Azure Pipelines support
89: 37d0674 = 92: 9f2a988 azure-pipeline: drop the
GETTEXT_POISONjob91: b17ffda = 93: 90d5aa1 azure-pipeline: stop hard-coding
apt-getcalls94: 21b3505 = 94: 2efc682 azure-pipeline: drop the code to write to/read from a file share
95: 5c3f962 = 95: f02cef7 azure-pipeline: use partial clone/parallel checkout to initialize minimal-sdk
97: 104877d = 96: f89636b azure-pipeline: downcase the job name of the
Linux32job99: 0ee2091 = 97: 4d7fc2f MinGW: link as terminal server aware
96: 9a5e14b = 98: fc4ba85 bswap.h: add support for built-in bswap functions
100: 61ad738 = 99: e7164df azure-pipeline: run static-analysis on jammy
101: cfc4a15 = 100: 0d4081b Fix Windows version resources
106: ce2c56e = 101: 8c72ab3 http: optionally load libcurl lazily
107: 3320c2a = 102: 359804e http: support lazy-loading libcurl also on Windows
108: 6da619b = 103: df832a2 http: when loading libcurl lazily, allow for multiple SSL backends
103: ad9dd9a = 104: d48d4a1 status: fix for old-style submodules with commondir
104: c49fb9f = 105: 575360d windows: skip linking
git-<command>for built-ins105: 40b44e6 = 106: 758eb76 windows: fix Repository>Explore Working Copy
109: 069dfe0 = 107: 5f391ca mingw: do load libcurl dynamically by default
111: 29e96c7 ! 108: f8c5c67 mingw: suggest
windows.appendAtomicallyin more cases@@ compat/mingw.c: ssize_t mingw_write(int fd, const void *buf, size_t len) { ssize_t result = write(fd, buf, len); -- if (result < 0 && errno == EINVAL && buf) { -+ if (result < 0 && (errno == EINVAL || errno == EBADF) && buf) { +- if (result < 0 && (errno == EINVAL || errno == ENOSPC) && buf) { ++ if (result < 0 && (errno == EINVAL || errno == EBADF || errno == ENOSPC) && buf) { + int orig = errno; + /* check if fd is a pipe */ HANDLE h = (HANDLE) _get_osfhandle(fd); - if (GetFileType(h) == FILE_TYPE_PIPE) + if (GetFileType(h) != FILE_TYPE_PIPE) + errno = orig; +- else if (orig == EINVAL) ++ else if (orig == EINVAL || errno == EBADF) + errno = EPIPE; + else { + DWORD buf_size;228: cf15942 = 109: ad1a318 win32: use native ANSI sequence processing, if possible
229: 5b49f4c ! 110: c6e18ad git.rc: include winuser.h
@@ contrib/buildsystems/Generators/Vcxproj.pm @@ contrib/buildsystems/Generators/Vcxproj.pm: sub createProject { <AdditionalDependencies>\$(VCPKGLibs);\$(AdditionalDependencies)</AdditionalDependencies> <AdditionalOptions>invalidcontinue.obj %(AdditionalOptions)</AdditionalOptions> - <EntryPointSymbol>$entrypoint</EntryPointSymbol> + <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol> - <ManifestFile>$cdup\\compat\\win32\\git.manifest</ManifestFile> - <SubSystem>$subsystem</SubSystem> + <SubSystem>Console</SubSystem> </Link> EOM238: dbf9e66 = 111: dc95f4d dependabot: help keeping GitHub Actions versions up to date
242: fe404de = 112: 9471bc6 build(deps): bump actions/cache from 3 to 4
241: 400f545 = 113: 742b547 build(deps): bump mshick/add-pr-comment from 1 to 2
239: ba3c774 = 114: b3ee228 build(deps): bump actions/setup-go from 2 to 5
240: f96be1d ! 115: ac09146 build(deps): bump actions/download-artifact from 3 to 4
@@ .github/workflows/main.yml: jobs: - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: vs-artifacts-x64 + name: vs-artifacts path: ${{github.workspace}}243: 3a6b997 ! 116: 8d2729e ci: bump actions/upload-artifact to v4
@@ .github/workflows/main.yml: jobs: - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: vs-artifacts-${{ matrix.arch }} + name: vs-artifacts path: artifacts @@ .github/workflows/main.yml: jobs: run: ci/print-test-failures.sh244: 5ffe915 ! 117: dd75561 build(deps): bump actions/checkout from 3 to 4
@@ .github/workflows/check-whitespace.yml: jobs: fetch-depth: 0 - ## .github/workflows/clangarm64-build.yml ## -@@ .github/workflows/clangarm64-build.yml: jobs: - env: - NO_PERL: 1 - steps: -- - uses: actions/checkout@v3 -+ - uses: actions/checkout@v4 - - uses: git-for-windows/setup-git-for-windows-sdk@v1 - with: - flavor: makepkg-git - ## .github/workflows/coverity.yml ## @@ .github/workflows/coverity.yml: jobs: COVERITY_LANGUAGE: cxx @@ .github/workflows/main.yml: jobs: - name: build shell: bash @@ .github/workflows/main.yml: jobs: - group: vs-build-${{ github.ref }}-${{ matrix.arch }} + group: vs-build-${{ github.ref }} cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }} steps: - - uses: actions/checkout@v3 @@ .github/workflows/main.yml: jobs: + - uses: actions/checkout@v4 - run: ci/install-dependencies.sh - run: ci/test-documentation.sh - - ## .github/workflows/nano-server.yml ## -@@ .github/workflows/nano-server.yml: jobs: - IMAGE: mcr.microsoft.com/powershell:nanoserver-ltsc2022 - - steps: -- - uses: actions/checkout@v3 -+ - uses: actions/checkout@v4 - - uses: git-for-windows/setup-git-for-windows-sdk@v1 - - name: build Git - shell: bash98: d6e5da1 = 118: af7ae49 config.mak.uname: add support for clangarm64
102: d9916fb ! 119: 2849c15 ci: create clangarm64-build.yml
110: 85cc10d ! 120: a8f4b84 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
112: 948d5be = 121: 4619239 Win32: make FILETIME conversion functions public
113: 6038c03 = 122: b8f812c Win32: dirent.c: Move opendir down
114: 8872981 = 123: 73027ed mingw: make the dirent implementation pluggable
115: 81f30c8 = 124: 32d5356 Win32: make the lstat implementation pluggable
116: ba627c6 ! 125: abb83bc mingw: add infrastructure for read-only file system level caches
@@ compat/mingw.c: int mingw_core_config(const char *var, const char *value, + } + if (!strcmp(var, "core.unsetenvvars")) { - free(unset_environment_variables); - unset_environment_variables = xstrdup(value); + if (!value) + return config_error_nonbool(var); ## compat/mingw.h ## @@ compat/mingw.h: typedef _sigset_t sigset_t;117: 7441457 = 126: bc9194e mingw: add a cache below mingw's lstat and dirent implementations
118: 7a255d1 = 127: 2b2895f fscache: load directories only once
119: ebbfe19 = 128: 8a0b4db fscache: add key for GIT_TRACE_FSCACHE
120: 4bb117f = 129: d6d8974 fscache: remember not-found directories
121: b995381 = 130: 8dbd532 fscache: add a test for the dir-not-found optimization
122: 1fba90b = 131: 8650575 add: use preload-index and fscache for performance
123: 92180f8 = 132: ae4b42e dir.c: make add_excludes aware of fscache during status
124: d72ca85 = 133: 6a2343d fscache: make fscache_enabled() public
125: 692aacd = 134: c1585e2 dir.c: regression fix for add_excludes with fscache
126: b4dcd99 = 135: 717aa9a fetch-pack.c: enable fscache for stats under .git/objects
127: 667ff29 = 136: 058b1ac checkout.c: enable fscache for checkout again
128: 02f37d0 = 137: 556779e Enable the filesystem cache (fscache) in refresh_index().
129: 3c09bb2 = 138: 8985e6d fscache: use FindFirstFileExW to avoid retrieving the short name
130: c855801 = 139: c0e9478 status: disable and free fscache at the end of the status command
131: 54d3d7e = 140: 0f9047d fscache: add GIT_TEST_FSCACHE support
132: e1d15df = 141: 601a472 fscache: add fscache hit statistics
133: 764e4f3 = 142: 5242cc1 mem_pool: add GIT_TRACE_MEMPOOL support
134: e209c76 = 143: 217332c fscache: fscache takes an initial size
135: 17cd9bb = 144: 87a49f2 fscache: update fscache to be thread specific instead of global
136: 22746c4 = 145: d2d53d5 fscache: teach fscache to use mempool
137: 5f28638 = 146: 80126ad fscache: make fscache_enable() thread safe
139: c7aa1e1 = 147: ae387da fscache: teach fscache to use NtQueryDirectoryFile
141: cd52454 = 148: 4d2d6ae unpack-trees: enable fscache for sparse-checkout
143: b88cd6c = 149: a1ff8e8 fscache: remember the reparse tag for each entry
145: ab9cb06 = 150: 7f6d364 fscache: implement an FSCache-aware is_mount_point()
138: a8cc160 = 151: 4b1b1b2 git-gui: provide question helper for retry fallback on Windows
140: c552636 = 152: 78e1b53 git gui: set GIT_ASKPASS=git-gui--askpass if not set yet
142: 0e00315 = 153: b15d3d9 git-gui--askyesno: fix funny text wrapping
144: 603e1b6 = 154: aedb111 git-gui--askyesno: allow overriding the window title
146: 3272a87 = 155: 35800e6 git-gui--askyesno (mingw): use Git for Windows' icon, if available
147: b6ae399 = 156: c377509 clean: make use of FSCache
148: 81d772a = 157: b78ed88 gitk: Unicode file name support
149: 01d320c = 158: 0fac83d gitk: Use an external icon file on Windows
150: 7538786 = 159: c93db98 gitk: fix arrow keys in input fields with Tcl/Tk >= 8.6
151: 22f5372 = 160: f74888f gitk: make the "list references" default window width wider
152: 0f59f8f = 161: e9683b8 pack-objects (mingw): demonstrate a segmentation fault with large deltas
153: 51595c8 ! 162: c4f7e1e mingw: support long paths
154: dda6a7f = 163: 32624bb Win32: fix 'lstat("dir/")' with long paths
155: 0d7694c = 164: 1b6d157 win32(long path support): leave drive-less absolute paths intact
163: 5f33b10 = 165: c020f14 compat/fsmonitor/fsm-*-win32: support long paths
164: 35d21d9 ! 166: 9c161b1 clean: suggest using
core.longPathsif paths are too long to remove156: 6929de4 = 167: 7b3ecaa mingw: Support
git_terminal_promptwith more terminals157: 8bdef24 = 168: d4a2b56 compat/terminal.c: only use the Windows console if bash 'read -r' fails
158: 0cafc23 = 169: 83d310a mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
159: d0f54cd = 170: fede48b Unbreak interactive GPG prompt upon signing
160: fbbddd1 = 171: 34a933a strbuf_readlink: don't call readlink twice if hint is the exact link size
161: 3cc155b = 172: 42cf85d strbuf_readlink: support link targets that exceed PATH_MAX
162: 2e6e2fe = 173: fa1bf38 lockfile.c: use is_dir_sep() instead of hardcoded '/' checks
165: 6dc7506 = 174: 6f1a739 Win32: don't call GetFileAttributes twice in mingw_lstat()
166: 51eca88 = 175: dada6d0 Win32: implement stat() with symlink support
167: f12e8e5 = 176: 2a2665c Win32: remove separate do_lstat() function
168: 35e7efe = 177: 996eb09 Win32: let mingw_lstat() error early upon problems with reparse points
169: 0666e14 = 178: 185b204 mingw: teach fscache and dirent about symlinks
170: 27a0d89 = 179: 113ca09 Win32: lstat(): return adequate stat.st_size for symlinks
171: 114bb1d = 180: 534a752 Win32: factor out retry logic
172: 7c70d3a = 181: 179020e Win32: change default of 'core.symlinks' to false
173: a2792ba = 182: 1d95e40 Win32: add symlink-specific error codes
174: 2690c18 = 183: 3148b50 Win32: mingw_unlink: support symlinks to directories
175: 030f991 = 184: 4491333 Win32: mingw_rename: support renaming symlinks
176: 6410145 = 185: 2a19c8e Win32: mingw_chdir: change to symlink-resolved directory
177: a340906 = 186: 977b781 Win32: implement readlink()
178: 558f73e = 187: fccf215 mingw: lstat: compute correct size for symlinks
179: a07e093 = 188: 18ca6d4 Win32: implement basic symlink() functionality (file symlinks only)
180: d0938d5 = 189: aceda06 Win32: symlink: add support for symlinks to directories
181: 70fd176 = 190: a6b014c mingw: try to create symlinks without elevated permissions
182: dc4f744 = 191: 1dc87ff mingw: emulate stat() a little more faithfully
183: d5060da = 192: b24bb5c mingw: special-case index entries for symlinks with buggy size
186: 21fea19 = 193: 8f4dae0 mingw: introduce code to detect whether we're inside a Windows container
188: e899f4d = 194: b13757e mingw: when running in a Windows container, try to rename() harder
184: d5ffb7f = 195: 7c0eb61 Win32: symlink: move phantom symlink creation to a separate function
190: 29c444c = 196: 2852c4e mingw: move the file_attr_to_st_mode() function definition
185: 732e863 = 197: c6fd0ea Introduce helper to create symlinks that knows about index_state
192: f927210 = 198: 3d21db0 mingw: Windows Docker volumes are not symbolic links
187: cc600fa = 199: 3b56754 mingw: allow to specify the symlink type in .gitattributes
194: 00801b0 = 200: 8732850 mingw: work around rename() failing on a read-only file
189: 706a2bf = 201: 4a500ff Win32: symlink: add test for
symlinkattribute191: bed13a7 = 202: 3f4790b mingw: explicitly specify with which cmd to prefix the cmdline
193: 2eec72e = 203: ab039e9 mingw: when path_lookup() failed, try BusyBox
195: b20b278 = 204: 35e7204 test-lib: avoid unnecessary Perl invocation
196: daa8ca3 = 205: 9dd0520 test-tool: learn to act as a drop-in replacement for
iconv197: bb2f2b2 = 206: ee66969 tests(mingw): if
iconvis unavailable, usetest-helper --iconv198: 64861d7 = 207: 6cfa349 gitattributes: mark .png files as binary
199: 4acdb1a = 208: f941f55 tests: move test PNGs into t/lib-diff/
200: 56bb764 = 209: 6bf2469 tests: only override sort & find if there are usable ones in /usr/bin/
201: cb6e0f8 ! 210: 4a15dc6 tests: use the correct path separator with BusyBox
202: 5b38421 = 211: 9b21147 mingw: only use Bash-ism
builtin pwd -Wwhen available203: bf4571a = 212: 1432f3b tests (mingw): remove Bash-specific pwd option
204: ba5b140 = 213: ee9645f test-lib: add BUSYBOX prerequisite
205: 939ee14 = 214: 32f116d t5003: use binary file from t/lib-diff/
206: ed1915d = 215: 27e1ff9 t5532: workaround for BusyBox on Windows
207: 6f94ed5 = 216: 388ddea t5605: special-case hardlink test for BusyBox-w32
208: 029b102 = 217: 4135380 t5813: allow for $PWD to be a Windows path
209: 707e6ad = 218: 4e1c3ca t9200: skip tests when $PWD contains a colon
210: 62cb5ce = 219: 58dfc2b mingw: add a Makefile target to copy test artifacts
211: 1118e57 = 220: 8a79bc2 mingw: kill child processes in a gentler way
213: 8cd2d55 = 221: b29a9ac mingw: optionally enable wsl compability file mode bits
214: df46739 = 222: 57cc6f2 mingw: really handle SIGINT
212: 71bc5b0 = 223: f95abb6 mingw: do not call xutftowcs_path in mingw_mktemp
215: 215f38a = 224: 1606d61 Partially un-revert "editor: save and reset terminal after calling EDITOR"
216: e83bb43 = 225: 052add7 reset: reinstate support for the deprecated --stdin option
225: e20190a ! 226: 6fc41b6 fsmonitor: reintroduce core.useBuiltinFSMonitor
217: 9e73bd9 = 227: 7db097f Describe Git for Windows' architecture [no ci]
226: 15dca1b = 228: 7a503f1 Add a GitHub workflow to monitor component updates
218: 6f46106 = 229: 666c595 Modify the Code of Conduct for Git for Windows
219: e3158c1 = 230: 8d8b80e CONTRIBUTING.md: add guide for first-time contributors
220: 3774cb8 ! 231: 80818bc README.md: Add a Windows-specific preamble
221: 464a1aa = 232: 2be1a7b Add an issue template
222: 80f9fff = 233: 08ec415 Modify the GitHub Pull Request template (to reflect Git for Windows)
223: acef9a5 = 234: f9944c3 .github: Add configuration for the Sentiment Bot
224: 639e115 = 235: 4d421e5 Document how $HOME is set on Windows
227: 6298fe1 = 236: a5db93a SECURITY.md: document Git for Windows' policies
230: 71e3d43 < -: ------------ fixup! mimalloc: use "weak" random seed when statically linked
231: 7865131 < -: ------------ fixup! mimalloc: offer a build-time option to enable it
232: 0b1b785 < -: ------------ fixup! mimalloc: adjust for building inside Git
233: 57e20a3 < -: ------------ fixup! Import the source code of mimalloc v2.0.9