Rebase shears/seen: 8 conflict(s) (3 skipped, 5 resolved) (#24700386458)#140
Open
gitforwindowshelper[bot] wants to merge 288 commits intobase/shears/seen-24700386458from
Open
Rebase shears/seen: 8 conflict(s) (3 skipped, 5 resolved) (#24700386458)#140gitforwindowshelper[bot] wants to merge 288 commits intobase/shears/seen-24700386458from
gitforwindowshelper[bot] wants to merge 288 commits intobase/shears/seen-24700386458from
Conversation
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>
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>
Start work on a new 'git survey' command to scan the repository for monorepo performance and scaling problems. The goal is to measure the various known "dimensions of scale" and serve as a foundation for adding additional measurements as we learn more about Git monorepo scaling problems. The initial goal is to complement the scanning and analysis performed by the GO-based 'git-sizer' (https://github.com/github/git-sizer) tool. It is hoped that by creating a builtin command, we may be able to take advantage of internal Git data structures and code that is not accessible from GO to gain further insight into potential scaling problems. Co-authored-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.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>
By default we will scan all references in "refs/heads/", "refs/tags/" and "refs/remotes/". Add command line opts let the use ask for all refs or a subset of them and to include a detached HEAD. Signed-off-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Continue walking the code path for the >4GB `hash-object --literally`
test to the hash algorithm step for LLP64 systems.
This patch lets the SHA1DC code use `size_t`, making it compatible with
LLP64 data models (as used e.g. by Windows).
The interested reader of this patch will note that we adjust the
signature of the `git_SHA1DCUpdate()` function without updating _any_
call site. This certainly puzzled at least one reviewer already, so here
is an explanation:
This function is never called directly, but always via the macro
`platform_SHA1_Update`, which is usually called via the macro
`git_SHA1_Update`. However, we never call `git_SHA1_Update()` directly
in `struct git_hash_algo`. Instead, we call `git_hash_sha1_update()`,
which is defined thusly:
static void git_hash_sha1_update(git_hash_ctx *ctx,
const void *data, size_t len)
{
git_SHA1_Update(&ctx->sha1, data, len);
}
i.e. it contains an implicit downcast from `size_t` to `unsigned long`
(before this here patch). With this patch, there is no downcast anymore.
With this patch, finally, the t1007-hash-object.sh "files over 4GB hash
literally" test case is fixed.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The tell-tale is the presence of the `MSYSTEM` value while compiling, of course. In that case, we want to ensure that `MSYSTEM` is set when running `git.exe`, and also enable the magic MSYS2 tty detection. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
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>
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>
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>
…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>
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>
This was pull request git-for-windows#1645 from ZCube/master Support windows container. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ws#4527) With this patch, Git for Windows works as intended on mounted APFS volumes (where renaming read-only files would fail). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Specify symlink type in .gitattributes
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>
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>
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>
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>
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>
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>
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: 2b8a3ab140 (Merge 'readme' into HEAD, 2018-06-07) (81fe37b3dd..2b8a3ab140)
Skipped: 3274ae3 (sideband: mask control characters, 2024-11-06)
Upstream equivalent: 0494953 (sideband: mask control characters, 2026-03-05)
Range-diff
1: 3274ae3 ! 1: 0494953 sideband: mask control characters
@@ Commit message There is likely a need for more fine-grained controls instead of using a "heavy hammer" like this, which will be introduced subsequently. + Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> + Signed-off-by: Junio C Hamano <gitster@pobox.com> ## sideband.c ## @@ sideband.c: void list_config_color_sideband_slots(struct string_list *list, const char *pref @@ sideband.c: void list_config_color_sideband_slots(struct string_list *list, cons +{ + strbuf_grow(dest, n); + for (; n && *src; src++, n--) { -+ if (!iscntrl(*src) || *src == '\t' || *src == '\n') ++ if (!iscntrl(*src) || *src == '\t' || *src == '\n') { + strbuf_addch(dest, *src); -+ else { ++ } else { + strbuf_addch(dest, '^'); -+ strbuf_addch(dest, 0x40 + *src); ++ strbuf_addch(dest, *src == 0x7f ? '?' : 0x40 + *src); + } + } +} @@ t/t5409-colorize-remote-messages.sh: test_expect_success 'fallback to color.ui' + printf "error: Have you \\033[31mread\\033[m this?\\n" >&2 + exec "$@" + EOF -+ test_config_global uploadPack.packObjectshook ./color-me-surprised && ++ 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 &&Skipped: 0462ca5 (sideband: introduce an "escape hatch" to allow control characters, 2024-11-06)
Upstream equivalent: 9ed1625 (sideband: introduce an "escape hatch" to allow control characters, 2026-03-05)
Range-diff
1: 0462ca5 ! 1: 9ed1625 sideband: introduce an "escape hatch" to allow control characters
@@ Commit message To help with those use cases, give users a way to opt-out of the protections: `sideband.allowControlCharacters`. + Suggested-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> + Signed-off-by: Junio C Hamano <gitster@pobox.com> ## Documentation/config.adoc ## @@ Documentation/config.adoc: include::config/sequencer.adoc[] @@ sideband.c: void list_config_color_sideband_slots(struct string_list *list, cons + strbuf_grow(dest, n); for (; n && *src; src++, n--) { - if (!iscntrl(*src) || *src == '\t' || *src == '\n') + if (!iscntrl(*src) || *src == '\t' || *src == '\n') { ## t/t5409-colorize-remote-messages.sh ## @@ t/t5409-colorize-remote-messages.sh: test_expect_success 'disallow (color) control sequences in sideband' ' EOF - test_config_global uploadPack.packObjectshook ./color-me-surprised && + test_config_global uploadPack.packObjectsHook ./color-me-surprised && test_commit need-at-least-one-commit && + git clone --no-local . throw-away 2>stderr &&Skipped: 8c8e102 (sideband: do allow ANSI color sequences by default, 2024-11-18)
Upstream equivalent: 12f0fda (sideband: do allow ANSI color sequences by default, 2026-03-05)
Range-diff
1: 8c8e102 ! 1: 12f0fda sideband: do allow ANSI color sequences by default
@@ Commit message to the terminal, and `sideband.allowControlCharacters` to override that behavior. - However, some `pre-receive` hooks that are actively used in practice - want to color their messages and therefore rely on the fact that Git - passes them through to the terminal. + However, as reported by brian m. carlson, some `pre-receive` hooks that + are actively used in practice want to color their messages and therefore + rely on the fact that Git passes them through to the terminal, even + though they have no way to determine whether the receiving side can + actually handle Escape sequences (think e.g. about the practice + recommended by Git that third-party applications wishing to use Git + functionality parse the output of Git commands). In contrast to other ANSI escape sequences, it is highly unlikely that coloring sequences can be essential tools in attack vectors that mislead Git users e.g. by hiding crucial information. Therefore we can have both: Continue to allow ANSI coloring sequences to - be passed to the terminal, and neutralize all other ANSI escape - sequences. + be passed to the terminal by default, and neutralize all other ANSI + Escape sequences. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> + Signed-off-by: Junio C Hamano <gitster@pobox.com> ## Documentation/config/sideband.adoc ## @@ @@ Documentation/config/sideband.adoc + this config setting to override this behavior: ++ +-- -+ color:: ++ `default`:: ++ `color`:: + Allow ANSI color sequences, line feeds and horizontal tabs, + but mask all other control characters. This is the default. -+ false:: ++ `false`:: + Mask all control characters other than line feeds and + horizontal tabs. -+ true:: ++ `true`:: + Allow all control characters to be sent to the terminal. +-- @@ sideband.c: static struct keyword_entry keywords[] = { -static int allow_control_characters; +static enum { -+ ALLOW_NO_CONTROL_CHARACTERS = 0, -+ ALLOW_ALL_CONTROL_CHARACTERS = 1, -+ ALLOW_ANSI_COLOR_SEQUENCES = 2 ++ ALLOW_NO_CONTROL_CHARACTERS = 0, ++ ALLOW_ANSI_COLOR_SEQUENCES = 1<<0, ++ ALLOW_DEFAULT_ANSI_SEQUENCES = ALLOW_ANSI_COLOR_SEQUENCES, ++ ALLOW_ALL_CONTROL_CHARACTERS = 1<<1, +} allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; /* Returns a color setting (GIT_COLOR_NEVER, etc). */ @@ sideband.c: static enum git_colorbool use_sideband_colors(void) + if (repo_config_get_string_tmp(the_repository, "sideband.allowcontrolcharacters", + &value)) + ; /* huh? `get_maybe_bool()` returned -1 */ ++ else if (!strcmp(value, "default")) ++ allow_control_characters = ALLOW_DEFAULT_ANSI_SEQUENCES; + else if (!strcmp(value, "color")) + allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; + else @@ sideband.c: void list_config_color_sideband_slots(struct string_list *list, cons + * Valid ANSI color sequences are of the form + * + * ESC [ [<n> [; <n>]*] m ++ * ++ * These are part of the Select Graphic Rendition sequences which ++ * contain more than just color sequences, for more details see ++ * https://en.wikipedia.org/wiki/ANSI_escape_code#SGR. + */ + + if (allow_control_characters != ALLOW_ANSI_COLOR_SEQUENCES || @@ sideband.c: void list_config_color_sideband_slots(struct string_list *list, cons } @@ sideband.c: static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) for (; n && *src; src++, n--) { - if (!iscntrl(*src) || *src == '\t' || *src == '\n') + if (!iscntrl(*src) || *src == '\t' || *src == '\n') { strbuf_addch(dest, *src); -- else { -+ else if ((i = handle_ansi_color_sequence(dest, src, n))) { ++ } else if ((i = handle_ansi_color_sequence(dest, src, n))) { + src += i; + n -= i; -+ } else { + } else { strbuf_addch(dest, '^'); - strbuf_addch(dest, 0x40 + *src); - } + strbuf_addch(dest, *src == 0x7f ? '?' : 0x40 + *src); ## t/t5409-colorize-remote-messages.sh ## @@ t/t5409-colorize-remote-messages.sh: test_expect_success 'fallback to color.ui' ' @@ t/t5409-colorize-remote-messages.sh: test_expect_success 'fallback to color.ui' + printf "error: Have you \\033[31mread\\033[m this?\\a\\n" >&2 exec "$@" EOF - test_config_global uploadPack.packObjectshook ./color-me-surprised && + test_config_global uploadPack.packObjectsHook ./color-me-surprised && @@ t/t5409-colorize-remote-messages.sh: test_expect_success 'disallow (color) control sequences in sideband' ' git clone --no-local . throw-away 2>stderr &&Resolved: 62db9f4 (compat/mingw: handle WSA errors in strerror, 2024-12-22)
kept both u-mingw and u-odb-inmemory entries in alphabetical order in Makefile and t/meson.build
Range-diff
1: 62db9f4 ! 1: 8711443 compat/mingw: handle WSA errors in strerror
Resolved: 3203a5c (t5563: verify that NTLM authentication works, 2025-11-26)
kept both upstream SPNEGO tests and downstream NTLM test as independent additions
Range-diff
1: 3203a5c ! 1: 9731fca t5563: verify that NTLM authentication works
Dropped (empty after resolution): 7f0f061 (http: extract http_reauth_prepare() from retry paths, 2026-04-13)
kept HEAD's negotiate early-return guard inside http_reauth_prepare() alongside the credential_fill call
Resolved: 8699090 (tests: use the correct path separator with BusyBox, 2018-11-19)
kept both upstream set-e block and downstream PATH_SEP block after license header
Range-diff
1: 8699090 ! 1: 0d50482 tests: use the correct path separator with BusyBox
Resolved: e05631f (t9200: skip tests when $PWD contains a colon, 2017-07-07)
adapted patch to use upstream's new CVS check syntax (
if ! cvs versioninstead ofcvs; if test $? -ne 1), added colon-in-PWD skip block before itRange-diff
1: e05631f ! 1: e7d1f04 t9200: skip tests when $PWD contains a colon
To: 872783099d (Merge 'readme' into HEAD, 2018-06-07) (3f07d327fa..872783099d)
Statistics
Range-diff (click to expand)
1: 13a28e8 = 1: 37ada74 ci(dockerized): reduce the PID limit for private repositories
2: 8002ae4 = 2: 4ce0a81 mingw: skip symlink type auto-detection for network share targets
3: aa6fc1a = 3: b824c42 Merge branch 'fix-ci'
4: bc4c353 = 4: 657bafd unix-socket: avoid leak when initialization fails
5: 6d527f9 = 5: fcced51 Merge branch 'prevent-accidental-ntlm-exfiltration-via-symlinks'
6: 109e1fb = 6: 2df94bd grep: prevent
^$false match at end of file7: 8cdf503 = 7: 080f9e7 Merge branch 'v2.53.0.windows.3'
8: 369a197 = 8: aa963c0 Merge branch 'fixes-from-the-git-mailing-list'
15: 1d087a0 = 9: 581e581 vcpkg_install: detect lack of Git
17: f348d95 = 10: 4af0a64 vcpkg_install: add comment regarding slow network connections
19: ae005f1 = 11: d9d9eef vcbuild: install ARM64 dependencies when building ARM64 binaries
21: 2117b3b = 12: 54abd00 vcbuild: add an option to install individual 'features'
23: d932a08 = 13: 6cf1445 cmake: allow building for Windows/ARM64
14: 46b1a5c = 14: 3084522 mingw: include the Python parts in the build
25: daa57a8 = 15: 9e0d9a7 ci(vs-build) also build Windows/ARM64 artifacts
16: 13d0017 = 16: 61eab17 win32/pthread: avoid name clashes with winpthread
27: bdbf1ea = 17: 101e978 Add schannel to curl installation
18: 39253e7 = 18: cc08579 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
30: 9f7034b = 19: 58a0131 cmake(): allow setting HOST_CPU for cross-compilation
20: c863f5e = 20: d0f151e Import the source code of mimalloc v2.2.7
9: eb560c6 = 21: 890cf1e t9350: point out that refs are not updated correctly
33: 431e00b = 22: 416cd8f CMake: default Visual Studio generator has changed
22: d9fea5c = 23: 1439022 mimalloc: adjust for building inside Git
10: 8666fbb = 24: d2972f9 transport-helper: add trailing --
36: fcd9087 = 25: f454c4c mingw: demonstrate a
git addissue with NTFS junctions37: 9a9c216 = 26: d1eeff4 .gitignore: add Visual Studio CMakeSetting.json file
24: 3e1bb45 = 27: 21cf650 mimalloc: offer a build-time option to enable it
40: e93c5c0 = 28: 6f50c1f t5505/t5516: allow running without
.git/branches/in the templates28: 5bd7442 = 29: 340d726 hash-object: demonstrate a >4GB/LLP64 problem
11: 95ca9ed = 30: 8d64e8e remote-helper: check helper status after import/export
41: bb80d51 = 31: c298baf clean: do not traverse mount points
42: 492dbb6 = 32: 1407ab5 strbuf_realpath(): use platform-dependent API if available
43: 61a1a47 = 33: 55eb274 http: use new "best effort" strategy for Secure Channel revoke checking
44: 7c527f8 = 34: 9bbafe4 subtree: update
contrib/subtreetesttarget45: b57e9b1 = 35: 50a5aa7 CMakeLists: add default "x64-windows" arch for Visual Studio
26: 02d2e17 = 36: e725930 mingw: use mimalloc
50: b6810c5 = 37: e81869a t5505/t5516: fix white-space around redirectors
31: a1666f9 = 38: 43826a8 object-file.c: use size_t for header lengths
12: 2d1ea8b = 39: 406efde Always auto-gc after calling a fast-import transport
13: 219637a = 40: 8f95eba mingw: prevent regressions with "drive-less" absolute paths
52: 0c9dc91 = 41: b771707 clean: remove mount points when possible
53: 49062eb = 42: 0d036b0 transport: optionally disable side-band-64k
54: 7d8eb50 = 43: 777bf1b mingw: fix fatal error working on mapped network drives on Windows
55: a7e1374 = 44: 1c48890 clink.pl: fix MSVC compile script to handle libcurl-d.lib
56: 6d8ebf4 = 45: dded22e mingw: implement a platform-specific
strbuf_realpath()57: 173ff12 = 46: 4055f86 t3701: verify that we can add lots of files interactively
58: ecfc7ff = 47: 5f5b7ec commit: accept "scissors" with CR/LF line endings
59: e89ab09 = 48: c7cdbb5 t0014: fix indentation
60: 8f68f76 = 49: 9acfd60 git-gui: accommodate for intent-to-add files
61: 61fb24e = 50: 8b84d76 mingw: allow for longer paths in
parse_interpreter()62: a2e4e1e = 51: b6eccd2 compat/vcbuild: document preferred way to build in Visual Studio
63: 4f67c0d = 52: f16c791 http: optionally send SSL client certificate
64: 59ee55e = 53: b276132 ci: run
contrib/subtreetests in CI builds65: b09f7a2 = 54: 0011368 CMake: show Win32 and Generator_platform build-option values
29: 84e33eb = 55: b1c3a8f windows: skip linking
git-<command>for built-ins32: 6258f0f = 56: bcd64cc mingw: stop hard-coding
CC = gcc35: 4763fdf = 57: 84d2376 mingw: drop the -D_USE_32BIT_TIME_T option
39: 0cf043e = 58: 287cccd mingw: only use -Wl,--large-address-aware for 32-bit builds
49: 56e16e6 = 59: 6d91376 mingw: avoid over-specifying
--pic-executable73: 604ae9f = 60: c12d8b6 mingw: set the prefix and HOST_CPU as per MSYS2's settings
74: ee521d6 = 61: 58ff936 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
75: 345951a = 62: b9200ff mingw: rely on MSYS2's metadata instead of hard-coding it
76: 107b135 = 63: 2f246f7 mingw: always define
ETC_*for MSYS2 environments77: b32495b = 64: f8d07c5 max_tree_depth: lower it for clang builds in general on Windows
78: 9fcaacd = 65: 4e54dc2 mingw: ensure valid CTYPE
80: 1b8968e = 66: f1326f3 mingw: allow
git.exeto be used instead of the "Git wrapper"82: f4a9d54 = 67: bf01310 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
84: ae6ee63 = 68: 6590296 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
86: f1d6418 = 69: 2bd1260 clink.pl: fix libexpatd.lib link error when using MSVC
79: 086702b = 70: b3e9925 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
88: 1563fd7 = 71: 647e653 Makefile: clean up .ilk files when MSVC=1
81: f303826 = 72: 7f60301 revision: create mark_trees_uninteresting_dense()
90: 9c83f9b = 73: 26f2219 vcbuild: add support for compiling Windows resource files
83: 796bf7b = 74: 7b623f3 survey: stub in new experimental 'git-survey' command
92: 4f48a5e = 75: accaec8 config.mak.uname: add git.rc to MSVC builds
51: 9a3afb1 = 76: 42cdf8a MinGW: link as terminal server aware
85: f17a63c = 77: 1b584aa survey: add command line opts to select references
34: 3d43d07 = 78: 22b39a7 hash algorithms: use size_t for section lengths
96: 85f7679 = 79: 3be200e clink.pl: ignore no-stack-protector arg on MSVC=1 builds
97: e44f0d6 = 80: 17ce6ec http: optionally load libcurl lazily
87: bbff099 = 81: df1c004 survey: start pretty printing data in table form
38: 07d6e19 = 82: d95084a hash-object --stdin: verify that it works with >4GB/LLP64
101: 3f1d7b4 = 83: ae126fd clink.pl: move default linker options for MSVC=1 builds
102: 90d9c41 = 84: 64d7a5e http: support lazy-loading libcurl also on Windows
89: f63c8ae = 85: 319a4f4 survey: add object count summary
46: 4650269 = 86: ed2b00c hash-object: add another >4GB/LLP64 test case
47: 8d5e42c = 87: 5166f1a setup: properly use "%(prefix)/" when in WSL
48: 127886c = 88: aeddd87 Add config option
windows.appendAtomically106: d551ed7 = 89: 2b875e9 cmake: install headless-git.
107: 02c7b66 = 90: 3f07d1d http: when loading libcurl lazily, allow for multiple SSL backends
91: 6acca4b = 91: 50b54cf survey: summarize total sizes by object type
66: a32ebf3 = 92: bab2de3 hash-object: add a >4GB/LLP64 test case using filtered input
67: 3be5687 = 93: f6a9539 compat/mingw.c: do not warn when failing to get owner
68: 0ef8869 = 94: 9020534 mingw: $env:TERM="xterm-256color" for newer OSes
69: 81fbeea = 95: 5707f49 winansi: check result and Buffer before using Name
70: 6cafa95 = 96: e088696 mingw: change core.fsyncObjectFiles = 1 by default
71: a2f24ce = 97: de7b8db Fix Windows version resources
72: edd9b90 = 98: 6133c1b status: fix for old-style submodules with commondir
112: a788171 = 99: 44d2cc9 git.rc: include winuser.h
113: 02118c2 = 100: c37922f mingw: do load libcurl dynamically by default
114: bcecc41 = 101: 563b8e7 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
115: 2b8913d = 102: fa2d88e mingw: suggest
windows.appendAtomicallyin more cases116: 5cb9ae1 = 103: 17ffff5 win32: use native ANSI sequence processing, if possible
117: 36b5dd9 = 104: d1e73a9 common-main.c: fflush stdout buffer upon exit
118: 62afdec = 105: a23283a t5601/t7406(mingw): do run tests with symlink support
119: e893977 = 106: 276f24d win32: ensure that
localtime_r()is declared even in i686 builds120: 78bc0a1 = 107: 2c881ef Fallback to AppData if XDG_CONFIG_HOME is unset
121: 64e7aef = 108: 5eae3f7 run-command: be helpful with Git LFS fails on Windows 7
93: 690a996 = 109: 4ec9ee6 survey: show progress during object walk
98: 166b9c5 = 110: f2e72cf survey: add ability to track prioritized lists
103: 93db378 = 111: b093fbb survey: add report of "largest" paths
108: 85c057e = 112: 5e8434e survey: add --top= option and config
94: 091dd2c = 113: f9cec24 mingw: make sure
errnois set correctly when socket operations fail122: bc9b6d9 = 114: 4cf1aba survey: clearly note the experimental nature in the output
99: 33ef77b = 115: 8711443 compat/mingw: handle WSA errors in strerror
104: d52e56a = 116: 533038c compat/mingw: drop outdated comment
109: a938ca5 = 117: 1f2fa44 t0301: actually test credential-cache on Windows
123: 457d955 = 118: d34937f credential-cache: handle ECONNREFUSED gracefully
124: 07c81bc = 119: fa69acb reftable: do make sure to use custom allocators
125: aafa9d5 = 120: c5a9fc1 check-whitespace: avoid alerts about upstream commits
126: 9a81e69 = 121: 0340ddc t/t5571-prep-push-hook.sh: Add test with writing to stderr
95: 260ec51 = 122: 9731fca t5563: verify that NTLM authentication works
100: 170e45d = 123: 010ed6f http: disallow NTLM authentication by default
105: d40c13d = 124: 92071b1 http: warn if might have failed because of NTLM
110: ce66e1c = 125: 19827c2 credential: advertise NTLM suppression and allow helpers to re-enable
127: f749166 = 126: 3896010 dir: do not traverse mount points
128: fe0b633 = 127: 2f25ebe win32: thread-utils: handle multi-socket systems
111: 1bb876a = 128: 018093a Merge 'remote-hg-prerequisites' into HEAD
130: 189d678 = 129: ef613fc Merge branch 'drive-prefix'
131: ad94acc = 130: d121199 Merge branch 'dont-clean-junctions'
132: aa5b514 = 131: 7e70962 Merge branch 'msys2-python'
133: cd9a4b7 = 132: 1dd11f8 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
134: 094d90e = 133: 1183d5f Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
135: acb2066 = 134: e805d4b Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
136: e3ff06d = 135: 3086084 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
137: ddb9fcd = 136: a55a009 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction138: 205cada = 137: 753b667 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
139: 4374705 = 138: 5a3bdae Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
140: f563f77 = 139: b759af2 Merge 'add-p-many-files'
141: 42945e5 = 140: ae5f0ab Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
142: 8ce8081 = 141: ff69910 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
143: 6bb1fe4 = 142: 9190d0f Merge 'git-gui/js/intent-to-add'
144: 20cce89 = 143: bc8262b Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
145: cf63a00 = 144: 7134ac5 Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
146: 1e0c94d = 145: 11ec0e5 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
147: 4b9c45b = 146: 8883d82 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path148: b738c5b = 147: ded700e Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
149: d8ebeb6 = 148: b60c968 Merge pull request http: Add support for enabling automatic sending of SSL client certificate git#3293 from pascalmuller/http-support-automatically-sending-client-certificate
150: f9c210f = 149: a47310c Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests151: 39e0efd = 150: 74ef8cf Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
152: 1392fc7 = 151: ef732ee Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t153: 2f3753e = 152: 584404a Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory154: 65366e7 = 153: dcd6a24 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
155: bbf6dec = 154: 3a3a17f Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
156: 99d7fb5 = 155: 03963a7 Merge branch 'optionally-dont-append-atomically-on-windows'
129: 07399eb = 156: 4d9c9f2 t5563: add tests for http.emptyAuth with Negotiate
157: 76bd84f = 157: 3e6729c Merge branch 'fsync-object-files-always'
158: d290124 = 158: a855f4a Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
159: 0792f55 = 159: 3bba8a4 Fix Windows version resources (Fix Windows version resources git#4092)
160: 9be2381 = 160: e238c06 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
161: 79a7797 = 161: 8f4a754 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)162: e01bb7b = 162: 9e25698 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)163: a972b81 = 163: feafb0d Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283164: ad84baf = 164: 1ed9c33 Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
165: ca09eab = 165: 50eaedf ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
166: 3c83c4f = 166: d3b818f Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl git#4410)
167: 27b70fb = 167: 85e8bd0 Merge branch 'nano-server'
168: 0024e1a = 168: 75fb4bc Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
169: 8de81f3 = 169: a5f8598 win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
170: 565428f = 170: 2cee7c1 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
171: 9a0e4ac = 171: 4aeb8cd Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
172: 5cd60c4 = 172: d1fe1b9 Merge branch 'Fix-i686-build-with-GCC-v14'
173: 258eb95 = 173: a21cdc6 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
174: fc6cd97 = 174: c0f1e41 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
175: c3d7255 = 175: 0bb3185 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
176: c4e5795 = 176: 02d1948 Add path walk API and its use in 'git pack-objects' (Add path walk API and its use in 'git pack-objects' git#5171)
177: 0a921e0 = 177: 4251ecf Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
178: 8ea09d5 = 178: ba5ce30 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
179: 8e8af12 = 179: 0165395 Merge branch 'reftable-vs-custom-allocators'
180: dccf110 = 180: fc81d77 Merge branch 'check-whitespace-only-downstream'
181: e7a230f = 181: b4f3d65 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)
182: 8fd7d02 = 182: db957c5 Merge branch 'disallow-ntlm-auth-by-default'
183: 615768b = 183: 50c7991 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)184: 3204b79 = 184: 6e375f7 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
185: 4e28556 = 185: e0f04fc http: fix emptyAuth=auto for Negotiate/SPNEGO (http: fix emptyAuth=auto for Negotiate/SPNEGO git#6170)
186: 765b70b = 186: 60adb51 Merge branch 'ready-for-upstream'
187: f0070f0 = 187: 335ac82 ci(macos): skip the
git p4tests188: c36410f = 188: 71ab7c7 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)189: 320c473 = 189: 61539eb Win32: make FILETIME conversion functions public
246: c2f4b20 = 190: c7573b0 git-gui--askyesno: fix funny text wrapping
190: aea3a12 = 191: 2cf961a Win32: dirent.c: Move opendir down
249: 1ba73ea = 192: 4dceda6 git-gui--askyesno (mingw): use Git for Windows' icon, if available
191: 1c8251d = 193: def8ece mingw: make the dirent implementation pluggable
252: 0f47a8c = 194: b94dba1 Merge branch 'git-gui-askyesno'
192: 2087ad6 = 195: 74701fc Win32: make the lstat implementation pluggable
193: 605541f = 196: d0033ce mingw: add infrastructure for read-only file system level caches
194: 6d853e0 = 197: c3d46a1 mingw: add a cache below mingw's lstat and dirent implementations
195: ebb92f8 = 198: 5240326 fscache: load directories only once
196: db1c6ad = 199: 0b9e3cd fscache: add key for GIT_TRACE_FSCACHE
197: 3d3a1e6 = 200: 5423554 fscache: remember not-found directories
198: 93edc2c = 201: 7f4da76 fscache: add a test for the dir-not-found optimization
199: c722f05 = 202: 92cc095 add: use preload-index and fscache for performance
200: ee8d296 = 203: d37e523 dir.c: make add_excludes aware of fscache during status
201: b9c12f3 = 204: db83c1f fscache: make fscache_enabled() public
202: 57253b4 = 205: 47fe1ec dir.c: regression fix for add_excludes with fscache
203: 15ad673 = 206: ffdbe1f fetch-pack.c: enable fscache for stats under .git/objects
204: 8734280 = 207: b7b9490 checkout.c: enable fscache for checkout again
205: 8e67a97 = 208: 9d4f8eb Enable the filesystem cache (fscache) in refresh_index().
206: 3342d66 = 209: 1efb378 fscache: use FindFirstFileExW to avoid retrieving the short name
207: a734534 = 210: 39eba74 fscache: add GIT_TEST_FSCACHE support
208: 9e238f1 = 211: 03191d9 fscache: add fscache hit statistics
209: d4f8361 = 212: 845629f unpack-trees: enable fscache for sparse-checkout
210: 2344821 = 213: 97b38e8 status: disable and free fscache at the end of the status command
211: b3e4d7e = 214: 02d3980 mem_pool: add GIT_TRACE_MEMPOOL support
212: d0ce696 = 215: c231bfb fscache: fscache takes an initial size
213: 5bcc89e = 216: b2da5c5 fscache: update fscache to be thread specific instead of global
214: 19d72d7 = 217: 1c55e80 fscache: teach fscache to use mempool
215: 34d90ae = 218: 37ad427 fscache: make fscache_enable() thread safe
216: 746cef5 = 219: ebb6c86 fscache: teach fscache to use NtQueryDirectoryFile
217: 9a27c2c = 220: 55ea75e fscache: remember the reparse tag for each entry
218: c77655b = 221: 3ab0c6b Merge branch 'fscache'
219: 6a70a80 = 222: 10a1f19 fscache: implement an FSCache-aware is_mount_point()
220: 923fdba = 223: 0f82451 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
221: ef61b29 = 224: a4a518f clean: make use of FSCache
222: da7c228 = 225: 1bca581 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
223: 4c6adc7 = 226: 89bf7e1 Merge branch 'dont-clean-junctions-fscache'
224: da021d3 = 227: 484a176 pack-objects (mingw): demonstrate a segmentation fault with large deltas
225: 40577ee = 228: 3bb0983 mingw: support long paths
226: e61ce73 = 229: 7aff5f7 win32(long path support): leave drive-less absolute paths intact
227: ebebfc8 = 230: 9e8ed2f compat/fsmonitor/fsm-*-win32: support long paths
228: d885ec3 = 231: 13edbfb clean: suggest using
core.longPathsif paths are too long to remove229: 3dd8ab8 = 232: bf264c2 mingw: Support
git_terminal_promptwith more terminals230: 591bcb5 = 233: 59260c6 compat/terminal.c: only use the Windows console if bash 'read -r' fails
231: f2bd5b3 = 234: af7d6da mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
232: 63f389f = 235: a61443d Win32: symlink: move phantom symlink creation to a separate function
233: befa279 = 236: 4a40669 Introduce helper to create symlinks that knows about index_state
234: 734e196 = 237: e945a43 mingw: allow to specify the symlink type in .gitattributes
235: ba05571 = 238: d01f303 Win32: symlink: add test for
symlinkattribute236: 5b89c5e = 239: 77033dc mingw: explicitly specify with which cmd to prefix the cmdline
237: 5f88942 = 240: bda8966 mingw: when path_lookup() failed, try BusyBox
238: 5a32330 = 241: 998b415 test-tool: learn to act as a drop-in replacement for
iconv243: 23939fc = 242: 85dffc2 mingw: introduce code to detect whether we're inside a Windows container
239: f86ecff = 243: f0f0201 tests(mingw): if
iconvis unavailable, usetest-helper --iconv245: b8683fb = 244: 84b235a mingw: when running in a Windows container, try to rename() harder
240: 50accdc = 245: 47af2a0 gitattributes: mark .png files as binary
248: 1589b99 = 246: 7c4e6c2 mingw: move the file_attr_to_st_mode() function definition
241: d8275c6 = 247: 53a236d tests: move test PNGs into t/lib-diff/
251: 89507ec = 248: ae099e3 mingw: Windows Docker volumes are not symbolic links
242: 9e08ecc = 249: e051903 tests: only override sort & find if there are usable ones in /usr/bin/
254: bff4074 = 250: bfee73b mingw: work around rename() failing on a read-only file
244: 820253b ! 251: 0d50482 tests: use the correct path separator with BusyBox
247: faf3b6c = 252: d4aed59 mingw: only use Bash-ism
builtin pwd -Wwhen available250: 30c3a05 = 253: 875e1ab tests (mingw): remove Bash-specific pwd option
253: 6164297 = 254: e1e7051 test-lib: add BUSYBOX prerequisite
256: 3da4864 = 255: be58604 t5003: use binary file from t/lib-diff/
258: 1c6068b = 256: d62174e t5532: workaround for BusyBox on Windows
260: 37a6dee = 257: 138382c t5605: special-case hardlink test for BusyBox-w32
262: fe5ad09 = 258: 5bbd784 t5813: allow for $PWD to be a Windows path
264: 401936b = 259: e7d1f04 t9200: skip tests when $PWD contains a colon
267: fdad7fa = 260: 54b1662 mingw: kill child processes in a gentler way
268: 95df682 = 261: 679c2ef mingw: optionally enable wsl compability file mode bits
271: e049027 = 262: 961d260 mingw: really handle SIGINT
274: b6812b6 = 263: a072528 Partially un-revert "editor: save and reset terminal after calling EDITOR"
277: aca015d = 264: d57c61d reset: reinstate support for the deprecated --stdin option
281: 0be6d19 = 265: 283328c fsmonitor: reintroduce core.useBuiltinFSMonitor
255: 331db34 = 266: f68c045 Merge branch 'gitk-and-git-gui-patches'
257: 5903367 = 267: f843464 Merge branch 'long-paths'
259: 7e16c2c = 268: 7908a49 Merge branch 'msys2'
261: 27d2cbe = 269: 4d9905f Merge 'docker-volumes-are-no-symlinks'
263: 64cc942 = 270: 1f9320d mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
265: 39d9df2 = 271: 7bec65d Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
266: c16dff3 ! 272: 2090933 Describe Git for Windows' architecture [no ci]
269: c976881 = 273: f677a5b Merge branch 'busybox-w32'
270: 1bb2b46 = 274: 69d33c5 Modify the Code of Conduct for Git for Windows
272: 5d31641 = 275: 798d906 Merge branch 'wsl-file-mode-bits'
273: 01ecb62 = 276: ae836ce CONTRIBUTING.md: add guide for first-time contributors
275: d11ceb8 = 277: 1953def Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
276: 0364b3e = 278: a2e9bc9 README.md: Add a Windows-specific preamble
278: 7c3ec1c = 279: ccce108 Merge branch 'un-revert-editor-save-and-reset'
279: e48aa93 = 280: be7394e Add an issue template
280: 5aaca4a = 281: 6945128 Add a GitHub workflow to monitor component updates
282: 6d54606 = 282: 009f0c1 Merge branch 'phase-out-reset-stdin'
283: 39e7b62 = 283: b68bccf Modify the GitHub Pull Request template (to reflect Git for Windows)
284: 801e03e = 284: a6b8cf0 dependabot: help keeping GitHub Actions versions up to date
285: 3535b04 = 285: a86b61c Merge branch 'deprecate-core.useBuiltinFSMonitor'
286: 49ffe11 = 286: 9501f92 SECURITY.md: document Git for Windows' policies
287: c032dde = 287: e987044 Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
288: 85e650e = 288: 8727830 Merge 'readme' into HEAD