Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#24113731296)#100
Open
gitforwindowshelper[bot] wants to merge 281 commits intobase/shears/seen-24113731296from
Open
Rebase shears/seen: 1 conflict(s) (0 skipped, 1 resolved) (#24113731296)#100gitforwindowshelper[bot] wants to merge 281 commits intobase/shears/seen-24113731296from
gitforwindowshelper[bot] wants to merge 281 commits intobase/shears/seen-24113731296from
Conversation
In 1e64d18 (mingw: do resolve symlinks in `getcwd()`) a problem was introduced that causes git for Windows to stop working with certain mapped network drives (in particular, drives that are mapped to locations with long path names). Error message was "fatal: Unable to read current working directory: No such file or directory". Present change fixes this issue as discussed in git-for-windows#2480 Signed-off-by: Bjoern Mueller <bjoernm@gmx.de>
Update clink.pl to link with either libcurl.lib or libcurl-d.lib depending on whether DEBUG=1 is set. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
There is a Win32 API function to resolve symbolic links, and we can use that instead of resolving them manually. Even better, this function also resolves NTFS junction points (which are somewhat similar to bind mounts). This fixes git-for-windows#2481. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The native Windows HTTPS backend is based on Secure Channel which lets the caller decide how to handle revocation checking problems caused by missing information in the certificate or offline CRL distribution points. Unfortunately, cURL chose to handle these problems differently than OpenSSL by default: while OpenSSL happily ignores those problems (essentially saying "¯\_(ツ)_/¯"), the Secure Channel backend will error out instead. As a remedy, the "no revoke" mode was introduced, which turns off revocation checking altogether. This is a bit heavy-handed. We support this via the `http.schannelCheckRevoke` setting. In curl/curl#4981, we contributed an opt-in "best effort" strategy that emulates what OpenSSL seems to do. In Git for Windows, we actually want this to be the default. This patch makes it so, introducing it as a new value for the `http.schannelCheckRevoke" setting, which now becmes a tristate: it accepts the values "false", "true" or "best-effort" (defaulting to the last one). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The convention in Git project's shell scripts is to have white-space _before_, but not _after_ the `>` (or `<`). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This change enhances `git commit --cleanup=scissors` by detecting scissors lines ending in either LF (UNIX-style) or CR/LF (DOS-style). Regression tests are included to specifically test for trailing comments after a CR/LF-terminated scissors line. Signed-off-by: Luke Bonanomi <lbonanomi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
These fixes have been sent to the Git mailing list but have not been picked up by the Git project yet. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
Merge this early to resolve merge conflicts early. 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>
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 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>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.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>
Create a wrapper for the Windows Resource Compiler (RC.EXE) for use by the MSVC=1 builds. This is similar to the CL.EXE and LIB.EXE wrappers used for the MSVC=1 builds. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
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>
Teach MSVC=1 builds to depend on the `git.rc` file so that the resulting executables have Windows-style resources and version number information within them. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This was pull request git-for-windows#1645 from ZCube/master Support windows container. 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>
…ws#4527) With this patch, Git for Windows works as intended on mounted APFS volumes (where renaming read-only files would fail). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
Specify symlink type in .gitattributes
The Git for Windows project has grown quite complex over the years, certainly much more complex than during the first years where the `msysgit.git` repository was abusing Git for package management purposes and the `git/git` fork was called `4msysgit.git`. Let's describe the status quo in a thorough way. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The TerminateProcess() function does not actually leave the child processes any chance to perform any cleanup operations. This is bad insofar as Git itself expects its signal handlers to run. A symptom is e.g. a left-behind .lock file that would not be left behind if the same operation was run, say, on Linux. To remedy this situation, we use an obscure trick: we inject a thread into the process that needs to be killed and to let that thread run the ExitProcess() function with the desired exit status. Thanks J Wyman for describing this trick. The advantage is that the ExitProcess() function lets the atexit handlers run. While this is still different from what Git expects (i.e. running a signal handler), in practice Git sets up signal handlers and atexit handlers that call the same code to clean up after itself. In case that the gentle method to terminate the process failed, we still fall back to calling TerminateProcess(), but in that case we now also make sure that processes spawned by the spawned process are terminated; TerminateProcess() does not give the spawned process a chance to do so itself. Please note that this change only affects how Git for Windows tries to terminate processes spawned by Git's own executables. Third-party software that *calls* Git and wants to terminate it *still* need to make sure to imitate this gentle method, otherwise this patch will not have any effect. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The Windows Subsystem for Linux (WSL) version 2 allows to use `chmod` on NTFS volumes provided that they are mounted with metadata enabled (see https://devblogs.microsoft.com/commandline/chmod-chown-wsl-improvements/ for details), for example: $ chmod 0755 /mnt/d/test/a.sh In order to facilitate better collaboration between the Windows version of Git and the WSL version of Git, we can make the Windows version of Git also support reading and writing NTFS file modes in a manner compatible with WSL. Since this slightly slows down operations where lots of files are created (such as an initial checkout), this feature is only enabled when `core.WSLCompat` is set to true. Note that you also have to set `core.fileMode=true` in repositories that have been initialized without enabling WSL compatibility. There are several ways to enable metadata loading for NTFS volumes in WSL, one of which is to modify `/etc/wsl.conf` by adding: ``` [automount] enabled = true options = "metadata,umask=027,fmask=117" ``` And reboot WSL. It can also be enabled temporarily by this incantation: $ sudo umount /mnt/c && sudo mount -t drvfs C: /mnt/c -o metadata,uid=1000,gid=1000,umask=22,fmask=111 It's important to note that this modification is compatible with, but does not depend on WSL. The helper functions in this commit can operate independently and functions normally on devices where WSL is not installed or properly configured. Signed-off-by: xungeng li <xungeng@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The Git project followed Git for Windows' lead and added their Code of Conduct, based on the Contributor Covenant v1.4, later updated to v2.0. We adapt it slightly to Git for Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Previously, we did not install any handler for Ctrl+C, but now we really want to because the MSYS2 runtime learned the trick to call the ConsoleCtrlHandler when Ctrl+C was pressed. With this, hitting Ctrl+C while `git log` is running will only terminate the Git process, but not the pager. This finally matches the behavior on Linux and on macOS. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This patch introduces support to set special NTFS attributes that are interpreted by the Windows Subsystem for Linux as file mode bits, UID and GID. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
…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>
Handle Ctrl+C in Git Bash nicely Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
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>
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>
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>
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>
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>
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>
…updates Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
git-for-windows@1edeb9a (Win32: warn if the console font doesn't support Unicode, 2014-06-10) introduced both code to detect the current console font on Windows Vista and newer and a fallback for older systems to detect the default console font and issue a warning if that font doesn't support unicode. Since we haven't supported any Windows older than Vista in almost a decade, we don't need to keep the workaround. This more or less fell out of git-for-windows#6108, but didn't quite fit into that PR. There are also some other version specific hacks and workarounds I considered dropping, but decided against: * git-for-windows@492f709 * I'm unsure if this regression has ever been fixed or just become the new normal. * git-for-windows#5042 * So far this hasn't been an issue on Windows 8.1, but officially Go 1.21 and newer only support Windows 10 and newer. So this might become a problem at any point.
…s#6108) While the currently used way to detect the number of CPU cores ond Windows is nice and straight-forward, GetSystemInfo() only [gives us access to the number of processors within the current group.](https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-system_info#members) While that is usually fine for systems with a single physical CPU, separate physical sockets are typically separate groups. Switch to using GetLogicalProcessorInformationEx() to handle multi-socket systems better. I've tested this on a physical single-socket x86-64 and a physical dual-socket x86-64 system, and on a virtual single-socket ARM64 system. Physical [multi-socket ARM64 systems seem to exist](https://cloudbase.it/ampere-altra-industry-leading-arm64-server/), but I don't have access to such hardware and the hypervisor I use apparently can't emulate that either.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workflow run
Rebase Summary: seen
From: 695ccca8de (Detect number of cores better on multi-socket systems (git-for-windows#6108), 2026-04-06) (a53c8e49ab..695ccca8de)
Resolved: 0ca8b9d (Winansi: Drop pre-Vista workaround (git-for-windows#6109), 2026-04-06)
All conflicts resolved by keeping HEAD versions; the winansi commit (44760f1) only modifies compat/winansi.c and doesn't touch any conflicting files
Range-diff
1: 0ca8b9d ! 1: f08c06a Winansi: Drop pre-Vista workaround (Winansi: Drop pre-Vista workaround git#6109)
@@ Commit message 1.21 and newer only support Windows 10 and newer. So this might become a problem at any point. - ## Documentation/config.adoc ## -@@ Documentation/config.adoc: include::config/sequencer.adoc[] - - include::config/showbranch.adoc[] - -+include::config/sideband.adoc[] -+ - include::config/sparse.adoc[] - - include::config/splitindex.adoc[] - - ## Documentation/config/sideband.adoc (new) ## + ## Documentation/config/sideband.adoc ## + remerge CONFLICT (add/add): Merge conflict in Documentation/config/sideband.adoc + index fbe4b20235..ddba93393c 100644 + --- Documentation/config/sideband.adoc + +++ Documentation/config/sideband.adoc @@ -+sideband.allowControlCharacters:: -+ By default, control characters that are delivered via the sideband -+ are masked, except ANSI color sequences. This prevents potentially -+ unwanted ANSI escape sequences from being sent to the terminal. Use -+ this config setting to override this behavior: -++ -+-- -+ color:: -+ Allow ANSI color sequences, line feeds and horizontal tabs, -+ but mask all other control characters. This is the default. -+ false:: -+ Mask all control characters other than line feeds and -+ horizontal tabs. -+ true:: -+ Allow all control characters to be sent to the terminal. -+-- + sideband.allowControlCharacters:: +-<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + ifdef::with-breaking-changes[] + By default, control characters that are delivered via the sideband + are masked, except ANSI color sequences. This prevents potentially +@@ Documentation/config/sideband.adoc: endif::with-breaking-changes[] + sideband.<url>.*:: + Apply the `sideband.*` option selectively to specific URLs. The + same URL matching logic applies as for `http.<url>.*` settings. +-======= +- By default, control characters that are delivered via the sideband +- are masked, except ANSI color sequences. This prevents potentially +- unwanted ANSI escape sequences from being sent to the terminal. Use +- this config setting to override this behavior: +-+ +--- +- color:: +- Allow ANSI color sequences, line feeds and horizontal tabs, +- but mask all other control characters. This is the default. +- false:: +- Mask all control characters other than line feeds and +- horizontal tabs. +- true:: +- Allow all control characters to be sent to the terminal. +--- +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) - ## Documentation/git-svn.adoc ## -@@ Documentation/git-svn.adoc: SYNOPSIS - -------- - [verse] - 'git svn' <command> [<options>] [<arguments>] -+(UNSUPPORTED!) - - DESCRIPTION - ----------- + ## builtin/reset.c ## + remerge CONFLICT (content): Merge conflict in builtin/reset.c + index 3bd7d56684..8e3c8509d7 100644 + --- builtin/reset.c + +++ builtin/reset.c +@@ builtin/reset.c: int cmd_reset(int argc, + struct object_id oid; + struct pathspec pathspec; + int intent_to_add = 0; +-<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + struct interactive_options interactive_opts = INTERACTIVE_OPTIONS_INIT; +-======= +- struct add_p_opt add_p_opt = ADD_P_OPT_INIT; +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + int nul_term_line = 0, read_from_stdin = 0; + const struct option options[] = { + OPT__QUIET(&quiet, N_("be quiet, only report errors")), - ## git-svn.perl ## -@@ git-svn.perl: sub term_init { - : new Term::ReadLine 'git-svn'; - } + ## git-curl-compat.h ## + remerge CONFLICT (content): Merge conflict in git-curl-compat.h + index cd9ec49139..5c8ceb076a 100644 + --- git-curl-compat.h + +++ git-curl-compat.h +@@ + #endif -+sub deprecated_warning { -+ my @lines = @_; -+ if (-t STDERR) { -+ @lines = map { "\e[33m$_\e[0m" } @lines; -+ } -+ warn join("\n", @lines), "\n"; -+} -+ -+deprecated_warning( -+ "WARNING: \`git svn\` is no longer supported by the Git for Windows project.", -+ "See https://github.com/git-for-windows/git/issues/5405 for details." -+); -+ - my $cmd; - for (my $i = 0; $i < @ARGV; $i++) { - if (defined $cmd{$ARGV[$i]}) { + /** +-<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + * CURLINFO_RETRY_AFTER was added in 7.66.0, released in September 2019. + * It allows curl to automatically parse Retry-After headers. + */ +@@ + #endif + + /** +-======= +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + * CURLSSLOPT_AUTO_CLIENT_CERT was added in 7.77.0, released in May + * 2021. + */ ## http.c ## -@@ http.c: static long http_retry_after = 0; + remerge CONFLICT (content): Merge conflict in http.c + index 6d557dd0e5..54cbf8ed7a 100644 + --- http.c + +++ http.c +@@ http.c: static long http_schannel_check_revoke_mode = + CURLSSLOPT_NO_REVOKE; + #endif + +-<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + static long http_retry_after = 0; static long http_max_retries = 0; static long http_max_retry_time = 300; -+ +-======= +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) /* * With the backend being set to `schannel`, setting sslCAinfo would override * the Certificate Store in cURL v7.60.0 and later, which is not what we want + ## refs/reftable-backend.c ## + remerge CONFLICT (content): Merge conflict in refs/reftable-backend.c + index ebb7d4c9b1..0ad77482ff 100644 + --- refs/reftable-backend.c + +++ refs/reftable-backend.c +@@ refs/reftable-backend.c: static struct ref_store *reftable_be_init(struct repository *repo, + umask(mask); + + reftable_set_alloc(malloc, realloc, free); +-<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + + refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir, + &ref_common_dir); + + base_ref_store_init(&refs->base, repo, refdir.buf, &refs_be_reftable); +-======= +- base_ref_store_init(&refs->base, repo, gitdir, &refs_be_reftable); +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + strmap_init(&refs->worktree_backends); + refs->store_flags = store_flags; + refs->log_all_ref_updates = repo_settings_get_log_all_ref_updates(repo); + ## sideband.c ## + remerge CONFLICT (content): Merge conflict in sideband.c + index e853e7fe5c..26e5bbd4b5 100644 + --- sideband.c + +++ sideband.c @@ sideband.c: static struct keyword_entry keywords[] = { - { "error", GIT_COLOR_BOLD_RED }, }; -+static enum { -+ ALLOW_NO_CONTROL_CHARACTERS = 0, -+ ALLOW_ALL_CONTROL_CHARACTERS = 1, -+ ALLOW_ANSI_COLOR_SEQUENCES = 2 -+} allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; -+ + static enum { +-<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + ALLOW_CONTROL_SEQUENCES_UNSET = -1, + ALLOW_NO_CONTROL_CHARACTERS = 0, + ALLOW_ANSI_COLOR_SEQUENCES = 1<<0, +@@ sideband.c: void sideband_apply_url_config(const char *url) + string_list_clear(&config.vars, 1); + urlmatch_config_release(&config); + } +-======= +- ALLOW_NO_CONTROL_CHARACTERS = 0, +- ALLOW_ALL_CONTROL_CHARACTERS = 1, +- ALLOW_ANSI_COLOR_SEQUENCES = 2 +-} allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + /* Returns a color setting (GIT_COLOR_NEVER, etc). */ static enum git_colorbool use_sideband_colors(void) - { @@ sideband.c: static enum git_colorbool use_sideband_colors(void) if (use_sideband_colors_cached != GIT_COLOR_UNKNOWN) return use_sideband_colors_cached; -+ switch (repo_config_get_maybe_bool(the_repository, "sideband.allowcontrolcharacters", &i)) { -+ case 0: /* Boolean value */ -+ allow_control_characters = i ? ALLOW_ALL_CONTROL_CHARACTERS : -+ ALLOW_NO_CONTROL_CHARACTERS; -+ break; -+ case -1: /* non-Boolean value */ -+ if (repo_config_get_string_tmp(the_repository, "sideband.allowcontrolcharacters", -+ &value)) -+ ; /* huh? `get_maybe_bool()` returned -1 */ -+ else if (!strcmp(value, "color")) -+ allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; -+ else -+ warning(_("unrecognized value for `sideband." -+ "allowControlCharacters`: '%s'"), value); -+ break; -+ default: -+ break; /* not configured */ -+ } -+ +-<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + if (allow_control_characters == ALLOW_CONTROL_SEQUENCES_UNSET) { + if (!repo_config_get_value(the_repository, "sideband.allowcontrolcharacters", &value)) + sideband_allow_control_characters_config("sideband.allowcontrolcharacters", value); + + if (allow_control_characters == ALLOW_CONTROL_SEQUENCES_UNSET) + allow_control_characters = ALLOW_DEFAULT_ANSI_SEQUENCES; +-======= +- switch (repo_config_get_maybe_bool(the_repository, "sideband.allowcontrolcharacters", &i)) { +- case 0: /* Boolean value */ +- allow_control_characters = i ? ALLOW_ALL_CONTROL_CHARACTERS : +- ALLOW_NO_CONTROL_CHARACTERS; +- break; +- case -1: /* non-Boolean value */ +- if (repo_config_get_string_tmp(the_repository, "sideband.allowcontrolcharacters", +- &value)) +- ; /* huh? `get_maybe_bool()` returned -1 */ +- else if (!strcmp(value, "color")) +- allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; +- else +- warning(_("unrecognized value for `sideband." +- "allowControlCharacters`: '%s'"), value); +- break; +- default: +- break; /* not configured */ +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + } + if (!repo_config_get_string_tmp(the_repository, key, &value)) - use_sideband_colors_cached = git_config_colorbool(key, value); - else if (!repo_config_get_string_tmp(the_repository, "color.ui", &value)) @@ sideband.c: void list_config_color_sideband_slots(struct string_list *list, const char *pref list_config_item(list, prefix, keywords[i].keyword); } -+static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int n) -+{ -+ int i; -+ -+ /* -+ * Valid ANSI color sequences are of the form -+ * -+ * ESC [ [<n> [; <n>]*] m -+ */ -+ -+ if (allow_control_characters != ALLOW_ANSI_COLOR_SEQUENCES || -+ n < 3 || src[0] != '\x1b' || src[1] != '[') -+ return 0; -+ -+ for (i = 2; i < n; i++) { -+ if (src[i] == 'm') { -+ strbuf_add(dest, src, i + 1); -+ return i; -+ } -+ if (!isdigit(src[i]) && src[i] != ';') -+ break; -+ } -+ -+ return 0; -+} -+ -+static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) -+{ -+ int i; -+ -+ if (allow_control_characters == ALLOW_ALL_CONTROL_CHARACTERS) { -+ strbuf_add(dest, src, n); -+ return; -+ } -+ -+ strbuf_grow(dest, n); -+ for (; n && *src; src++, n--) { -+ if (!iscntrl(*src) || *src == '\t' || *src == '\n') -+ strbuf_addch(dest, *src); -+ else if ((i = handle_ansi_color_sequence(dest, src, n))) { -+ src += i; -+ n -= i; -+ } else { -+ strbuf_addch(dest, '^'); -+ strbuf_addch(dest, 0x40 + *src); -+ } -+ } -+} -+ - /* - * Optionally highlight one keyword in remote output if it appears at the start - * of the line. This should be called for a single line only, which is -@@ sideband.c: static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n) +-<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + static int handle_ansi_sequence(struct strbuf *dest, const char *src, int n) +-======= +-static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int n) +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + { + int i; + +@@ sideband.c: static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int + * Valid ANSI color sequences are of the form + * + * ESC [ [<n> [; <n>]*] m +-<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + * + * These are part of the Select Graphic Rendition sequences which + * contain more than just color sequences, for more details see +@@ sideband.c: static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int + strchr("ABCDEFGHf", src[i])) || + ((allow_control_characters & ALLOW_ANSI_ERASE) && + strchr("JKMPX", src[i]))) { +-======= +- */ +- +- if (allow_control_characters != ALLOW_ANSI_COLOR_SEQUENCES || +- n < 3 || src[0] != '\x1b' || src[1] != '[') +- return 0; +- +- for (i = 2; i < n; i++) { +- if (src[i] == 'm') { +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + strbuf_add(dest, src, i + 1); + return i; + } +@@ sideband.c: static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) + { int i; - if (!want_color_stderr(use_sideband_colors())) { -- strbuf_add(dest, src, n); -+ strbuf_add_sanitized(dest, src, n); +-<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + if ((allow_control_characters & ALLOW_ALL_CONTROL_CHARACTERS)) { +-======= +- if (allow_control_characters == ALLOW_ALL_CONTROL_CHARACTERS) { +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + strbuf_add(dest, src, n); return; } -@@ sideband.c: static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n) + strbuf_grow(dest, n); + for (; n && *src; src++, n--) { +-<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + if (!iscntrl(*src) || *src == '\t' || *src == '\n') { + strbuf_addch(dest, *src); + } else if (allow_control_characters != ALLOW_NO_CONTROL_CHARACTERS && + (i = handle_ansi_sequence(dest, src, n))) { +-======= +- if (!iscntrl(*src) || *src == '\t' || *src == '\n') +- strbuf_addch(dest, *src); +- else if ((i = handle_ansi_color_sequence(dest, src, n))) { +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + src += i; + n -= i; + } else { + strbuf_addch(dest, '^'); +-<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + strbuf_addch(dest, *src == 0x7f ? '?' : 0x40 + *src); +-======= +- strbuf_addch(dest, 0x40 + *src); +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) } } - -- strbuf_add(dest, src, n); -+ strbuf_add_sanitized(dest, src, n); } - - + + ## t/meson.build ## + remerge CONFLICT (content): Merge conflict in t/meson.build + index 65bec885dc..25272d7ae4 100644 + --- t/meson.build + +++ t/meson.build +@@ t/meson.build: integration_tests = [ + 't7422-submodule-output.sh', + 't7423-submodule-symlinks.sh', + 't7424-submodule-mixed-ref-formats.sh', +-<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + 't7425-submodule-gitdir-path-extension.sh', + 't7426-submodule-get-default-remote.sh', +-======= +->>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + 't7429-submodule-long-path.sh', + 't7450-bad-git-dotfiles.sh', + 't7500-commit-template-squash-signoff.sh', ## t/t5409-colorize-remote-messages.sh ## + remerge CONFLICT (content): Merge conflict in t/t5409-colorize-remote-messages.sh + index 38df45751f..07cbc62736 100755 + --- t/t5409-colorize-remote-messages.sh + +++ t/t5409-colorize-remote-messages.sh @@ t/t5409-colorize-remote-messages.sh: test_expect_success 'fallback to color.ui' ' grep "<BOLD;RED>error<RESET>: error" decoded ' -+test_expect_success 'disallow (color) control sequences in sideband' ' -+ write_script .git/color-me-surprised <<-\EOF && -+ printf "error: Have you \\033[31mread\\033[m this?\\a\\n" >&2 -+ exec "$@" -+ EOF -+ test_config_global uploadPack.packObjectshook ./color-me-surprised && -+ test_commit need-at-least-one-commit && -+ -+ git clone --no-local . throw-away 2>stderr && -+ test_decode_color <stderr >decoded && -+ test_grep RED decoded && -+ test_grep "\\^G" stderr && -+ tr -dc "\\007" <stderr >actual && -+ test_must_be_empty actual && -+ -+ rm -rf throw-away && -+ git -c sideband.allowControlCharacters=false \ -+ clone --no-local . throw-away 2>stderr && -+ test_decode_color <stderr >decoded && -+ test_grep ! RED decoded && -+ test_grep "\\^G" stderr && -+ -+ rm -rf throw-away && -+ git -c sideband.allowControlCharacters clone --no-local . throw-away 2>stderr && -+ test_decode_color <stderr >decoded && -+ test_grep RED decoded && -+ tr -dc "\\007" <stderr >actual && -+ test_file_not_empty actual -+' -+ - test_done - - ## t/t9108-git-svn-glob.sh ## -@@ t/t9108-git-svn-glob.sh: test_expect_success 'test disallow multi-globs' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch three 2> stderr.three && -- test_cmp expect.three stderr.three -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean && -+ test_cmp expect.three stderr.three.clean - ' +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + if test_have_prereq WITH_BREAKING_CHANGES + then + TURN_ON_SANITIZING=already.turned=on +@@ t/t5409-colorize-remote-messages.sh: else + TURN_ON_SANITIZING=sideband.allowControlCharacters=color + fi - test_done - - ## t/t9109-git-svn-multi-glob.sh ## -@@ t/t9109-git-svn-multi-glob.sh: test_expect_success 'test disallow multiple globs' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch three 2> stderr.three && -- test_cmp expect.three stderr.three -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean && -+ test_cmp expect.three stderr.three.clean - ' +-================================ +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + test_expect_success 'disallow (color) control sequences in sideband' ' + write_script .git/color-me-surprised <<-\EOF && + printf "error: Have you \\033[31mread\\033[m this?\\a\\n" >&2 + exec "$@" + EOF +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + test_config_global uploadPack.packObjectsHook ./color-me-surprised && + test_commit need-at-least-one-commit && - test_done - - ## t/t9168-git-svn-partially-globbed-names.sh ## -@@ t/t9168-git-svn-partially-globbed-names.sh: test_expect_success 'test disallow prefixed multi-globs' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch four 2>stderr.four && -- test_cmp expect.four stderr.four && -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.four >stderr.four.clean && -+ test_cmp expect.four stderr.four.clean && - git config --unset svn-remote.four.branches && - git config --unset svn-remote.four.tags - ' -@@ t/t9168-git-svn-partially-globbed-names.sh: test_expect_success 'test disallow multiple asterisks in one word' ' - svn_cmd commit -m "try to try" - ) && - test_must_fail git svn fetch six 2>stderr.six && -- test_cmp expect.six stderr.six -+ sed "/^WARNING.*no.* supported/{N;d}" <stderr.six >stderr.six.clean && -+ test_cmp expect.six stderr.six.clean - ' + git -c $TURN_ON_SANITIZING clone --no-local . throw-away 2>stderr && +-================================ +- test_config_global uploadPack.packObjectshook ./color-me-surprised && +- test_commit need-at-least-one-commit && +- +- git clone --no-local . throw-away 2>stderr && +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) + test_decode_color <stderr >decoded && + test_grep RED decoded && + test_grep "\\^G" stderr && +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'disallow (color) control sequences in sideband' ' + test_file_not_empty actual + ' + +-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 0cd8e9a8dd (Merge 'readme' into HEAD) + test_decode_csi() { + awk '{ + while (match($0, /\033/) != 0) { +@@ t/t5409-colorize-remote-messages.sh: test_expect_success 'allow all control sequences for a specific URL' ' + test_grep ! "\\^\\[\\[K" decoded + ' +-================================ +->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 44760f1bb6 (compat/winansi: drop pre-Vista workaround) test_doneTo: 35316ae542 (Detect number of cores better on multi-socket systems (git-for-windows#6108), 2026-04-06) (ecedea27a2..35316ae542)
Statistics
Range-diff (click to expand)
1: 5e0c3e3 = 1: a95cd69 unix-socket: avoid leak when initialization fails
2: 332d69c = 2: 8a9de8d grep: prevent
^$false match at end of file3: 9f013b4 = 3: 3adbb78 Merge branch 'fixes-from-the-git-mailing-list'
4: 5bab523 = 4: 7263e11 vcpkg_install: detect lack of Git
5: 96141aa = 5: 6101b86 vcpkg_install: add comment regarding slow network connections
6: c02def0 = 6: 8abb3fd vcbuild: install ARM64 dependencies when building ARM64 binaries
7: 0120361 = 7: 34e0d6c vcbuild: add an option to install individual 'features'
8: b770796 = 8: a3aaf6e cmake: allow building for Windows/ARM64
9: 51f7f72 = 9: e03f00f mingw: include the Python parts in the build
10: 4c2f526 = 10: eeb2a5b ci(vs-build) also build Windows/ARM64 artifacts
11: deb6cf3 ! 11: 8f38804 win32/pthread: avoid name clashes with winpthread
12: a8a00e5 = 12: 6709399 Add schannel to curl installation
14: 0cc504f = 13: 61c3ea4 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
15: 7043fd6 = 14: 0bd147f cmake(): allow setting HOST_CPU for cross-compilation
17: 890586e = 15: eb8785a Import the source code of mimalloc v2.2.7
18: b6579ab = 16: fe791cf t9350: point out that refs are not updated correctly
19: 8b134e2 = 17: 860cc15 CMake: default Visual Studio generator has changed
21: 30760ab = 18: 76adbcf mimalloc: adjust for building inside Git
22: b7223ec = 19: e2be097 transport-helper: add trailing --
23: 7d5fc50 = 20: 9c20887 mingw: demonstrate a
git addissue with NTFS junctions24: 0a63d37 = 21: 65fc5a7 .gitignore: add Visual Studio CMakeSetting.json file
26: 654ffea = 22: d297ac3 mimalloc: offer a build-time option to enable it
27: b6cdb2e = 23: 23af437 t5505/t5516: allow running without
.git/branches/in the templates13: 55fe338 = 24: 9bd9875 hash-object: demonstrate a >4GB/LLP64 problem
28: cbb54c7 = 25: c2c9c44 remote-helper: check helper status after import/export
29: c870ae7 = 26: 5ad7655 clean: do not traverse mount points
30: 539c097 = 27: 00278aa strbuf_realpath(): use platform-dependent API if available
31: 765909f = 28: 53bb615 http: use new "best effort" strategy for Secure Channel revoke checking
32: 4b469a8 = 29: 80eef7b subtree: update
contrib/subtreetesttarget33: ca78134 = 30: 8b06611 CMakeLists: add default "x64-windows" arch for Visual Studio
36: 7e520d7 = 31: 5e750a6 mingw: use mimalloc
37: 557ef72 = 32: 970ceae t5505/t5516: fix white-space around redirectors
16: 48c8848 ! 33: 1751c68 object-file.c: use size_t for header lengths
38: 54c2185 = 34: 87e0d01 Always auto-gc after calling a fast-import transport
39: e58f2e7 = 35: 5ab5353 mingw: prevent regressions with "drive-less" absolute paths
40: 3fb9243 = 36: a2c9589 clean: remove mount points when possible
41: 024b680 = 37: 41a7a4a transport: optionally disable side-band-64k
42: 86b2a55 = 38: a39ba1e mingw: fix fatal error working on mapped network drives on Windows
43: a5a527f = 39: f1dbf78 clink.pl: fix MSVC compile script to handle libcurl-d.lib
44: e8c9ab8 = 40: 6857319 mingw: implement a platform-specific
strbuf_realpath()45: 982f550 = 41: 4c52dfd t3701: verify that we can add lots of files interactively
46: 8dfd0a1 = 42: 3aba9d7 commit: accept "scissors" with CR/LF line endings
47: b2cca5b = 43: a3fb125 t0014: fix indentation
48: 12ff8fa = 44: b51205b git-gui: accommodate for intent-to-add files
49: 54aa76a = 45: 11dc55c mingw: allow for longer paths in
parse_interpreter()50: a22475e = 46: 949aba2 compat/vcbuild: document preferred way to build in Visual Studio
51: 111c1d5 = 47: a9558b9 http: optionally send SSL client certificate
52: ce86366 = 48: 5b17c10 ci: run
contrib/subtreetests in CI builds53: 29bfa7e = 49: b537c41 CMake: show Win32 and Generator_platform build-option values
56: ce2c0d7 = 50: b468e49 windows: skip linking
git-<command>for built-ins57: cc0076b = 51: b778824 mingw: stop hard-coding
CC = gcc58: b75bfe3 = 52: 78a34a1 mingw: drop the -D_USE_32BIT_TIME_T option
59: b31aa0a = 53: 956dd4f mingw: only use -Wl,--large-address-aware for 32-bit builds
60: 7cf43aa = 54: 54b76b9 mingw: avoid over-specifying
--pic-executable61: 817d14e = 55: ba14813 mingw: set the prefix and HOST_CPU as per MSYS2's settings
62: f0f9f68 = 56: 6d94745 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
63: 34bb07d = 57: e59f839 mingw: rely on MSYS2's metadata instead of hard-coding it
64: 5a92dc1 = 58: 2d3ef85 mingw: always define
ETC_*for MSYS2 environments65: c5f604f = 59: 53b2f97 max_tree_depth: lower it for clang builds in general on Windows
66: 4b9ef49 = 60: c35cb64 mingw: ensure valid CTYPE
68: 34cf74b = 61: a659b5a mingw: allow
git.exeto be used instead of the "Git wrapper"70: 3ec9037 = 62: 1cedcdf mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
72: 1e01df8 = 63: 9074444 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
74: 196acd7 = 64: bcc64cc clink.pl: fix libexpatd.lib link error when using MSVC
76: 62435ab = 65: bd70ea3 Makefile: clean up .ilk files when MSVC=1
78: c4f9ba7 = 66: a45b94d vcbuild: add support for compiling Windows resource files
80: 360a446 = 67: defb045 config.mak.uname: add git.rc to MSVC builds
81: f5265ec = 68: d355564 MinGW: link as terminal server aware
20: 50dee02 = 69: f456938 hash algorithms: use size_t for section lengths
83: fbec6fb = 70: 66e0cda clink.pl: ignore no-stack-protector arg on MSVC=1 builds
84: 51ded12 = 71: 483f720 http: optionally load libcurl lazily
67: 0c82eb8 = 72: c4d59d1 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
25: 23161b9 = 73: d0ab37e hash-object --stdin: verify that it works with >4GB/LLP64
87: dc99655 = 74: c0038de clink.pl: move default linker options for MSVC=1 builds
88: 84857d1 = 75: 400323f http: support lazy-loading libcurl also on Windows
69: 410dfbe = 76: 267ed76 revision: create mark_trees_uninteresting_dense()
34: bbd9bb0 = 77: 10b6642 hash-object: add another >4GB/LLP64 test case
35: e058677 ! 78: 7aeafc9 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) {91: f61646f = 79: fcdeb9d Add config option
windows.appendAtomically92: 2e1cea8 = 80: 84d812b cmake: install headless-git.
93: aa453c4 = 81: 6b04eb9 http: when loading libcurl lazily, allow for multiple SSL backends
71: 1f8a4ac = 82: cc737c2 survey: stub in new experimental 'git-survey' command
54: cbe6948 = 83: 0de1b89 hash-object: add a >4GB/LLP64 test case using filtered input
55: 0da6aa8 = 84: b000bb4 compat/mingw.c: do not warn when failing to get owner
96: 5f76e5b = 85: 7c91646 mingw: $env:TERM="xterm-256color" for newer OSes
97: 8856ff7 = 86: 4cfd08e winansi: check result and Buffer before using Name
98: bdf11b8 = 87: 2264c19 mingw: change core.fsyncObjectFiles = 1 by default
99: d589781 = 88: 97ec8ed Fix Windows version resources
100: 94baef9 = 89: f763ede status: fix for old-style submodules with commondir
101: 7fd61b2 = 90: 352c3fe git.rc: include winuser.h
102: 8029ae6 = 91: 18c8bb9 mingw: do load libcurl dynamically by default
103: 6cc6990 = 92: 9eeb7f3 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
104: 2e3ac57 = 93: 95a7234 mingw: suggest
windows.appendAtomicallyin more cases105: ac4e147 = 94: c0eff08 win32: use native ANSI sequence processing, if possible
106: 6429c98 = 95: f04c1a4 common-main.c: fflush stdout buffer upon exit
107: fe1faca = 96: 691593a t5601/t7406(mingw): do run tests with symlink support
108: 201db7e = 97: 8e4a560 win32: ensure that
localtime_r()is declared even in i686 builds109: 73b3c56 = 98: b93a5ae Fallback to AppData if XDG_CONFIG_HOME is unset
110: d766aba = 99: 2fbba1d run-command: be helpful with Git LFS fails on Windows 7
112: 230fd8a = 100: 571239f Merge 'remote-hg-prerequisites' into HEAD
113: 76ad760 = 101: 2e8355c Merge branch 'drive-prefix'
114: 3027fa7 = 102: 69172d2 Merge branch 'dont-clean-junctions'
115: cd6fe14 = 103: 19bd0ad Merge branch 'msys2-python'
116: f3f0584 = 104: 55b668b Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
117: 4c1bd47 = 105: eac1cc7 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
118: 5a11f8b = 106: 7950501 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
119: dfd955a = 107: 15c2291 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
120: b14e581 = 108: f96421d Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction121: 72f655d = 109: 7e7cdd1 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
73: 7067a9d = 110: 9406f5f survey: add command line opts to select references
122: 99c6af7 = 111: ad869f2 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
75: f1906c0 = 112: 26c89c5 survey: start pretty printing data in table form
123: 78ddd18 = 113: 60506d5 Merge 'add-p-many-files'
77: e04ea03 = 114: e34a3ea survey: add object count summary
124: 8c02fbd = 115: 85c3c8a Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
79: a83b23a = 116: 373d047 survey: summarize total sizes by object type
125: 52514ff = 117: b96ca6e Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
82: 0bd7740 = 118: 51a8ac2 survey: show progress during object walk
86: 21aaf89 = 119: 253d244 mingw: make sure
errnois set correctly when socket operations fail126: bf3ba9c = 120: ee28aa6 Merge 'git-gui/js/intent-to-add'
85: 37d39d5 = 121: 32634da survey: add ability to track prioritized lists
90: 659174e = 122: 00b55ff compat/mingw: handle WSA errors in strerror
134: 70e6715 = 123: 8032a56 t5563: verify that NTLM authentication works
127: f211029 = 124: f9f80c4 Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
89: 1096b53 = 125: 78f7b7c survey: add report of "largest" paths
95: e49cb8c = 126: 915be59 compat/mingw: drop outdated comment
136: 66d73d3 = 127: 8268968 http: disallow NTLM authentication by default
128: c6882e0 = 128: 729eba0 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
94: c45fc72 = 129: 8562339 survey: add --top= option and config
138: 2d1b42a = 130: 5791a2d t0301: actually test credential-cache on Windows
139: 18b07e5 = 131: af3884b http: warn if might have failed because of NTLM
129: 96a053f = 132: 642402b Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
111: d518361 = 133: 7760212 survey: clearly note the experimental nature in the output
141: 0e2a3ce = 134: 690cd0b credential-cache: handle ECONNREFUSED gracefully
142: 417c5b6 = 135: d162335 reftable: do make sure to use custom allocators
143: a31c0fa = 136: 835cf2d check-whitespace: avoid alerts about upstream commits
144: 457c340 = 137: 8211844 t/t5571-prep-push-hook.sh: Add test with writing to stderr
145: 3b022d4 = 138: 63408f7 credential: advertise NTLM suppression and allow helpers to re-enable
146: 7ddf94e = 139: 7d547de dir: do not traverse mount points
130: f483396 = 140: 85b8f25 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path131: 09e50a7 = 141: 6243979 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
132: 5d6ddca = 142: 39ab7a5 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
133: 540d227 = 143: cfe5195 Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests135: f08c058 = 144: fb4a808 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
137: 9b6881c = 145: 6152d8b Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t140: 6ce9f54 = 146: bec82bf Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory147: a3fc118 = 147: 0f753f1 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
148: 92e83f9 = 148: f1aa557 Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
149: d6a380f = 149: 3184286 Merge branch 'optionally-dont-append-atomically-on-windows'
150: 13e24de = 150: 71d48af Merge branch 'fsync-object-files-always'
151: c35e673 = 151: 1f45794 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
152: 4dff7a7 = 152: 0f7048a Fix Windows version resources (Fix Windows version resources git#4092)
153: b6b39e4 = 153: 4b7bf88 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
154: 74cd6f8 = 154: 4ea3455 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)155: e9452bf = 155: 875ccc8 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)156: a18b7f7 = 156: 6d9204a Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283157: a7c0330 = 157: e02b840 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
158: a254a7d = 158: eda3fe8 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
159: f91c5d8 = 159: 3992f47 Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
160: 73e18dc = 160: 0792f69 Merge branch 'nano-server'
161: 66b7d2e = 161: 46ca873 Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
162: 5a1bc23 = 162: 0c5dcce win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
163: c86ece3 = 163: 4f181bf common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
164: 66ca690 = 164: 80c0e22 Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
165: 7802015 = 165: 549b293 Merge branch 'Fix-i686-build-with-GCC-v14'
166: fa68b3e = 166: 1de346a Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
167: a3f7c29 = 167: 5f9a11b Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
168: 4d481ea = 168: 185acae pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
169: f5a8c00 = 169: 4510df6 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
170: 6ca8b8e = 170: b9b4925 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
171: e749afb = 171: 030f605 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
172: ef39900 = 172: e15f5c3 Merge branch 'reftable-vs-custom-allocators'
173: c41900e = 173: f6f5499 Merge branch 'check-whitespace-only-downstream'
174: ff49b52 = 174: eb05d9f t/t5571-prep-push-hook.sh: Add test with writing to stderr (t/t5571-prep-push-hook.sh: Add test with writing to stderr git#6063)
175: 0a9aa09 = 175: cbba776 Merge branch 'disallow-ntlm-auth-by-default'
176: 4377501 = 176: 78e8bdf Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)177: 77a86c2 = 177: 8a7585b Merge branch 'ready-for-upstream'
178: 746436d = 178: 30ea462 ci(macos): skip the
git p4tests179: d67ee31 = 179: f4606c5 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)181: 0f2a0f8 = 180: 1b66a88 Win32: make FILETIME conversion functions public
182: c3ba885 = 181: c991a0f Win32: dirent.c: Move opendir down
183: 39f1ff9 = 182: a6032ba mingw: make the dirent implementation pluggable
184: bdc472c = 183: 3840a15 Win32: make the lstat implementation pluggable
185: db5613f = 184: 759fe74 mingw: add infrastructure for read-only file system level caches
186: 5f9c02b = 185: 368c34f mingw: add a cache below mingw's lstat and dirent implementations
187: 2224c2d = 186: b450420 fscache: load directories only once
188: ff1ab2e = 187: eb86e24 fscache: add key for GIT_TRACE_FSCACHE
189: f757b69 = 188: b57f50a fscache: remember not-found directories
190: 84bb9eb = 189: 8010642 fscache: add a test for the dir-not-found optimization
191: b1ba81f = 190: 2e6eff9 add: use preload-index and fscache for performance
192: 34bc42b = 191: 1f04510 dir.c: make add_excludes aware of fscache during status
193: 68bb6f7 = 192: 65faa6f fscache: make fscache_enabled() public
194: 4c9abb3 = 193: 199ceca dir.c: regression fix for add_excludes with fscache
195: 03921fe = 194: a974f48 fetch-pack.c: enable fscache for stats under .git/objects
196: 63505b0 = 195: d2b89d2 checkout.c: enable fscache for checkout again
197: a2c4409 = 196: f4c7b83 Enable the filesystem cache (fscache) in refresh_index().
180: cb8c0c5 = 197: 647f0ae git-gui--askyesno: fix funny text wrapping
198: 6c365e5 = 198: 330ddbf fscache: use FindFirstFileExW to avoid retrieving the short name
235: 578f375 = 199: 1958095 git-gui--askyesno (mingw): use Git for Windows' icon, if available
199: 9d63810 = 200: ff0b511 fscache: add GIT_TEST_FSCACHE support
238: 35ee293 = 201: c8b89a6 Merge branch 'git-gui-askyesno'
200: 390c3c7 = 202: 84644df fscache: add fscache hit statistics
201: c2a752e = 203: 76544b2 unpack-trees: enable fscache for sparse-checkout
202: 946bf69 = 204: 8781dd9 status: disable and free fscache at the end of the status command
203: f55f5c9 = 205: 2ebc053 mem_pool: add GIT_TRACE_MEMPOOL support
204: 0992acd = 206: b4bf8c6 fscache: fscache takes an initial size
205: e7dde74 = 207: 9eb3caf fscache: update fscache to be thread specific instead of global
206: 9f6f1ef = 208: b70e3fc fscache: teach fscache to use mempool
207: da0f3a7 = 209: ba892f1 fscache: make fscache_enable() thread safe
208: a00df72 = 210: 2135723 fscache: teach fscache to use NtQueryDirectoryFile
209: ac0061c = 211: 807f574 fscache: remember the reparse tag for each entry
210: d504085 = 212: f4ab14e Merge branch 'fscache'
211: 38e161d = 213: 69683c1 fscache: implement an FSCache-aware is_mount_point()
212: 3dcd0bc = 214: 7887bc7 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
213: 0443141 = 215: 7d2a4ba clean: make use of FSCache
214: 2e68fb4 = 216: 1294b2f Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
215: aa4105f = 217: b0c6bcb Merge branch 'dont-clean-junctions-fscache'
216: f903aa3 = 218: eefcb95 pack-objects (mingw): demonstrate a segmentation fault with large deltas
217: 40d99c4 = 219: 23f8112 mingw: support long paths
218: 39ac252 = 220: ff17e07 win32(long path support): leave drive-less absolute paths intact
219: bd4a5c1 = 221: 648db8a compat/fsmonitor/fsm-*-win32: support long paths
220: 2e7de6a = 222: 11707ae clean: suggest using
core.longPathsif paths are too long to remove221: bb6ca77 = 223: 66f99de mingw: Support
git_terminal_promptwith more terminals222: 7a8ff12 = 224: a316a3b compat/terminal.c: only use the Windows console if bash 'read -r' fails
223: 568698c = 225: 87460f9 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
224: caa8133 = 226: aa8ca1c Win32: symlink: move phantom symlink creation to a separate function
225: c94c54c ! 227: 15f661e Introduce helper to create symlinks that knows about index_state
226: 49cc55f = 228: 965b70f mingw: allow to specify the symlink type in .gitattributes
227: c5ab4b8 = 229: 08a6a8c Win32: symlink: add test for
symlinkattribute228: c3e2ba1 = 230: ff886ee mingw: explicitly specify with which cmd to prefix the cmdline
230: ae726b3 = 231: e8a7bfe mingw: when path_lookup() failed, try BusyBox
232: 3794bd9 = 232: 9da8f87 test-tool: learn to act as a drop-in replacement for
iconv234: 26e67e7 = 233: 658b215 tests(mingw): if
iconvis unavailable, usetest-helper --iconv237: 9454743 = 234: ad6bad6 gitattributes: mark .png files as binary
240: 41b0e9f = 235: 4caf5bb tests: move test PNGs into t/lib-diff/
241: 7d47eb5 = 236: a7cd17a tests: only override sort & find if there are usable ones in /usr/bin/
242: 3a5ca2e = 237: 6e610bf tests: use the correct path separator with BusyBox
243: c209415 = 238: fa803ed mingw: only use Bash-ism
builtin pwd -Wwhen available229: cb5cba7 = 239: 859aba9 mingw: introduce code to detect whether we're inside a Windows container
244: a924ee3 = 240: c19d13e tests (mingw): remove Bash-specific pwd option
231: 54f5295 = 241: f130ed6 mingw: when running in a Windows container, try to rename() harder
245: 1b81d46 = 242: 0e6e300 test-lib: add BUSYBOX prerequisite
233: 0f8912b = 243: 4bc0f93 mingw: move the file_attr_to_st_mode() function definition
247: d8850e7 = 244: bf3eca5 t5003: use binary file from t/lib-diff/
236: a4335bb = 245: da9b9cb mingw: Windows Docker volumes are not symbolic links
249: cfe97c0 = 246: 258f0ec t5532: workaround for BusyBox on Windows
239: de493ce = 247: a74210a mingw: work around rename() failing on a read-only file
246: 6f45153 = 248: d7b2b83 Merge branch 'gitk-and-git-gui-patches'
248: 6e16601 = 249: 6502faa Merge branch 'long-paths'
250: 772549a = 250: 857db95 Merge branch 'msys2'
251: f331341 = 251: faef428 t5605: special-case hardlink test for BusyBox-w32
252: 0ef8f73 = 252: 9afabdd Merge 'docker-volumes-are-no-symlinks'
253: f1b3614 = 253: daa38f2 t5813: allow for $PWD to be a Windows path
254: 51c9d2d = 254: 3e40d94 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
255: 510a452 = 255: 931010c t9200: skip tests when $PWD contains a colon
256: 8003ee4 = 256: 7fa3ca4 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
257: 347fdfa = 257: 4ac3787 Describe Git for Windows' architecture [no ci]
258: fe0a155 = 258: 0a3bbf9 mingw: kill child processes in a gentler way
259: 4d34f9c = 259: 317809b mingw: optionally enable wsl compability file mode bits
260: 180f616 = 260: 4946926 Merge branch 'busybox-w32'
261: f066397 = 261: eafb1bd Modify the Code of Conduct for Git for Windows
262: 0532ffb = 262: be71e4a mingw: really handle SIGINT
263: a2cf85d = 263: 0ee0b45 Merge branch 'wsl-file-mode-bits'
264: 68fc11a = 264: 44184e8 CONTRIBUTING.md: add guide for first-time contributors
265: 4e7a68b = 265: b613ac4 Partially un-revert "editor: save and reset terminal after calling EDITOR"
266: 9d46fa3 = 266: c248572 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
267: 63574f9 = 267: 50e40c4 README.md: Add a Windows-specific preamble
268: ab70113 = 268: 3a4e1ff reset: reinstate support for the deprecated --stdin option
269: dbfb3e8 = 269: ba09c89 Merge branch 'un-revert-editor-save-and-reset'
270: 2106678 = 270: 008d44d Add an issue template
271: 3deccd1 = 271: d285303 Add a GitHub workflow to monitor component updates
272: f03985d = 272: c99619a fsmonitor: reintroduce core.useBuiltinFSMonitor
273: c08356c = 273: b0cd38d Merge branch 'phase-out-reset-stdin'
274: 1c38fc1 = 274: cc5731d Modify the GitHub Pull Request template (to reflect Git for Windows)
275: 49316e3 = 275: 496f28a dependabot: help keeping GitHub Actions versions up to date
276: 2f54808 = 276: acb9fd9 Merge branch 'deprecate-core.useBuiltinFSMonitor'
277: c2de312 = 277: fbc7cd7 SECURITY.md: document Git for Windows' policies
278: 20326a5 = 278: d4c3cf3 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
279: ebac26f = 279: 0cd8e9a Merge 'readme' into HEAD
280: 0ca8b9d < -: ---------- Winansi: Drop pre-Vista workaround (Winansi: Drop pre-Vista workaround git#6109)
-: ---------- > 280: f08c06a Winansi: Drop pre-Vista workaround (Winansi: Drop pre-Vista workaround git#6109)
281: 695ccca = 281: 35316ae Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)