Rebase to v2.55.0 rc1#6285
Merged
Merged
Conversation
The vcpkg downloads may not succeed. Warn careful readers of the time out. A simple retry will usually resolve the issue. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Git's regular Makefile mentions that HOST_CPU should be defined when cross-compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L438-L439 This is then used to set the GIT_HOST_CPU variable when compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L1337-L1341 Then, when the user runs `git version --build-options`, it returns that value: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/help.c#L658 This commit adds the same functionality to the CMake configuration. Users can now set -DHOST_CPU= to set the target architecture. Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
As reported in newren/git-filter-repo#225, it looks like 99 bytes is not really sufficient to represent e.g. the full path to Python when installed via Windows Store (and this path is used in the hasb bang line when installing scripts via `pip`). Let's increase it to what is probably the maximum sensible path size: MAX_PATH. This makes `parse_interpreter()` in line with what `lookup_prog()` handles. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Vilius Šumskas <vilius@sumskas.eu>
We used to have that `make vcxproj` hack, but a hack it is. In the meantime, we have a much cleaner solution: using CMake, either explicitly, or even more conveniently via Visual Studio's built-in CMake support (simply open Git's top-level directory via File>Open>Folder...). Let's let the `README` reflect this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This adds support for a new http.sslAutoClientCert config value. In cURL 7.77 or later the schannel backend does not automatically send client certificates from the Windows Certificate Store anymore. This config value is only used if http.sslBackend is set to "schannel", and can be used to opt in to the old behavior and force cURL to send client certificates. This fixes #3292 Signed-off-by: Pascal Muller <pascalmuller@gmail.com>
Because `git subtree` (unlike most other `contrib` modules) is included as part of the standard release of Git for Windows, its stability should be verified as consistently as it is for the rest of git. By including the `git subtree` tests in the CI workflow, these tests are as much of a gate to merging and indicator of stability as the standard test suite. Signed-off-by: Victoria Dye <vdye@github.com>
This is no longer true in general, not with supporting Clang out of the box. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This option was added in fa93bb2 (MinGW: Fix stat definitions to work with MinGW runtime version 4.0, 2013-09-11), i.e. a _long_ time ago. So long, in fact, that it still targeted MinGW. But we switched to mingw-w64 in 2015, which seems not to share the problem, and therefore does not require a fix. Even worse: This flag is incompatible with UCRT64, which we are about to support by way of upstreaming `mingw-w64-git` to the MSYS2 project, see msys2/MINGW-packages#26470 for details. So let's send that option into its well-deserved retirement. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On LLP64 systems, such as Windows, the size of `long`, `int`, etc. is only 32 bits (for backward compatibility). Git's use of `unsigned long` for file memory sizes in many places, rather than size_t, limits the handling of large files on LLP64 systems (commonly given as `>4GB`). Provide a minimum test for handling a >4GB file. The `hash-object` command, with the `--literally` and without `-w` option avoids writing the object, either loose or packed. This avoids the code paths hitting the `bigFileThreshold` config test code, the zlib code, and the pack code. Subsequent patches will walk the test's call chain, converting types to `size_t` (which is larger in LLP64 data models) where appropriate. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In bf2d5d8 (Don't let ld strip relocations, 2016-01-16) (picked from 6a237925bf10), Git for Windows introduced the `-Wl,-pic-executable` flag, specifying the exact entry point via `-e`. This required discerning between i686 and x86_64 code because the former required the symbol to be prefixed with an underscore, the latter did not. As per https://sourceware.org/bugzilla/show_bug.cgi?id=10865, the specified symbols are already the default, though. So let's drop the overly-specific definition. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue walking the code path for the >4GB `hash-object --literally` test. The `hash_object_file_literally()` function internally uses both `hash_object_file()` and `write_object_file_prepare()`. Both function signatures use `unsigned long` rather than `size_t` for the mem buffer sizes. Use `size_t` instead, for LLP64 compatibility. While at it, convert those function's object's header buffer length to `size_t` for consistency. The value is already upcast to `uintmax_t` for print format compatibility. Note: The hash-object test still does not pass. A subsequent commit continues to walk the call tree's lower level hash functions to identify further fixes. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 already defines a couple of helpful environment variables, and we can use those to infer the installation location as well as the CPU. No need for hard-coding ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue walking the code path for the >4GB `hash-object --literally`
test to the hash algorithm step for LLP64 systems.
This patch lets the SHA1DC code use `size_t`, making it compatible with
LLP64 data models (as used e.g. by Windows).
The interested reader of this patch will note that we adjust the
signature of the `git_SHA1DCUpdate()` function without updating _any_
call site. This certainly puzzled at least one reviewer already, so here
is an explanation:
This function is never called directly, but always via the macro
`platform_SHA1_Update`, which is usually called via the macro
`git_SHA1_Update`. However, we never call `git_SHA1_Update()` directly
in `struct git_hash_algo`. Instead, we call `git_hash_sha1_update()`,
which is defined thusly:
static void git_hash_sha1_update(git_hash_ctx *ctx,
const void *data, size_t len)
{
git_SHA1_Update(&ctx->sha1, data, len);
}
i.e. it contains an implicit downcast from `size_t` to `unsigned long`
(before this here patch). With this patch, there is no downcast anymore.
With this patch, finally, the t1007-hash-object.sh "files over 4GB hash
literally" test case is fixed.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The tell-tale is the presence of the `MSYSTEM` value while compiling, of course. In that case, we want to ensure that `MSYSTEM` is set when running `git.exe`, and also enable the magic MSYS2 tty detection. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Just like the `hash-object --literally` code path, the `--stdin` code path also needs to use `size_t` instead of `unsigned long` to represent memory sizes, otherwise it would cause problems on platforms using the LLP64 data model (such as Windows). To limit the scope of the test case, the object is explicitly not written to the object store, nor are any filters applied. The `big` file from the previous test case is reused to save setup time; To avoid relying on that side effect, it is generated if it does not exist (e.g. when running via `sh t1007-*.sh --long --run=1,41`). Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 defines some helpful environment variables, e.g. `MSYSTEM`. There is code in Git for Windows to ensure that that `MSYSTEM` variable is set, hard-coding a default. However, the existing solution jumps through hoops to reconstruct the proper default, and is even incomplete doing so, as we found out when we extended it to support CLANGARM64. This is absolutely unnecessary because there is already a perfectly valid `MSYSTEM` value we can use at build time. This is even true when building the MINGW32 variant on a MINGW64 system because `makepkg-mingw` will override the `MSYSTEM` value as per the `MINGW_ARCH` array. The same is equally true for the `/mingw64`, `/mingw32` and `/clangarm64` prefix: those values are already available via the `MINGW_PREFIX` environment variable, and we just need to pass that setting through. Only when `MINGW_PREFIX` is not set (as is the case in Git for Windows' minimal SDK, where only `MSYSTEM` is guaranteed to be set correctly), we use as fall-back the top-level directory whose name is the down-cased value of the `MSYSTEM` variable. Incidentally, this also broadens the support to all the configurations supported by the MSYS2 project, i.e. clang64 & ucrt64, too. Note: This keeps the same, hard-coded MSYSTEM platform support for CMake as before, but drops it for Meson (because it is unclear how Meson could do this in a more flexible manner). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A change between versions 2.4.1 and 2.6.0 of the MSYS2 runtime modified how Cygwin's runtime (and hence Git for Windows' MSYS2 runtime derivative) handles locales: d16a56306d (Consolidate wctomb/mbtowc calls for POSIX-1.2008, 2016-07-20). An unintended side-effect is that "cold-calling" into the POSIX emulation will start with a locale based on the current code page, something that Git for Windows is very ill-prepared for, as it expects to be able to pass a command-line containing non-ASCII characters to the shell without having those characters munged. One symptom of this behavior: when `git clone` or `git fetch` shell out to call `git-upload-pack` with a path that contains non-ASCII characters, the shell tried to interpret the entire command-line (including command-line parameters) as executable path, which obviously must fail. This fixes #1036 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib` rather than `libexpat.lib`. It appears that the `vcpkg` package for "libexpat" has changed and now creates `libexpatd.lib` for debug mode builds. Previously, both debug and release builds created a ".lib" with the same basename. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
In Git-for-Windows, work on using ARM64 has progressed. The commit 2d94b77 (cmake: allow building for Windows/ARM64, 2020-12-04) failed to notice that /compat/vcbuild/vcpkg_install.bat will default to using the "x64-windows" architecture for the vcpkg installation if not set, but CMake is not told of this default. Commit 635b6d9 (vcbuild: install ARM64 dependencies when building ARM64 binaries, 2020-01-31) later updated vcpkg_install.bat to accept an arch (%1) parameter, but retained the default. This default is neccessary for the use case where the project directory is opened directly in Visual Studio, which will find and build a CMakeLists.txt file without any parameters, thus expecting use of the default setting. Also Visual studio will generate internal .sln solution and .vcxproj project files needed for some extension tools. Inform users of the additional .sln/.vcxproj generation. ** How to test: rm -rf '.vs' # remove old visual studio settings rm -rf 'compat/vcbuild/vcpkg' # remove any vcpkg downloads rm -rf 'contrib/buildsystems/out' # remove builds & CMake artifacts with a fresh Visual Studio Community Edition, File>>Open>>(git *folder*) to load the project (which will take some time!). check for successful compilation. The implicit .sln (etc.) are in the hidden .vs directory created by Visual Studio. Signed-off-by: Philip Oakley <philipoakley@iee.email>
To complement the `--stdin` and `--literally` test cases that verify that we can hash files larger than 4GB on 64-bit platforms using the LLP64 data model, here is a test case that exercises `hash-object` _without_ any options. Just as before, we use the `big` file from the previous test case if it exists to save on setup time, otherwise generate it. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Special-casing even more configurations simply does not make sense. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows wants to add `git.exe` to the users' `PATH`, without cluttering the latter with unnecessary executables such as `wish.exe`. To that end, it invented the concept of its "Git wrapper", i.e. a tiny executable located in `C:\Program Files\Git\cmd\git.exe` (originally a CMD script) whose sole purpose is to set up a couple of environment variables and then spawn the _actual_ `git.exe` (which nowadays lives in `C:\Program Files\Git\mingw64\bin\git.exe` for 64-bit, and the obvious equivalent for 32-bit installations). Currently, the following environment variables are set unless already initialized: - `MSYSTEM`, to make sure that the MSYS2 Bash and the MSYS2 Perl interpreter behave as expected, and - `PLINK_PROTOCOL`, to force PuTTY's `plink.exe` to use the SSH protocol instead of Telnet, - `PATH`, to make sure that the `bin` folder in the user's home directory, as well as the `/mingw64/bin` and the `/usr/bin` directories are included. The trick here is that the `/mingw64/bin/` and `/usr/bin/` directories are relative to the top-level installation directory of Git for Windows (which the included Bash interprets as `/`, i.e. as the MSYS pseudo root directory). Using the absence of `MSYSTEM` as a tell-tale, we can detect in `git.exe` whether these environment variables have been initialized properly. Therefore we can call `C:\Program Files\Git\mingw64\bin\git` in-place after this change, without having to call Git through the Git wrapper. Obviously, above-mentioned directories must be _prepended_ to the `PATH` variable, otherwise we risk picking up executables from unrelated Git installations. We do that by constructing the new `PATH` value from scratch, appending `$HOME/bin` (if `HOME` is set), then the MSYS2 system directories, and then appending the original `PATH`. Side note: this modification of the `PATH` variable is independent of the modification necessary to reach the executables and scripts in `/mingw64/libexec/git-core/`, i.e. the `GIT_EXEC_PATH`. That modification is still performed by Git, elsewhere, long after making the changes described above. While we _still_ cannot simply hard-link `mingw64\bin\git.exe` to `cmd` (because the former depends on a couple of `.dll` files that are only in `mingw64\bin`, i.e. calling `...\cmd\git.exe` would fail to load due to missing dependencies), at least we can now avoid that extra process of running the Git wrapper (which then has to wait for the spawned `git.exe` to finish) by calling `...\mingw64\bin\git.exe` directly, via its absolute path. Testing this is in Git's test suite tricky: we set up a "new" MSYS pseudo-root and copy the `git.exe` file into the appropriate location, then verify that `MSYSTEM` is set properly, and also that the `PATH` is modified so that scripts can be found in `$HOME/bin`, `/mingw64/bin/` and `/usr/bin/`. This addresses #2283 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Ensure key CMake option values are part of the CMake output to facilitate user support when tool updates impact the wider CMake actions, particularly ongoing 'improvements' in Visual Studio. These CMake displays perform the same function as the build-options.txt provided in the main Git for Windows. CMake is already chatty. The setting of CMAKE_EXPORT_COMPILE_COMMANDS is also reported. Include the environment's CMAKE_EXPORT_COMPILE_COMMANDS value which may have been propogated to CMake's internal value. Testing the CMAKE_EXPORT_COMPILE_COMMANDS processing can be difficult in the Visual Studio environment, as it may be cached in many places. The 'environment' may include the OS, the user shell, CMake's own environment, along with the Visual Studio presets and caches. See previous commit for arefacts that need removing for a clean test. Signed-off-by: Philip Oakley <philipoakley@iee.email>
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>
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>
Getting started contributing to Git can be difficult on a Windows machine. CONTRIBUTING.md contains a guide to getting started, including detailed steps for setting up build tools, running tests, and submitting patches to upstream. [includes an example by Pratik Karki how to submit v2, v3, v4, etc.] Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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 `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
Start monitoring updates of Git for Windows' component in the open
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>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
rebase-to-v2.55.0-rc1
branch
from
2a1f040 to
761600d
Compare
Member
Author
|
/git-artifacts The |
Validate the installer manuallyThe installer was built successfully; |
Member
Author
|
/release The |
|
@dscho, please Share on Bluesky and send the announcement email. |
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.
Range-diff relative to origin/main
1: de9fc5c = 1: 531bca7 compat/msvc: use _chsize_s for ftruncate
2: 1fd7646 = 2: 66a642c patch-delta: use size_t for sizes
3: ddb7532 = 3: 271a529 pack-objects(check_pack_inflate()): use size_t instead of unsigned long
4: bdebc36 = 4: 5c32953 packfile: widen unpack_entry()'s size out-parameter to size_t
5: 68750ba = 5: 01b9209 pack-objects: use size_t for in-core object sizes
6: 460d733 = 6: 12c142f packfile,delta: drop the
cast_size_t_to_ulong()wrappers7: f3aeae9 ! 7: 37d030d odb: use size_t for object_info.sizep and the size APIs
8: d0f9ee4 = 8: b8dc300 ci(dockerized): reduce the PID limit for private repositories
10: 54f20fd = 9: 25bb2b5 unix-socket: avoid leak when initialization fails
9: 04e886a = 10: 74dfd6a mingw: skip symlink type auto-detection for network share targets
11: d09d2e8 = 11: 32ccae9 grep: prevent
^$false match at end of file12: 41e957b < -: ------------ t9350: point out that refs are not updated correctly
19: 610f72e = 12: 6b9510f mingw: include the Python parts in the build
22: cef53cf = 13: 25111f3 mingw: prevent regressions with "drive-less" absolute paths
23: b06b088 = 14: 89b73ad transport: optionally disable side-band-64k
27: 2cb9753 = 15: 5d3cfae ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
28: 286ea6a = 16: 3cc892f vcpkg_install: detect lack of Git
29: b36b9fa = 17: d2354c7 vcpkg_install: add comment regarding slow network connections
30: a9f03e5 = 18: 921d280 vcbuild: install ARM64 dependencies when building ARM64 binaries
31: 0b849c5 = 19: d423aaa vcbuild: add an option to install individual 'features'
32: 30cbe0c = 20: 3113390 cmake: allow building for Windows/ARM64
33: 2d6b0ee = 21: e08df58 ci(vs-build) also build Windows/ARM64 artifacts
34: 4a80989 = 22: 447fb2d Add schannel to curl installation
35: 80d5755 = 23: 90cb663 cmake(): allow setting HOST_CPU for cross-compilation
14: c7d81ee = 24: 117ecb0 mingw: demonstrate a
git addissue with NTFS junctions15: c6de88c = 25: 94b5b58 t5505/t5516: allow running without
.git/branches/in the templates36: b1cbb40 = 26: 416301f CMake: default Visual Studio generator has changed
17: a0f8f8f = 27: c3df5f8 strbuf_realpath(): use platform-dependent API if available
18: 0f635fd = 28: 9c98ddd http: use new "best effort" strategy for Secure Channel revoke checking
38: 2c60253 = 29: 35ba608 subtree: update
contrib/subtreetesttarget20: b4ce555 = 30: 96bcc24 t5505/t5516: fix white-space around redirectors
37: 45168c9 = 31: 05bcb03 .gitignore: add Visual Studio CMakeSetting.json file
24: 1109e8c = 32: ce2cf7e mingw: fix fatal error working on mapped network drives on Windows
25: c240d4b = 33: 1a9dd2b clink.pl: fix MSVC compile script to handle libcurl-d.lib
26: 8a43374 = 34: 5bd56bc mingw: implement a platform-specific
strbuf_realpath()41: d62cb28 = 35: 2629c4a t3701: verify that we can add lots of files interactively
42: 89cd4ea = 36: 82de25f commit: accept "scissors" with CR/LF line endings
43: 23dbb89 = 37: 3509ba6 t0014: fix indentation
44: 477b99a = 38: f1a391a git-gui: accommodate for intent-to-add files
45: b3213b6 = 39: 4b504f0 mingw: allow for longer paths in
parse_interpreter()46: d8e0669 = 40: f09d5b8 compat/vcbuild: document preferred way to build in Visual Studio
47: 18bf7ef = 41: 1ae7df9 http: optionally send SSL client certificate
48: a3a10f2 = 42: 956de5b ci: run
contrib/subtreetests in CI builds51: 7e69720 = 43: 9be4397 windows: skip linking
git-<command>for built-ins52: ef24c9b = 44: ee14b7c mingw: stop hard-coding
CC = gcc53: f2b6e3b = 45: fc5f1df mingw: drop the -D_USE_32BIT_TIME_T option
55: c77b4a0 = 46: 2aea5f2 mingw: only use -Wl,--large-address-aware for 32-bit builds
57: 05fa365 = 47: 892554a mingw: avoid over-specifying
--pic-executable61: e9b1b71 = 48: b5142f0 mingw: set the prefix and HOST_CPU as per MSYS2's settings
70: 3a86386 = 49: 2d90535 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
71: 5c59e1c = 50: 254866d mingw: rely on MSYS2's metadata instead of hard-coding it
72: aed6dba = 51: 8be27f0 mingw: always define
ETC_*for MSYS2 environments73: daf52c6 = 52: 3ad39ee max_tree_depth: lower it for clang builds in general on Windows
74: 8a1a808 = 53: b04b9fb mingw: ensure valid CTYPE
40: f315506 = 54: f29f4fa hash-object: demonstrate a >4GB/LLP64 problem
75: e53db48 = 55: 831cb4d mingw: allow
git.exeto be used instead of the "Git wrapper"50: 05f99d5 = 56: 7a4ab7a object-file.c: use size_t for header lengths
76: ed6cea2 = 57: 93cd8aa mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
54: 498e517 = 58: 7b97ef5 hash algorithms: use size_t for section lengths
56: 0a9f94f = 59: 0838ed3 hash-object --stdin: verify that it works with >4GB/LLP64
77: 918d768 = 60: 6f14868 clink.pl: fix libexpatd.lib link error when using MSVC
39: effcaa8 = 61: 94fe6a4 CMakeLists: add default "x64-windows" arch for Visual Studio
58: d8fe3c3 = 62: a788e44 hash-object: add another >4GB/LLP64 test case
59: c9fb0e8 = 63: a69537a setup: properly use "%(prefix)/" when in WSL
60: 94c9507 = 64: 37ebc7f Add config option
windows.appendAtomically78: 515a11d = 65: 29e6160 Makefile: clean up .ilk files when MSVC=1
62: d827db3 = 66: 43aee0b MinGW: link as terminal server aware
49: 0b82bc8 = 67: 30edc6d CMake: show Win32 and Generator_platform build-option values
63: a2fcb40 = 68: f5ecaf8 hash-object: add a >4GB/LLP64 test case using filtered input
64: 264d52d = 69: 2e66641 compat/mingw.c: do not warn when failing to get owner
65: 47c6f68 = 70: eacfc35 mingw: $env:TERM="xterm-256color" for newer OSes
66: a78ec9f = 71: 1a91b93 winansi: check result and Buffer before using Name
67: 1fdd0d3 ! 72: 18f689a mingw: change core.fsyncObjectFiles = 1 by default
68: 5b71da5 = 73: 2086020 Fix Windows version resources
69: 64acc36 = 74: b58439a status: fix for old-style submodules with commondir
79: 5aac754 = 75: 7e43f92 vcbuild: add support for compiling Windows resource files
80: 0f7b4fe = 76: 94ef834 config.mak.uname: add git.rc to MSVC builds
81: ec245f7 = 77: faa8d5d clink.pl: ignore no-stack-protector arg on MSVC=1 builds
82: 0270dbd = 78: 9ae8eaf http: optionally load libcurl lazily
83: d35b1d9 = 79: 6081d57 clink.pl: move default linker options for MSVC=1 builds
84: 83d7f0b = 80: 2cf919c http: support lazy-loading libcurl also on Windows
93: 3efe890 = 81: 897ce9b revision: create mark_trees_uninteresting_dense()
85: c3e6b22 = 82: ad1f1c0 cmake: install headless-git.
86: 78345d8 = 83: 8b4c49f http: when loading libcurl lazily, allow for multiple SSL backends
100: cde6104 = 84: de15876 mingw: make sure
errnois set correctly when socket operations fail94: a3adc18 = 85: 6c2adb9 survey: stub in new experimental 'git-survey' command
87: 2b54064 = 86: df24313 git.rc: include winuser.h
88: 7bd6954 = 87: 264f3d5 mingw: do load libcurl dynamically by default
89: 8f7f0a6 = 88: a3c2d79 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
90: ac15061 = 89: 65fa347 mingw: suggest
windows.appendAtomicallyin more cases91: a8e7701 = 90: 7dbe1ae win32: use native ANSI sequence processing, if possible
92: 386459f = 91: 7c70cdb common-main.c: fflush stdout buffer upon exit
111: 06c1f2e = 92: 3450613 t5601/t7406(mingw): do run tests with symlink support
112: e46a1ba = 93: 586c8fe win32: ensure that
localtime_r()is declared even in i686 builds113: e035faf = 94: 29b18b1 Fallback to AppData if XDG_CONFIG_HOME is unset
114: 00398b4 = 95: e1e8306 run-command: be helpful with Git LFS fails on Windows 7
121: f6a574b = 96: 79c9ca5 mingw: Support
git_terminal_promptwith more terminals122: 650cd87 = 97: 1170ef3 compat/terminal.c: only use the Windows console if bash 'read -r' fails
123: 990591b = 98: 70e4802 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
124: 7d19347 = 99: 37be6f9 Win32: symlink: move phantom symlink creation to a separate function
101: d9de593 = 100: 599ea03 t5563: verify that NTLM authentication works
125: 7dd33cc = 101: 2ab577c mingw: introduce code to detect whether we're inside a Windows container
126: 309243a = 102: f751067 Introduce helper to create symlinks that knows about index_state
103: 1b532f4 = 103: e9514ba compat/mingw: handle WSA errors in strerror
104: 77b8a95 = 104: b40c789 http: disallow NTLM authentication by default
127: 76b8e46 = 105: e2020dd mingw: when running in a Windows container, try to rename() harder
128: 121b261 = 106: e3c2177 mingw: allow to specify the symlink type in .gitattributes
106: 35b88e9 = 107: 17994d1 compat/mingw: drop outdated comment
107: 5c85afd = 108: 1dbd7bd http: warn if might have failed because of NTLM
129: 5d071e4 = 109: 95a2919 mingw: move the file_attr_to_st_mode() function definition
130: 1f7851d = 110: 1df01f9 Win32: symlink: add test for
symlinkattribute109: a381bb8 = 111: 102b727 t0301: actually test credential-cache on Windows
110: 0df2b9a = 112: 2ddfbbf credential: advertise NTLM suppression and allow helpers to re-enable
131: fd04e89 = 113: ab4ed58 mingw: Windows Docker volumes are not symbolic links
132: c709e2d = 114: d690c2f clean: do not traverse mount points
116: d14a99f = 115: bf10675 credential-cache: handle ECONNREFUSED gracefully
117: 07f8d2d = 116: 369ef25 reftable: do make sure to use custom allocators
118: 02d0a84 = 117: 001002e check-whitespace: avoid alerts about upstream commits
119: 1b5dcfd = 118: d782708 t/t5571-prep-push-hook.sh: Add test with writing to stderr
120: 7479a3e = 119: ad55f5c dir: do not traverse mount points
134: 3b36afe = 120: 6469e8b win32: thread-utils: handle multi-socket systems
135: 5a0eab5 = 121: e61f828 t5563: add tests for http.emptyAuth with Negotiate
136: afbe174 = 122: 2f890aa entry: flush fscache after creating directories and writing files
137: 4f9aafc = 123: c6b4d43 ci(macos): skip the
git p4tests138: 8cb04b8 = 124: 7f0a08c mingw: work around rename() failing on a read-only file
139: 86a9667 = 125: a38d888 clean: remove mount points when possible
140: 9b32c74 ! 126: 4f10e86 mingw: optionally enable wsl compability file mode bits
-: ------------ > 127: aad709c t9350: point out that refs are not updated correctly
13: 0912c16 = 128: 7725d52 transport-helper: add trailing --
16: c770364 = 129: d2dc048 remote-helper: check helper status after import/export
21: 7ec9a9e = 130: 47f4c67 Always auto-gc after calling a fast-import transport
95: 70c50f5 ! 131: 88d1260 survey: add command line opts to select references
@@ builtin/survey.c: static void survey_load_config(struct survey_context *ctx) + + ctx->report.refs.refs_nr = ref_array.nr; + for (int i = 0; i < ref_array.nr; i++) { -+ unsigned long size; ++ size_t size; + struct ref_array_item *item = ref_array.items[i]; + + switch (item->kind) {96: a6269f9 = 132: 182dd96 survey: start pretty printing data in table form
97: 6d33f4c ! 133: b8ccce3 survey: add object count summary
@@ builtin/survey.c: static void do_load_refs(struct survey_context *ctx, - for (int i = 0; i < ref_array.nr; i++) { + ctx->report.refs.refs_nr = ctx->ref_array.nr; + for (int i = 0; i < ctx->ref_array.nr; i++) { - unsigned long size; + size_t size; - struct ref_array_item *item = ref_array.items[i]; + struct ref_array_item *item = ctx->ref_array.items[i];98: 5d882a1 ! 134: 6bc797f survey: summarize total sizes by object type
@@ builtin/survey.c: static void increment_object_counts( + for (size_t i = 0; i < oids->nr; i++) { + struct object_info oi = OBJECT_INFO_INIT; + unsigned oi_flags = OBJECT_INFO_FOR_PREFETCH; -+ unsigned long object_length = 0; ++ size_t object_length = 0; + off_t disk_sizep = 0; + enum object_type type; +99: 7534450 = 135: 8ff8df7 survey: show progress during object walk
102: 234bf21 = 136: 140f68a survey: add ability to track prioritized lists
105: 22a2a07 = 137: 89e0d3b survey: add report of "largest" paths
108: c10d0c1 = 138: cf13718 survey: add --top= option and config
115: f7c678a = 139: 135ca1e survey: clearly note the experimental nature in the output
133: 4cd7d4a (upstream: 179f122) < -: ------------ mingw: kill child processes in a gentler way
141: 510a752 (upstream: 363f1d8) < -: ------------ mingw: really handle SIGINT
142: 7b0ce03 = 140: f97de78 Win32: make FILETIME conversion functions public
143: b93a793 = 141: e2ec780 Win32: dirent.c: Move opendir down
144: 7f98670 = 142: abfd800 mingw: make the dirent implementation pluggable
145: 6135ebb = 143: 6c4b4e4 Win32: make the lstat implementation pluggable
146: b3e49fe = 144: 79e5cee mingw: add infrastructure for read-only file system level caches
147: 8ac805d = 145: f58ca92 mingw: add a cache below mingw's lstat and dirent implementations
148: 0d24007 = 146: 44e8389 fscache: load directories only once
149: 3d6182c = 147: c51e486 fscache: add key for GIT_TRACE_FSCACHE
150: a97f7eb = 148: 11f3b2c fscache: remember not-found directories
151: ad9b7cb = 149: a6934e3 fscache: add a test for the dir-not-found optimization
152: f943e9b = 150: 8d2179e add: use preload-index and fscache for performance
153: ab4424a = 151: b3fb014 dir.c: make add_excludes aware of fscache during status
154: bce7309 = 152: cb8225b fscache: make fscache_enabled() public
155: 38f4c08 = 153: 3c6d5ce dir.c: regression fix for add_excludes with fscache
156: 897e172 = 154: ebc5dc1 fetch-pack.c: enable fscache for stats under .git/objects
157: b68f959 = 155: cfb77de checkout.c: enable fscache for checkout again
158: 1f666f1 = 156: 0ab4385 Enable the filesystem cache (fscache) in refresh_index().
160: 2fc0f7c = 157: 175c0df fscache: use FindFirstFileExW to avoid retrieving the short name
162: d510615 = 158: 3cc9f25 fscache: add GIT_TEST_FSCACHE support
163: 67dd293 = 159: 2097c6a fscache: add fscache hit statistics
164: 0b705df = 160: f099336 unpack-trees: enable fscache for sparse-checkout
165: ef018f7 = 161: 2975b0a status: disable and free fscache at the end of the status command
166: 62b124e = 162: b825e14 mem_pool: add GIT_TRACE_MEMPOOL support
167: 28a1243 = 163: b3aae7b fscache: fscache takes an initial size
168: 78b997c = 164: 7ee401b fscache: update fscache to be thread specific instead of global
169: 386eca9 = 165: 2165972 fscache: teach fscache to use mempool
170: 6c7defa = 166: a408468 fscache: make fscache_enable() thread safe
171: 6f5e01e = 167: 01e72cf fscache: teach fscache to use NtQueryDirectoryFile
172: 81235f9 = 168: c97a534 fscache: remember the reparse tag for each entry
173: c808928 = 169: 9146889 fscache: Windows Docker volumes are not symbolic links
174: 644b753 = 170: a9d062f fscache: optionally enable wsl compability file mode bits
175: f345460 = 171: cef886c fscache: implement an FSCache-aware is_mount_point()
159: 801516b = 172: 898a04a git-gui--askyesno: fix funny text wrapping
176: 0793877 = 173: aa15562 clean: make use of FSCache
161: a0b58f1 = 174: 2f04a47 git-gui--askyesno (mingw): use Git for Windows' icon, if available
177: 8000963 = 175: 61f9229 pack-objects (mingw): demonstrate a segmentation fault with large deltas
178: cbb87ed = 176: 2f2712f mingw: support long paths
179: 1497b48 = 177: 936b929 win32(long path support): leave drive-less absolute paths intact
180: d98b306 = 178: d23c43e compat/fsmonitor/fsm-*-win32: support long paths
181: a6d294b = 179: d11a160 clean: suggest using
core.longPathsif paths are too long to remove182: 18b6910 = 180: fcfaa06 mingw: explicitly specify with which cmd to prefix the cmdline
183: 483c136 = 181: a266ee7 mingw: when path_lookup() failed, try BusyBox
184: 3b5c1e5 = 182: 27f26db test-tool: learn to act as a drop-in replacement for
iconv185: 07252e7 = 183: 141a908 tests(mingw): if
iconvis unavailable, usetest-helper --iconv186: 9e6562d = 184: f8fb94a gitattributes: mark .png files as binary
187: 1d8432b = 185: 06b91c7 tests: move test PNGs into t/lib-diff/
188: 62cd7f4 = 186: 73abc2c tests: only override sort & find if there are usable ones in /usr/bin/
189: 81610b3 = 187: da9cc1b tests: use the correct path separator with BusyBox
190: 80a012c = 188: bd83bb8 mingw: only use Bash-ism
builtin pwd -Wwhen available191: d621b71 = 189: 5afda95 tests (mingw): remove Bash-specific pwd option
192: 8420123 = 190: cccfb63 test-lib: add BUSYBOX prerequisite
193: 0b0a4bb = 191: 841b677 t5003: use binary file from t/lib-diff/
194: 63bee0d = 192: 1234b0a t5532: workaround for BusyBox on Windows
195: 8f0d350 = 193: db509e4 t5605: special-case hardlink test for BusyBox-w32
196: ad07a00 = 194: c4562bc t5813: allow for $PWD to be a Windows path
197: 7f7d1d7 = 195: 2788218 t9200: skip tests when $PWD contains a colon
206: 94223c1 = 196: eb80739 Partially un-revert "editor: save and reset terminal after calling EDITOR"
198: 728c2bf = 197: ddc10a4 Describe Git for Windows' architecture
199: 7b5be19 = 198: c1479b4 Add an AGENTS.md file to help with AI-assisted debugging/development
200: 67ce55a = 199: 335b144 Modify the Code of Conduct for Git for Windows
201: 029fc13 = 200: a48c0f3 CONTRIBUTING.md: add guide for first-time contributors
202: 7a75b2f = 201: b6d2b16 README.md: Add a Windows-specific preamble
203: 20da4a0 = 202: 937b83a Add an issue template
204: d127cc4 = 203: 5727bb7 Add a GitHub workflow to monitor component updates
205: 9553e10 = 204: 768393d Modify the GitHub Pull Request template (to reflect Git for Windows)
207: 9cc27f2 = 205: 270d347 reset: reinstate support for the deprecated --stdin option
208: 62eb3ea = 206: 7e8cfb4 fsmonitor: reintroduce core.useBuiltinFSMonitor
209: 367f2b5 = 207: 6f05b1a dependabot: help keeping GitHub Actions versions up to date
210: 29eb38c = 208: 9d9b3e9 SECURITY.md: document Git for Windows' policies
211: 7c13083 ! 209: b36fc1e ci: only run the expensive tests in the Windows tests for now
212: 40ccc2d < -: ------------ fixup! ci: only run the expensive tests in the Windows tests for now
This range-diff is dominated by the update to
objects-larger-than-4gb-on-windows-pt2's latest iteration and thebuiltin/survey.creaction work required byobjects-larger-than-4gb-on-windows(pt1).