Rebase to v2.55.0 rc0#6278
Merged
gitforwindowshelper[bot] merged 815 commits intoJun 12, 2026
Merged
Conversation
For some reason, this test case was indented with 4 spaces instead of 1 horizontal tab. The other test cases in the same test script are fine. Signed-off-by: Jens Glathe <jens.glathe@oldschoolsolutions.biz> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
As of Git v2.28.0, the diff for files staged via `git add -N` marks them as new files. Git GUI was ill-prepared for that, and this patch teaches Git GUI about them. Please note that this will not even fix things with v2.28.0, as the `rp/apply-cached-with-i-t-a` patches are required on Git's side, too. This fixes git-for-windows#2779 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
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 git-for-windows#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>
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>
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>
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>
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>
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>
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>
In bf2d5d8 (Don't let ld strip relocations, 2016-01-16) (picked from git-for-windows@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>
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>
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>
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>
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>
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>
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>
When t5605 tries to verify that files are hardlinked (or that they are not), it uses the `-links` option of the `find` utility. BusyBox' implementation does not support that option, and BusyBox-w32's lstat() does not even report the number of hard links correctly (for performance reasons). So let's just switch to a different method that actually works on Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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 uses MSYS2's Bash to run the test suite, which comes with benefits but also at a heavy price: on the plus side, MSYS2's POSIX emulation layer allows us to continue pretending that we are on a Unix system, e.g. use Unix paths instead of Windows ones, yet this is bought at a rather noticeable performance penalty. There *are* some more native ports of Unix shells out there, though, most notably BusyBox-w32's ash. These native ports do not use any POSIX emulation layer (or at most a *very* thin one, choosing to avoid features such as fork() that are expensive to emulate on Windows), and they use native Windows paths (usually with forward slashes instead of backslashes, which is perfectly legal in almost all use cases). And here comes the problem: with a $PWD looking like, say, C:/git-sdk-64/usr/src/git/t/trash directory.t5813-proto-disable-ssh Git's test scripts get quite a bit confused, as their assumptions have been shattered. Not only does this path contain a colon (oh no!), it also does not start with a slash. This is a problem e.g. when constructing a URL as t5813 does it: ssh://remote$PWD. Not only is it impossible to separate the "host" from the path with a $PWD as above, even prefixing $PWD by a slash won't work, as /C:/git-sdk-64/... is not a valid path. As a workaround, detect when $PWD does not start with a slash on Windows, and simply strip the drive prefix, using an obscure feature of Windows paths: if an absolute Windows path starts with a slash, it is implicitly prefixed by the drive prefix of the current directory. As we are talking about the current directory here, anyway, that strategy works. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Rather than using private IFTTT Applets that send mails to this maintainer whenever a new version of a Git for Windows component was released, let's use the power of GitHub workflows to make this process publicly visible. This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a new version was released. Note: Bash sometimes releases multiple patched versions within a few minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The MSYS2 runtime also has a similar system. We can address those patches as a group, so we shouldn't get multiple issues about them. Note further: We're not acting on newlib releases, OpenSSL alphas, Perl release candidates or non-stable Perl releases. There's no need to open issues about them. Co-authored-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
On Windows, the current working directory is pretty much guaranteed to contain a colon. If we feed that path to CVS, it mistakes it for a separator between host and port, though. This has not been a problem so far because Git for Windows uses MSYS2's Bash using a POSIX emulation layer that also pretends that the current directory is a Unix path (at least as long as we're in a shell script). However, that is rather limiting, as Git for Windows also explores other ports of other Unix shells. One of those is BusyBox-w32's ash, which is a native port (i.e. *not* using any POSIX emulation layer, and certainly not emulating Unix paths). So let's just detect if there is a colon in $PWD and punt in that case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions for details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
…updates Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is hidden in v2.55.0-rc0's own CI because of an omission in 5ba8291 (ci: enable EXPENSIVE for contributor builds, 2026-05-11) which fails to enable EXPENSIVE tests for tags. Due to 7d78d5f (ci: skip GitHub workflow runs for already-tested commits/trees, 2020-10-08), the CI of `master` is now also mistakenly green because it reuses the tag's CI run to prove that it's solid. This is an evil merge by necessity because `survey.c` needs to adapt to the changed function signatures. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Upstream Git does not test their tags with the expensive set of tests, so a couple of them seem quite broken for now, even so much as hanging indefinitely. It is outside of the responsibility of the Git for Windows project to fix upstream's own tests for platforms other than Windows, so let's not exercise them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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. |
gitforwindowshelper
Bot
merged commit 7c13083
into
git-for-windows:main
85 checks passed
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 main
1: 0cfb09c (upstream: 0494953) < -: ------------ sideband: mask control characters
2: c9ee3b4 (upstream: 9ed1625) < -: ------------ sideband: introduce an "escape hatch" to allow control characters
3: 875ecc8 = 1: d0f9ee4 ci(dockerized): reduce the PID limit for private repositories
4: 7a2cef3 (upstream: 12f0fda) < -: ------------ sideband: do allow ANSI color sequences by default
6: 997eb4b = 2: 04e886a mingw: skip symlink type auto-detection for network share targets
5: cf0536e = 3: 54f20fd unix-socket: avoid leak when initialization fails
7: d5dc86a = 4: d09d2e8 grep: prevent
^$false match at end of file8: 6ed0251 = 5: 41e957b t9350: point out that refs are not updated correctly
9: 3a82b88 = 6: 0912c16 transport-helper: add trailing --
14: 9bc73d0 = 7: c7d81ee mingw: demonstrate a
git addissue with NTFS junctions15: 0fa618e = 8: c6de88c t5505/t5516: allow running without
.git/branches/in the templates10: 099c5da = 9: c770364 remote-helper: check helper status after import/export
16: 72a6d08 = 10: a0f8f8f strbuf_realpath(): use platform-dependent API if available
17: 0ef6adc = 11: 0f635fd http: use new "best effort" strategy for Secure Channel revoke checking
-: ------------ > 12: 610f72e mingw: include the Python parts in the build
18: 73df800 = 13: b4ce555 t5505/t5516: fix white-space around redirectors
11: 0d32026 = 14: 7ec9a9e Always auto-gc after calling a fast-import transport
12: acd9c70 = 15: cef53cf mingw: prevent regressions with "drive-less" absolute paths
13: f8d7e57 < -: ------------ mingw: include the Python parts in the build
19: a5b135a = 16: b06b088 transport: optionally disable side-band-64k
20: 1a7f4a1 = 17: 1109e8c mingw: fix fatal error working on mapped network drives on Windows
21: bad3b4a = 18: c240d4b clink.pl: fix MSVC compile script to handle libcurl-d.lib
22: 59aa92e = 19: 8a43374 mingw: implement a platform-specific
strbuf_realpath()119: e1756e3 = 20: 2cb9753 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest
120: 0235fd9 = 21: 286ea6a vcpkg_install: detect lack of Git
121: bfbd8b6 = 22: b36b9fa vcpkg_install: add comment regarding slow network connections
122: 3f4a914 = 23: a9f03e5 vcbuild: install ARM64 dependencies when building ARM64 binaries
123: 3095a33 = 24: 0b849c5 vcbuild: add an option to install individual 'features'
124: e48b4e6 = 25: 30cbe0c cmake: allow building for Windows/ARM64
125: ea633e0 ! 26: 2d6b0ee ci(vs-build) also build Windows/ARM64 artifacts
@@ .github/workflows/main.yml: jobs: + group: vs-build-${{ github.ref }}-${{ matrix.arch }} cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 @@ .github/workflows/main.yml: jobs: - uses: microsoft/setup-msbuild@v2 + uses: microsoft/setup-msbuild@v3 - name: copy dlls to root shell: cmd - run: compat\vcbuild\vcpkg_copy_dlls.bat release @@ .github/workflows/main.yml: jobs: env: @@ .github/workflows/main.yml: jobs: - name: upload tracked files and build artifacts - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v7 with: - name: vs-artifacts + name: vs-artifacts-${{ matrix.arch }} @@ .github/workflows/main.yml: jobs: name: win+VS test @@ .github/workflows/main.yml: jobs: - name: download tracked files and build artifacts - uses: actions/download-artifact@v6 + uses: actions/download-artifact@v8 with: - name: vs-artifacts + name: vs-artifacts-x64126: 399be10 = 27: 4a80989 Add schannel to curl installation
127: 5859b25 = 28: 80d5755 cmake(): allow setting HOST_CPU for cross-compilation
128: f826b94 = 29: b1cbb40 CMake: default Visual Studio generator has changed
129: ac82257 = 30: 45168c9 .gitignore: add Visual Studio CMakeSetting.json file
31: d99fd48 = 31: 2c60253 subtree: update
contrib/subtreetesttarget130: d8d25d5 = 32: effcaa8 CMakeLists: add default "x64-windows" arch for Visual Studio
27: 2894e56 = 33: f315506 hash-object: demonstrate a >4GB/LLP64 problem
23: 336f3ca = 34: d62cb28 t3701: verify that we can add lots of files interactively
24: 48682d5 = 35: 89cd4ea commit: accept "scissors" with CR/LF line endings
25: 5b62ca7 = 36: 23dbb89 t0014: fix indentation
26: 599e9af = 37: 477b99a git-gui: accommodate for intent-to-add files
28: bcb5666 < -: ------------ object-file.c: use size_t for header lengths
36: 55b3fbd = 38: b3213b6 mingw: allow for longer paths in
parse_interpreter()37: 4163a8b = 39: d8e0669 compat/vcbuild: document preferred way to build in Visual Studio
38: 4c6d4ab = 40: 18bf7ef http: optionally send SSL client certificate
39: b030b44 = 41: a3a10f2 ci: run
contrib/subtreetests in CI builds131: f4ce0a5 = 42: 0b82bc8 CMake: show Win32 and Generator_platform build-option values
-: ------------ > 43: 05f99d5 object-file.c: use size_t for header lengths
87: 5db8d3b = 44: 7e69720 windows: skip linking
git-<command>for built-ins88: 4d1fb6b = 45: ef24c9b mingw: stop hard-coding
CC = gcc89: 0d24432 = 46: f2b6e3b mingw: drop the -D_USE_32BIT_TIME_T option
29: d7c54a7 ! 47: 498e517 hash algorithms: use size_t for section lengths
@@ Commit message Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> ## object-file.c ## -@@ object-file.c: int odb_source_loose_read_object_info(struct odb_source *source, +@@ object-file.c: int parse_loose_header(const char *hdr, struct object_info *oi) } static void hash_object_body(const struct git_hash_algo *algo, struct git_hash_ctx *c, @@ object-file.c: int odb_source_loose_read_object_info(struct odb_source *source, struct object_id *oid, char *hdr, size_t *hdrlen) { -@@ object-file.c: static void write_object_file_prepare(const struct git_hash_algo *algo, +@@ object-file.c: void write_object_file_prepare(const struct git_hash_algo *algo, /* Generate the header */ *hdrlen = format_object_header(hdr, *hdrlen, type, len);90: c470f27 = 48: c77b4a0 mingw: only use -Wl,--large-address-aware for 32-bit builds
30: e8d5034 = 49: 0a9f94f hash-object --stdin: verify that it works with >4GB/LLP64
91: 3606ba6 = 50: 05fa365 mingw: avoid over-specifying
--pic-executable32: ce892c8 = 51: d8fe3c3 hash-object: add another >4GB/LLP64 test case
33: 16b5c65 ! 52: c9fb0e8 setup: properly use "%(prefix)/" when in WSL
@@ Commit message Signed-off-by: Derrick Stolee <derrickstolee@github.com> ## setup.c ## -@@ setup.c: const char *setup_git_directory_gently(int *nongit_ok) +@@ setup.c: const char *setup_git_directory_gently(struct repository *repo, int *nongit_ok) break; case GIT_DIR_INVALID_OWNERSHIP: if (!nongit_ok) {34: 2dd8bc2 = 53: 94c9507 Add config option
windows.appendAtomically92: e8f59ba = 54: e9b1b71 mingw: set the prefix and HOST_CPU as per MSYS2's settings
35: 07572a1 = 55: d827db3 MinGW: link as terminal server aware
40: d8d5be9 = 56: a2fcb40 hash-object: add a >4GB/LLP64 test case using filtered input
41: c99c667 = 57: 264d52d compat/mingw.c: do not warn when failing to get owner
42: ba64eab = 58: 47c6f68 mingw: $env:TERM="xterm-256color" for newer OSes
43: 38442a4 = 59: a78ec9f winansi: check result and Buffer before using Name
44: 7fa52ab = 60: 1fdd0d3 mingw: change core.fsyncObjectFiles = 1 by default
45: 4fe4648 = 61: 5b71da5 Fix Windows version resources
46: 63fa02a = 62: 64acc36 status: fix for old-style submodules with commondir
93: 6e984f7 = 63: 3a86386 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
94: 546d38d ! 64: 5c59e1c mingw: rely on MSYS2's metadata instead of hard-coding it
95: 1fb6dab = 65: aed6dba mingw: always define
ETC_*for MSYS2 environments96: fabf7df = 66: daf52c6 max_tree_depth: lower it for clang builds in general on Windows
97: b1c84ad = 67: 8a1a808 mingw: ensure valid CTYPE
98: be2b2f4 = 68: e53db48 mingw: allow
git.exeto be used instead of the "Git wrapper"99: 90e4e77 = 69: ed6cea2 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
100: 05f2ffa = 70: 918d768 clink.pl: fix libexpatd.lib link error when using MSVC
101: d08f824 = 71: 515a11d Makefile: clean up .ilk files when MSVC=1
102: 852bc76 = 72: 5aac754 vcbuild: add support for compiling Windows resource files
103: de1dd1b = 73: 0f7b4fe config.mak.uname: add git.rc to MSVC builds
104: f3d8940 = 74: ec245f7 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
47: bbde338 = 75: 0270dbd http: optionally load libcurl lazily
105: f717f38 = 76: d35b1d9 clink.pl: move default linker options for MSVC=1 builds
48: 0576051 = 77: 83d7f0b http: support lazy-loading libcurl also on Windows
106: 7ec458d = 78: c3e6b22 cmake: install headless-git.
49: f2d02f8 = 79: 78345d8 http: when loading libcurl lazily, allow for multiple SSL backends
107: 5fac063 = 80: 2b54064 git.rc: include winuser.h
50: fee35b1 = 81: 7bd6954 mingw: do load libcurl dynamically by default
51: e6a6ebc = 82: 8f7f0a6 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
52: 1990147 = 83: ac15061 mingw: suggest
windows.appendAtomicallyin more cases53: 37612e1 = 84: a8e7701 win32: use native ANSI sequence processing, if possible
54: 728b1db = 85: 386459f common-main.c: fflush stdout buffer upon exit
59: 5d4e035 = 86: 3efe890 revision: create mark_trees_uninteresting_dense()
60: 7806bd1 = 87: a3adc18 survey: stub in new experimental 'git-survey' command
61: 1592927 = 88: 70c50f5 survey: add command line opts to select references
62: 3ca4cab = 89: a6269f9 survey: start pretty printing data in table form
63: 572cfa6 = 90: 6d33f4c survey: add object count summary
64: 7af6b91 = 91: 5d882a1 survey: summarize total sizes by object type
65: 32d24eb = 92: 7534450 survey: show progress during object walk
72: 11d0097 = 93: cde6104 mingw: make sure
errnois set correctly when socket operations fail70: 93612be ! 94: d9de593 t5563: verify that NTLM authentication works
66: 90fa6a6 = 95: 234bf21 survey: add ability to track prioritized lists
74: c21db0a ! 96: 1b532f4 compat/mingw: handle WSA errors in strerror
71: a4f847e = 97: 77b8a95 http: disallow NTLM authentication by default
67: d8e4362 = 98: 22a2a07 survey: add report of "largest" paths
76: 4a6bb0d = 99: 35b88e9 compat/mingw: drop outdated comment
73: c91c82a ! 100: 5c85afd http: warn if might have failed because of NTLM
@@ http.c: static int handle_curl_result(struct slot_results *results) + } return HTTP_NOAUTH; } else { - http_auth_methods &= ~CURLAUTH_GSSNEGOTIATE; + if (curl_empty_auth == -1 && ## t/t5563-simple-http-auth.sh ## @@ t/t5563-simple-http-auth.sh: test_expect_success NTLM 'access using NTLM auth' '68: 48d9e81 = 101: c10d0c1 survey: add --top= option and config
78: 0ae3505 = 102: a381bb8 t0301: actually test credential-cache on Windows
75: d8031ed ! 103: 0df2b9a credential: advertise NTLM suppression and allow helpers to re-enable
55: 4ecf316 = 104: 06c1f2e t5601/t7406(mingw): do run tests with symlink support
56: 18f1363 = 105: e46a1ba win32: ensure that
localtime_r()is declared even in i686 builds57: d44a3f6 = 106: e035faf Fallback to AppData if XDG_CONFIG_HOME is unset
58: 6b47361 = 107: 00398b4 run-command: be helpful with Git LFS fails on Windows 7
69: 03bcb28 = 108: f7c678a survey: clearly note the experimental nature in the output
77: ac20928 (upstream: a8faa7a) < -: ------------ http: extract http_reauth_prepare() from retry paths
79: 6dd257a (upstream: 5dbc8c1) < -: ------------ http: attempt Negotiate auth in http.emptyAuth=auto mode
80: 152380d = 109: d14a99f credential-cache: handle ECONNREFUSED gracefully
81: 8668f54 = 110: 07f8d2d reftable: do make sure to use custom allocators
82: 2238da5 = 111: 02d0a84 check-whitespace: avoid alerts about upstream commits
83: f44b294 = 112: 1b5dcfd t/t5571-prep-push-hook.sh: Add test with writing to stderr
84: bd5ce11 = 113: 7479a3e dir: do not traverse mount points
132: 325ac04 = 114: f6a574b mingw: Support
git_terminal_promptwith more terminals133: 0b126e9 = 115: 650cd87 compat/terminal.c: only use the Windows console if bash 'read -r' fails
134: cc8be7b = 116: 990591b mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
140: 697e397 = 117: 7d19347 Win32: symlink: move phantom symlink creation to a separate function
135: db36eaf = 118: 7dd33cc mingw: introduce code to detect whether we're inside a Windows container
142: 084d73a ! 119: 309243a Introduce helper to create symlinks that knows about index_state
136: 7ad618a = 120: 76b8e46 mingw: when running in a Windows container, try to rename() harder
143: d9a41f9 = 121: 121b261 mingw: allow to specify the symlink type in .gitattributes
137: 984bc2f = 122: 5d071e4 mingw: move the file_attr_to_st_mode() function definition
144: b95bcb1 = 123: 1f7851d Win32: symlink: add test for
symlinkattribute139: 938fb92 = 124: fd04e89 mingw: Windows Docker volumes are not symbolic links
147: 0c45179 = 125: c709e2d clean: do not traverse mount points
145: 698ef1f = 126: 4cd7d4a mingw: kill child processes in a gentler way
114: eb3911b = 127: 3b36afe win32: thread-utils: handle multi-socket systems
85: 0f78924 (upstream: 9b1630b) = 128: 5a0eab5 t5563: add tests for http.emptyAuth with Negotiate
86: f260472 < -: ------------ mingw: stop using nedmalloc
108: c5a2120 (upstream: e54194d) < -: ------------ ci: bump microsoft/setup-msbuild from v2 to v3
109: 236cb4d (upstream: 3148cf5) < -: ------------ ci: bump actions/{upload,download}-artifact to v7 and v8
110: c202109 (upstream: 6e61245) < -: ------------ ci: bump actions/github-script from v8 to v9
111: 275f23c (upstream: 20cd2c9) < -: ------------ ci: bump actions/checkout from v5 to v6
112: 8bcfbb9 (upstream: 69ed0e3) < -: ------------ mingw: optionally use legacy (non-POSIX) delete semantics
113: 06f0ce4 (upstream: 7e6ede6) < -: ------------ ci: bump git-for-windows/setup-git-for-windows-sdk from v1 to v2
115: bb58bb5 (upstream: 4bb086c) < -: ------------ maintenance(geometric): do release the
.idxfiles before repacking116: 8ed8f03 (upstream: 4a6ed9d) < -: ------------ l10n: bump mshick/add-pr-comment from v2 to v3
117: c6daaad (upstream: 0a6d290) < -: ------------ build: tolerate use of _Generic from glibc 2.43 with Clang
118: 9536b13 = 129: afbe174 entry: flush fscache after creating directories and writing files
138: e92c12c = 130: 4f9aafc ci(macos): skip the
git p4tests141: 1929745 = 131: 8cb04b8 mingw: work around rename() failing on a read-only file
148: 2293ecb = 132: 86a9667 clean: remove mount points when possible
149: 48a4cf4 ! 133: 9b32c74 mingw: optionally enable wsl compability file mode bits
146: ed0c744 = 134: 510a752 mingw: really handle SIGINT
150: 6d5d3b6 = 135: 7b0ce03 Win32: make FILETIME conversion functions public
151: 28d1fc4 = 136: b93a793 Win32: dirent.c: Move opendir down
152: 1004fac = 137: 7f98670 mingw: make the dirent implementation pluggable
153: d503c8c = 138: 6135ebb Win32: make the lstat implementation pluggable
154: 2a27e75 = 139: b3e49fe mingw: add infrastructure for read-only file system level caches
155: edd55c2 ! 140: 8ac805d mingw: add a cache below mingw's lstat and dirent implementations
156: 2b9e012 = 141: 0d24007 fscache: load directories only once
157: 4a4c405 = 142: 3d6182c fscache: add key for GIT_TRACE_FSCACHE
158: 88d00b8 = 143: a97f7eb fscache: remember not-found directories
159: e29aa2e = 144: ad9b7cb fscache: add a test for the dir-not-found optimization
160: 578fc0c = 145: f943e9b add: use preload-index and fscache for performance
161: 7269bdd = 146: ab4424a dir.c: make add_excludes aware of fscache during status
162: 97e33df = 147: bce7309 fscache: make fscache_enabled() public
163: 7057269 = 148: 38f4c08 dir.c: regression fix for add_excludes with fscache
165: 53b726f = 149: 897e172 fetch-pack.c: enable fscache for stats under .git/objects
167: d3dd725 = 150: b68f959 checkout.c: enable fscache for checkout again
168: 294bae6 = 151: 1f666f1 Enable the filesystem cache (fscache) in refresh_index().
164: a3ec13a = 152: 801516b git-gui--askyesno: fix funny text wrapping
169: 9de02ee = 153: 2fc0f7c fscache: use FindFirstFileExW to avoid retrieving the short name
166: 7ac68ed = 154: a0b58f1 git-gui--askyesno (mingw): use Git for Windows' icon, if available
170: 16f8f99 = 155: d510615 fscache: add GIT_TEST_FSCACHE support
171: fb699af = 156: 67dd293 fscache: add fscache hit statistics
172: 405120a = 157: 0b705df unpack-trees: enable fscache for sparse-checkout
173: 9fef3a3 = 158: ef018f7 status: disable and free fscache at the end of the status command
174: 91321e9 = 159: 62b124e mem_pool: add GIT_TRACE_MEMPOOL support
175: d218261 = 160: 28a1243 fscache: fscache takes an initial size
176: 13126e2 = 161: 78b997c fscache: update fscache to be thread specific instead of global
177: a95aa8f = 162: 386eca9 fscache: teach fscache to use mempool
178: 893ef6f = 163: 6c7defa fscache: make fscache_enable() thread safe
179: 1f339a4 = 164: 6f5e01e fscache: teach fscache to use NtQueryDirectoryFile
180: 3fba11c = 165: 81235f9 fscache: remember the reparse tag for each entry
181: c5561ac = 166: c808928 fscache: Windows Docker volumes are not symbolic links
182: 447db23 = 167: 644b753 fscache: optionally enable wsl compability file mode bits
183: b122cb9 = 168: f345460 fscache: implement an FSCache-aware is_mount_point()
184: ce6f9a8 = 169: 0793877 clean: make use of FSCache
185: c67399f = 170: 8000963 pack-objects (mingw): demonstrate a segmentation fault with large deltas
186: 651cc11 = 171: cbb87ed mingw: support long paths
187: 64c6fce = 172: 1497b48 win32(long path support): leave drive-less absolute paths intact
188: 5066fcd = 173: d98b306 compat/fsmonitor/fsm-*-win32: support long paths
189: 2981f01 = 174: a6d294b clean: suggest using
core.longPathsif paths are too long to remove190: 4a65108 = 175: 18b6910 mingw: explicitly specify with which cmd to prefix the cmdline
191: 276b429 = 176: 483c136 mingw: when path_lookup() failed, try BusyBox
192: afeaca3 = 177: 3b5c1e5 test-tool: learn to act as a drop-in replacement for
iconv193: c760849 = 178: 07252e7 tests(mingw): if
iconvis unavailable, usetest-helper --iconv194: ea5f40e = 179: 9e6562d gitattributes: mark .png files as binary
195: 1e0607a = 180: 1d8432b tests: move test PNGs into t/lib-diff/
196: 8157fe4 = 181: 62cd7f4 tests: only override sort & find if there are usable ones in /usr/bin/
197: 53f478e ! 182: 81610b3 tests: use the correct path separator with BusyBox
198: 11a47d2 = 183: 80a012c mingw: only use Bash-ism
builtin pwd -Wwhen available199: 507c935 = 184: d621b71 tests (mingw): remove Bash-specific pwd option
200: f0c4336 = 185: 8420123 test-lib: add BUSYBOX prerequisite
201: dd3c78f = 186: 0b0a4bb t5003: use binary file from t/lib-diff/
202: 82551d4 = 187: 63bee0d t5532: workaround for BusyBox on Windows
203: 9a20b67 = 188: 8f0d350 t5605: special-case hardlink test for BusyBox-w32
204: 25d52fa = 189: ad07a00 t5813: allow for $PWD to be a Windows path
205: fa18d8c ! 190: 7f7d1d7 t9200: skip tests when $PWD contains a colon
211: 489d661 = 191: 728c2bf Describe Git for Windows' architecture
212: 458b8ee = 192: 7b5be19 Add an AGENTS.md file to help with AI-assisted debugging/development
213: ba76b10 = 193: 67ce55a Modify the Code of Conduct for Git for Windows
214: d982e79 = 194: 029fc13 CONTRIBUTING.md: add guide for first-time contributors
215: 6735645 = 195: 7a75b2f README.md: Add a Windows-specific preamble
216: ed80239 = 196: 20da4a0 Add an issue template
206: 7e0fcca = 197: d127cc4 Add a GitHub workflow to monitor component updates
217: 25c2e8c = 198: 9553e10 Modify the GitHub Pull Request template (to reflect Git for Windows)
207: 2bafcd2 = 199: 94223c1 Partially un-revert "editor: save and reset terminal after calling EDITOR"
208: 2a47ae0 = 200: 9cc27f2 reset: reinstate support for the deprecated --stdin option
209: 47212c7 = 201: 62eb3ea fsmonitor: reintroduce core.useBuiltinFSMonitor
210: b133bda = 202: 367f2b5 dependabot: help keeping GitHub Actions versions up to date
218: 22ad5b3 = 203: 29eb38c SECURITY.md: document Git for Windows' policies