Rebase shears/seen: 3 conflict(s) (3 skipped, 0 resolved) (#24222800034)#109
Open
gitforwindowshelper[bot] wants to merge 281 commits intobase/shears/seen-24222800034from
Open
Rebase shears/seen: 3 conflict(s) (3 skipped, 0 resolved) (#24222800034)#109gitforwindowshelper[bot] wants to merge 281 commits intobase/shears/seen-24222800034from
gitforwindowshelper[bot] wants to merge 281 commits intobase/shears/seen-24222800034from
Conversation
In Git-for-Windows, work on using ARM64 has progressed. The commit 2d94b77 (cmake: allow building for Windows/ARM64, 2020-12-04) failed to notice that /compat/vcbuild/vcpkg_install.bat will default to using the "x64-windows" architecture for the vcpkg installation if not set, but CMake is not told of this default. Commit 635b6d9 (vcbuild: install ARM64 dependencies when building ARM64 binaries, 2020-01-31) later updated vcpkg_install.bat to accept an arch (%1) parameter, but retained the default. This default is neccessary for the use case where the project directory is opened directly in Visual Studio, which will find and build a CMakeLists.txt file without any parameters, thus expecting use of the default setting. Also Visual studio will generate internal .sln solution and .vcxproj project files needed for some extension tools. Inform users of the additional .sln/.vcxproj generation. ** How to test: rm -rf '.vs' # remove old visual studio settings rm -rf 'compat/vcbuild/vcpkg' # remove any vcpkg downloads rm -rf 'contrib/buildsystems/out' # remove builds & CMake artifacts with a fresh Visual Studio Community Edition, File>>Open>>(git *folder*) to load the project (which will take some time!). check for successful compilation. The implicit .sln (etc.) are in the hidden .vs directory created by Visual Studio. Signed-off-by: Philip Oakley <philipoakley@iee.email>
To complement the `--stdin` and `--literally` test cases that verify that we can hash files larger than 4GB on 64-bit platforms using the LLP64 data model, here is a test case that exercises `hash-object` _without_ any options. Just as before, we use the `big` file from the previous test case if it exists to save on setup time, otherwise generate it. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Thorough benchmarking with repacking a subset of linux.git (the commit history reachable from 93a6fef ([PATCH] fix the SYSCTL=n compilation, 2007-02-28), to be precise) suggest that this allocator is on par, in multi-threaded situations maybe even better than nedmalloc: `git repack -adfq` with mimalloc, 8 threads: 31.166991900 27.576763800 28.712311000 27.373859000 27.163141900 `git repack -adfq` with nedmalloc, 8 threads: 31.915032900 27.149883100 28.244933700 27.240188800 28.580849500 In a different test using GitHub Actions build agents (probably single-threaded, a core-strength of nedmalloc)): `git repack -q -d -l -A --unpack-unreachable=2.weeks.ago` with mimalloc: 943.426 978.500 939.709 959.811 954.605 `git repack -q -d -l -A --unpack-unreachable=2.weeks.ago` with nedmalloc: 995.383 952.179 943.253 963.043 980.468 While these measurements were not executed with complete scientific rigor, as no hardware was set aside specifically for these benchmarks, it shows that mimalloc and nedmalloc perform almost the same, nedmalloc with a bit higher variance and also slightly higher average (further testing suggests that nedmalloc performs worse in multi-threaded situations than in single-threaded ones). In short: mimalloc seems to be slightly better suited for our purposes than nedmalloc. Seeing that mimalloc is developed actively, while nedmalloc ceased to see any updates in eight years, let's use mimalloc on Windows instead. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Since commit 0c499ea (send-pack: demultiplex a sideband stream with status data, 2010-02-05) the send-pack builtin uses the side-band-64k capability if advertised by the server. Unfortunately this breaks pushing over the dump git protocol if used over a network connection. The detailed reasons for this breakage are (by courtesy of Jeff Preshing, quoted from https://groups.google.com/d/msg/msysgit/at8D7J-h7mw/eaLujILGUWoJ): MinGW wraps Windows sockets in CRT file descriptors in order to mimic the functionality of POSIX sockets. This causes msvcrt.dll to treat sockets as Installable File System (IFS) handles, calling ReadFile, WriteFile, DuplicateHandle and CloseHandle on them. This approach works well in simple cases on recent versions of Windows, but does not support all usage patterns. In particular, using this approach, any attempt to read & write concurrently on the same socket (from one or more processes) will deadlock in a scenario where the read waits for a response from the server which is only invoked after the write. This is what send_pack currently attempts to do in the use_sideband codepath. The new config option `sendpack.sideband` allows to override the side-band-64k capability of the server, and thus makes the dumb git protocol work. Other transportation methods like ssh and http/https still benefit from the sideband channel, therefore the default value of `sendpack.sideband` is still true. Signed-off-by: Thomas Braun <thomas.braun@byte-physics.de> Signed-off-by: Oliver Schneider <oliver@assarbad.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
To verify that the `clean` side of the `clean`/`smudge` filter code is correct with regards to LLP64 (read: to ensure that `size_t` is used instead of `unsigned long`), here is a test case using a trivial filter, specifically _not_ writing anything to the object store to limit the scope of the test case. As in previous commits, the `big` file from previous test cases is reused if available, to save setup time, otherwise re-generated. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In the case of Git for Windows (say, in a Git Bash window) running in a Windows Subsystem for Linux (WSL) directory, the GetNamedSecurityInfoW() call in is_path_owned_By_current_side() returns an error code other than ERROR_SUCCESS. This is consistent behavior across this boundary. In these cases, the owner would always be different because the WSL owner is a different entity than the Windows user. The change here is to suppress the error message that looks like this: error: failed to get owner for '//wsl.localhost/...' (1) Before this change, this warning happens for every Git command, regardless of whether the directory is marked with safe.directory. Signed-off-by: Derrick Stolee <derrickstolee@github.com>
For Windows builds >= 15063 set $env:TERM to "xterm-256color" instead of "cygwin" because they have a more capable console system that supports this. Also set $env:COLORTERM="truecolor" if unset. $env:TERM is initialized so that ANSI colors in color.c work, see 29a3963 (Win32: patch Windows environment on startup, 2012-01-15). See git-for-windows#3629 regarding problems caused by always setting $env:TERM="cygwin". This is the same heuristic used by the Cygwin runtime. Signed-off-by: Rafael Kitover <rkitover@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NtQueryObject under Wine can return a success but fill out no name. In those situations, Wine will set Buffer to NULL, and set result to the sizeof(OBJECT_NAME_INFORMATION). Running a command such as echo "$(git.exe --version 2>/dev/null)" will crash due to a NULL pointer dereference when the code attempts to null terminate the buffer, although, weirdly, removing the subshell or redirecting stdout to a file will not trigger the crash. Code has been added to also check Buffer and Length to ensure the check is as robust as possible due to the current behavior being fragile at best, and could potentially change in the future This code is based on the behavior of NtQueryObject under wine and reactos. Signed-off-by: Christopher Degawa <ccom@randomderp.com>
Atomic append on windows is only supported on local disk files, and it may cause errors in other situations, e.g. network file system. If that is the case, this config option should be used to turn atomic append off. Co-Authored-By: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: 孙卓识 <sunzhuoshi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
From the documentation of said setting: This boolean will enable fsync() when writing object files. This is a total waste of time and effort on a filesystem that orders data writes properly, but can be useful for filesystems that do not use journalling (traditional UNIX filesystems) or that only journal metadata and not file contents (OS X’s HFS+, or Linux ext3 with "data=writeback"). The most common file system on Windows (NTFS) does not guarantee that order, therefore a sudden loss of power (or any other event causing an unclean shutdown) would cause corrupt files (i.e. files filled with NULs). Therefore we need to change the default. Note that the documentation makes it sound as if this causes really bad performance. In reality, writing loose objects is something that is done only rarely, and only a handful of files at a time. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Whith Windows 2000, Microsoft introduced a flag to the PE header to mark executables as "terminal server aware". Windows terminal servers provide a redirected Windows directory and redirected registry hives when launching legacy applications without this flag set. Since we do not use any INI files in the Windows directory and don't write to the registry, we don't need this additional preparation. Telling the OS that we don't need this should provide slightly improved startup times in terminal server environments. When building for supported Windows Versions with MSVC the /TSAWARE linker flag is automatically set, but MinGW requires us to set the --tsaware flag manually. This partially addresses git-for-windows#3935. Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Add FileVersion, which is a required field As not all required fields were present, none were being included Fixes git-for-windows#4090 Signed-off-by: Kiel Hurley <kielhurley@gmail.com>
When t5605 tries to verify that files are hardlinked (or that they are not), it uses the `-links` option of the `find` utility. BusyBox' implementation does not support that option, and BusyBox-w32's lstat() does not even report the number of hard links correctly (for performance reasons). So let's just switch to a different method that actually works on Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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: 7e509c4476 (Merge 'readme' into HEAD, 2018-06-07) (116346c19a..7e509c4476)
Skipped: bec1102 (sideband: mask control characters, 2024-11-06)
Upstream equivalent: 0494953 (sideband: mask control characters, 2026-03-05)
Range-diff
1: bec1102 ! 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: 49625dc (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: 49625dc ! 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: ef329a4 (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: ef329a4 ! 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 &&To: 8e28316db8 (Merge 'readme' into HEAD, 2018-06-07) (a264df0fdd..8e28316db8)
Statistics
Range-diff (click to expand)
1: 6374196 = 1: 6bad2e1 unix-socket: avoid leak when initialization fails
2: 87e17fd = 2: f5b47d9 grep: prevent
^$false match at end of file3: 6563d2d = 3: 449904e Merge branch 'fixes-from-the-git-mailing-list'
4: b2132b8 = 4: 5d85de6 t9350: point out that refs are not updated correctly
10: 157f4f5 = 5: 2873595 mingw: include the Python parts in the build
22: cd17167 = 6: 8982f12 transport-helper: add trailing --
12: 09e95ff = 7: b9027a6 win32/pthread: avoid name clashes with winpthread
28: c039835 = 8: 68dd746 remote-helper: check helper status after import/export
29: c743cc4 = 9: 046f101 clean: do not traverse mount points
15: db9614f = 10: 4e18d98 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
38: 0df12f4 = 11: 91ab10f Always auto-gc after calling a fast-import transport
39: 4796772 = 12: b19e0e9 mingw: prevent regressions with "drive-less" absolute paths
40: 83412cf = 13: f7a69a7 clean: remove mount points when possible
5: a4b8df5 = 14: 5acbca9 vcpkg_install: detect lack of Git
6: 460e30d = 15: 6c2e4e1 vcpkg_install: add comment regarding slow network connections
7: 3daad8e = 16: 24b3e8c vcbuild: install ARM64 dependencies when building ARM64 binaries
8: 6853ca2 = 17: b17723f vcbuild: add an option to install individual 'features'
9: 34226e3 = 18: 84ef981 cmake: allow building for Windows/ARM64
11: c0ac414 = 19: 239f6bb ci(vs-build) also build Windows/ARM64 artifacts
13: f02341e = 20: 74c5f94 Add schannel to curl installation
14: 09bc59d = 21: 2bc3acd hash-object: demonstrate a >4GB/LLP64 problem
18: e1b8d41 = 22: 8904d40 Import the source code of mimalloc v2.2.7
16: 27871de = 23: 279ad5a cmake(): allow setting HOST_CPU for cross-compilation
17: 6166e61 = 24: 5dcf5be object-file.c: use size_t for header lengths
21: 27b71b5 = 25: 3a1b5d0 mimalloc: adjust for building inside Git
19: 729e92b = 26: 0c449b9 CMake: default Visual Studio generator has changed
20: a45e165 = 27: caefec5 hash algorithms: use size_t for section lengths
26: e3f9b21 = 28: f60b365 mimalloc: offer a build-time option to enable it
23: 046d917 = 29: 8cd5fe6 mingw: demonstrate a
git addissue with NTFS junctions24: 61d3418 = 30: 41164e0 .gitignore: add Visual Studio CMakeSetting.json file
25: 3aeb896 = 31: ba71df9 hash-object --stdin: verify that it works with >4GB/LLP64
36: 44bbe3b = 32: dcfce31 mingw: use mimalloc
27: f7efd5c = 33: 6bee3ec t5505/t5516: allow running without
.git/branches/in the templates30: 1e45cfb = 34: b4936ac strbuf_realpath(): use platform-dependent API if available
31: 71797f6 = 35: 92afeca http: use new "best effort" strategy for Secure Channel revoke checking
32: 7d13b11 = 36: 0a1f605 subtree: update
contrib/subtreetesttarget33: df4b259 = 37: 8827ecf CMakeLists: add default "x64-windows" arch for Visual Studio
34: b428b14 = 38: e67d677 hash-object: add another >4GB/LLP64 test case
35: 20120f5 = 39: 0092f95 setup: properly use "%(prefix)/" when in WSL
89: 613c2d5 = 40: be6cc54 Add config option
windows.appendAtomically56: 4764069 = 41: e4ad457 windows: skip linking
git-<command>for built-ins37: f745f95 = 42: 74343c0 t5505/t5516: fix white-space around redirectors
81: c3dec34 = 43: 3d7fd8c MinGW: link as terminal server aware
41: 9d21775 = 44: 53c7f15 transport: optionally disable side-band-64k
42: 0a72534 = 45: f4cef12 mingw: fix fatal error working on mapped network drives on Windows
43: 73ba568 = 46: ed3154c clink.pl: fix MSVC compile script to handle libcurl-d.lib
44: df24c98 = 47: 4ab688f mingw: implement a platform-specific
strbuf_realpath()45: 88294db = 48: c3cfc06 t3701: verify that we can add lots of files interactively
46: 40219a0 = 49: eca72a6 commit: accept "scissors" with CR/LF line endings
47: cd08d93 = 50: 3d68ef4 t0014: fix indentation
48: f082311 = 51: 0da842b git-gui: accommodate for intent-to-add files
49: 0e278ec = 52: 6351c57 mingw: allow for longer paths in
parse_interpreter()50: 986e7fc = 53: fa4d574 compat/vcbuild: document preferred way to build in Visual Studio
51: 3dae4ad = 54: 3f03a57 http: optionally send SSL client certificate
52: 00c0fdf = 55: 8305770 ci: run
contrib/subtreetests in CI builds53: aa31638 = 56: 24ddd1b CMake: show Win32 and Generator_platform build-option values
54: d6457ae = 57: 04da3fe hash-object: add a >4GB/LLP64 test case using filtered input
55: 491efdf = 58: e3b8bae compat/mingw.c: do not warn when failing to get owner
94: b98ea0f = 59: febc71e mingw: $env:TERM="xterm-256color" for newer OSes
95: df4e3f3 = 60: c7a3963 winansi: check result and Buffer before using Name
96: 36d2266 = 61: c213046 mingw: change core.fsyncObjectFiles = 1 by default
97: 20bc121 = 62: b146509 Fix Windows version resources
98: b068538 = 63: d3f9de0 status: fix for old-style submodules with commondir
57: 58eab59 = 64: a404d6a mingw: stop hard-coding
CC = gcc58: 31ff140 = 65: e65b9af mingw: drop the -D_USE_32BIT_TIME_T option
59: c1f9e2b = 66: 2046563 mingw: only use -Wl,--large-address-aware for 32-bit builds
60: ba9bd64 = 67: 3fb3266 mingw: avoid over-specifying
--pic-executable61: d598cd0 = 68: b069ed6 mingw: set the prefix and HOST_CPU as per MSYS2's settings
62: 8d027ae = 69: 890d5f5 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
63: 560e979 = 70: 3a58ef0 mingw: rely on MSYS2's metadata instead of hard-coding it
64: 66511bd = 71: 088c0eb mingw: always define
ETC_*for MSYS2 environments65: 273b0bc = 72: e4c087d max_tree_depth: lower it for clang builds in general on Windows
66: cfac07b = 73: bc1b2ed mingw: ensure valid CTYPE
67: c71c23e = 74: 0620ac0 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
68: 19390b3 = 75: 089c2cf mingw: allow
git.exeto be used instead of the "Git wrapper"69: 3510511 = 76: 8c5d707 revision: create mark_trees_uninteresting_dense()
70: e83aca0 = 77: af439e5 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
71: c4a26df = 78: a47945b survey: stub in new experimental 'git-survey' command
72: 3c0c985 = 79: 9016027 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
73: d1f176b = 80: 65a6f58 survey: add command line opts to select references
74: dad4ff2 = 81: 5b094bd clink.pl: fix libexpatd.lib link error when using MSVC
75: a2629a3 = 82: 33e2cf0 survey: start pretty printing data in table form
76: 5094a3f = 83: 2aae740 Makefile: clean up .ilk files when MSVC=1
77: 2e5e5a7 = 84: 701b9e5 survey: add object count summary
78: 1977bd3 ! 85: 2629ad4 vcbuild: add support for compiling Windows resource files
79: 4e63256 = 86: 5f080b3 survey: summarize total sizes by object type
80: f9cd3fb = 87: a315ed1 config.mak.uname: add git.rc to MSVC builds
82: 202f258 = 88: 97fa5f7 survey: show progress during object walk
93: 3bbd733 = 89: 4ae9535 mingw: make sure
errnois set correctly when socket operations fail83: c041c8b = 90: 0dbef46 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
84: 03c9808 = 91: b15b3af http: optionally load libcurl lazily
85: 579854a = 92: a0fe012 survey: add ability to track prioritized lists
131: 09e1500 = 93: e9ab12b compat/mingw: handle WSA errors in strerror
132: d7450f8 = 94: 513dea7 t5563: verify that NTLM authentication works
86: 0ea3651 = 95: 5f7948b clink.pl: move default linker options for MSVC=1 builds
87: 1d11f03 = 96: 0eb586e http: support lazy-loading libcurl also on Windows
88: 9b8dd34 = 97: 8eaf6ca survey: add report of "largest" paths
134: 39f184f = 98: ec7aa74 compat/mingw: drop outdated comment
135: ff55bef = 99: e793380 http: disallow NTLM authentication by default
90: 3f58d51 = 100: 47cf682 cmake: install headless-git.
91: f0c5e25 = 101: 45e4070 http: when loading libcurl lazily, allow for multiple SSL backends
92: 279457b = 102: a568cb2 survey: add --top= option and config
137: 861a5df = 103: 111079e t0301: actually test credential-cache on Windows
138: 7c63dce = 104: 08efe32 http: warn if might have failed because of NTLM
99: 422af79 = 105: d13777b git.rc: include winuser.h
100: a44356f = 106: 91a9af1 mingw: do load libcurl dynamically by default
101: 7673117 = 107: 1b18e26 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
102: 1ed32f2 = 108: a27dd5e mingw: suggest
windows.appendAtomicallyin more cases103: 06a0808 = 109: afa732c win32: use native ANSI sequence processing, if possible
104: 946498e = 110: 126d6dc common-main.c: fflush stdout buffer upon exit
105: 068abf4 = 111: 0963b3d t5601/t7406(mingw): do run tests with symlink support
106: fa7c30d = 112: b6967af win32: ensure that
localtime_r()is declared even in i686 builds107: 20e42d9 = 113: 028c564 Fallback to AppData if XDG_CONFIG_HOME is unset
108: 361ec12 = 114: 759c0fc run-command: be helpful with Git LFS fails on Windows 7
109: 6c788bf = 115: 5c4eacf survey: clearly note the experimental nature in the output
140: cf2fe4c = 116: f99f874 credential-cache: handle ECONNREFUSED gracefully
141: ee15ef4 = 117: 62f0edd reftable: do make sure to use custom allocators
142: 0851242 = 118: 774e7c6 check-whitespace: avoid alerts about upstream commits
143: b477762 = 119: 86aef58 t/t5571-prep-push-hook.sh: Add test with writing to stderr
144: b5867b4 = 120: 480c707 credential: advertise NTLM suppression and allow helpers to re-enable
110: 0dfb807 = 121: ba49be0 Merge 'remote-hg-prerequisites' into HEAD
111: 882b93a = 122: 5ab69c1 Merge branch 'drive-prefix'
112: e005990 = 123: fab2b12 Merge branch 'dont-clean-junctions'
113: 0759d36 = 124: 0915ccc Merge branch 'msys2-python'
114: c4f433e = 125: 0bc9e53 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
115: 599b2dc = 126: 281b9f8 Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
116: 3379989 = 127: 08a2ff5 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
117: 3804583 = 128: 94d54ff Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
118: 0677662 = 129: bae3d48 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction119: 728cdd8 = 130: 9cae1bb Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
120: ef01250 = 131: 0ed8393 Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
121: cb340d5 = 132: fa98eee Merge 'add-p-many-files'
122: af4777a = 133: f09988c Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
123: 37b184e = 134: 671aab2 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
124: 306420f = 135: 8c956fd Merge 'git-gui/js/intent-to-add'
125: 614267f = 136: 916afde Merge pull request Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs git#2351 from PhilipOakley/vcpkg-tip
126: 26e6f74 = 137: 5bdf58e Merge pull request Windows arm64 support git#2915 from dennisameling/windows-arm64-support
127: 958044c = 138: 4d80893 Merge pull request cmake(): allow setting HOST_CPU for cross-compilation git#3327 from dennisameling/fix-host-cpu
128: 2de5c1b = 139: 7d2ba07 Merge pull request mingw: allow for longer paths in
parse_interpreter()git#3165 from dscho/increase-allowed-length-of-interpreter-path129: ef06f8c = 140: 27d5122 Merge pull request Let the documentation reflect that there is no vs/master anymore git#3220 from dscho/there-is-no-vs/master-anymore
130: f575812 = 141: 22e4f5c 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: 3d52fba = 142: 23a2dbd Merge pull request Add
contrib/subtreetest execution to CI builds git#3349 from vdye/feature/ci-subtree-tests136: a183154 = 143: 590d320 Merge pull request Make Git for Windows start builds in modern Visual Studio git#3306 from PhilipOakley/vs-sln
139: 724aee4 = 144: 2ebf07c Merge pull request Begin
unsigned long->size_tconversion to support large files on Windows git#3533 from PhilipOakley/hashliteral_t146: 7c3396b = 145: 9dd6b52 Merge pull request Various fixes around
safe.directorygit#3791: Various fixes aroundsafe.directory147: 3c4fbff = 146: d662929 Merge pull request mingw: set $env:TERM=xterm-256color for newer OSes git#3751 from rkitover/native-term
148: faf7cbe = 147: 7a2a65b Merge pull request winansi: check result before using Name for pty git#3875 from 1480c1/wine/detect_msys_tty
149: 2c19090 = 148: 821ac0d Merge branch 'optionally-dont-append-atomically-on-windows'
150: bdccf05 = 149: 8ea7ed0 Merge branch 'fsync-object-files-always'
151: d7c2003 = 150: 6bd0519 Merge pull request MinGW: link as terminal server aware git#3942 from rimrul/mingw-tsaware
152: 201b3c6 = 151: 6315149 Fix Windows version resources (Fix Windows version resources git#4092)
153: 6698a90 = 152: 007f827 Fix global repository field not being cleared (Fix global repository field not being cleared git#4083)
154: 0e05ad7 = 153: bd178a7 Skip linking the "dashed"
git-<command>s for built-ins (Skip linking the "dashed"git-<command>s for built-ins git#4252)155: 83ea487 = 154: 6044139 Add full
mingw-w64-git(i.e. regular MSYS2 ecosystem) support (Add fullmingw-w64-git(i.e. regular MSYS2 ecosystem) support git#5971)145: 79ddc54 = 155: 68cf2c2 dir: do not traverse mount points
281: 5ffa38b ! 156: 27dc673 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
156: f530398 = 157: dece2a3 Merge pull request Allow running Git directly from
C:\Program Files\Git\mingw64\bin\git.exegit#2506 from dscho/issue-2283157: beded1a = 158: 0ef1aca Merge pull request Include Windows-specific maintenance and headless-git git#2974 from derrickstolee/maintenance-and-headless
158: fe344f2 = 159: f316af3 ARM64: Embed manifest properly (ARM64: Embed manifest properly git#4718)
159: eb48a90 = 160: a593588 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: 2c617f7 = 161: 15c92c5 Merge branch 'nano-server'
161: d6e207c = 162: 244914d Additional error checks for issuing the windows.appendAtomically warning (Additional error checks for issuing the windows.appendAtomically warning git#4528)
162: 16f9005 = 163: eb5869b win32: use native ANSI sequence processing, if possible (win32: use native ANSI sequence processing, if possible git#4700)
163: 4d71747 = 164: 5bbf8e0 common-main.c: fflush stdout buffer when exit (common-main.c: fflush stdout buffer when exit git#4901)
164: 8327c23 = 165: 410460f Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
165: 30ae496 = 166: 5773e0a Merge branch 'Fix-i686-build-with-GCC-v14'
166: 7335364 = 167: c66f207 Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
167: 6c60a28 = 168: 8dff78c Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
168: f5e1a31 = 169: cac1ec3 pack-objects: create new name-hash algorithm (pack-objects: create new name-hash algorithm git#5157)
169: 0ed5ffb = 170: 474b9d0 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: abdb38b = 171: 67098f9 Add experimental 'git survey' builtin (Add experimental 'git survey' builtin git#5174)
171: 6f6cd36 = 172: f8619c1 credential-cache: handle ECONNREFUSED gracefully (credential-cache: handle ECONNREFUSED gracefully git#5329)
172: 5b08bcd = 173: 196df60 Merge branch 'reftable-vs-custom-allocators'
173: 0483900 = 174: 917595a Merge branch 'check-whitespace-only-downstream'
174: 5d7970d = 175: b524b39 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: bbc0579 = 176: 5935518 Merge branch 'disallow-ntlm-auth-by-default'
176: a3880d4 = 177: c3697c4 Don't traverse mount points in
remove_dir_recurse()(Don't traverse mount points inremove_dir_recurse()git#6151)-: ---------- > 178: 217abe6 Detect number of cores better on multi-socket systems (Detect number of cores better on multi-socket systems git#6108)
177: 620bcdf = 179: 9594cb0 Merge branch 'ready-for-upstream'
178: e88b263 = 180: cfc8c18 ci(macos): skip the
git p4tests179: c519743 = 181: db5a8c8 ci(macos): skip the
git p4tests (ci(macos): skip thegit p4tests git#5954)180: 5436d25 = 182: fc413f6 Win32: make FILETIME conversion functions public
181: 39fdfe1 = 183: d704ad2 Win32: dirent.c: Move opendir down
182: 477c4ed = 184: c5f51ea mingw: make the dirent implementation pluggable
183: 18a95d8 = 185: 47d08f6 Win32: make the lstat implementation pluggable
184: 8d4a2ba = 186: 8a5e987 mingw: add infrastructure for read-only file system level caches
185: cc274d8 = 187: 99fad45 mingw: add a cache below mingw's lstat and dirent implementations
186: a92b318 = 188: eed27c7 fscache: load directories only once
228: a99106a = 189: b295361 git-gui--askyesno: fix funny text wrapping
187: 24c5760 = 190: 2d9b547 fscache: add key for GIT_TRACE_FSCACHE
231: 51dd312 = 191: bcdca0b git-gui--askyesno (mingw): use Git for Windows' icon, if available
188: 781b6a6 = 192: c53be83 fscache: remember not-found directories
234: dae4978 = 193: aa0242a Merge branch 'git-gui-askyesno'
189: 02ff16e = 194: fcac47f fscache: add a test for the dir-not-found optimization
190: 712ddea = 195: 30b764a add: use preload-index and fscache for performance
191: 74caf0e = 196: 4a02212 dir.c: make add_excludes aware of fscache during status
192: a2f3f50 = 197: a116095 fscache: make fscache_enabled() public
193: 891b59f = 198: 19fb49b dir.c: regression fix for add_excludes with fscache
194: 10022dd = 199: 1e81451 fetch-pack.c: enable fscache for stats under .git/objects
195: 9456838 = 200: 002cbae checkout.c: enable fscache for checkout again
196: 6cc93e7 = 201: 28d464e Enable the filesystem cache (fscache) in refresh_index().
197: 311bcb7 = 202: 0fb0a96 fscache: use FindFirstFileExW to avoid retrieving the short name
198: b3c1aae = 203: a2a68ba fscache: add GIT_TEST_FSCACHE support
199: 335f48e = 204: 2fa38f7 fscache: add fscache hit statistics
200: aa7501e = 205: 66af964 unpack-trees: enable fscache for sparse-checkout
201: 6e917e5 = 206: 9411685 status: disable and free fscache at the end of the status command
202: 5fad6df = 207: c5c1d63 mem_pool: add GIT_TRACE_MEMPOOL support
203: 1015207 = 208: bb4f982 fscache: fscache takes an initial size
204: 03c02ea = 209: bc9c38e fscache: update fscache to be thread specific instead of global
205: c4ce1ff = 210: 2d91b38 fscache: teach fscache to use mempool
206: 19e0eb2 = 211: 8adbecc fscache: make fscache_enable() thread safe
207: f4cdbdc = 212: 7f1c6d4 fscache: teach fscache to use NtQueryDirectoryFile
208: 1fda6f2 = 213: 9dff5ff fscache: remember the reparse tag for each entry
209: 01ce8b3 = 214: 195a976 Merge branch 'fscache'
210: 455f0e1 = 215: 1ea3221 fscache: implement an FSCache-aware is_mount_point()
211: 6c391ec = 216: 1071d4c Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
212: da438dc = 217: c585877 clean: make use of FSCache
213: 813a00f = 218: 9d66057 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
214: f83adaa = 219: e47873c Merge branch 'dont-clean-junctions-fscache'
215: 3cd5401 = 220: f564e23 pack-objects (mingw): demonstrate a segmentation fault with large deltas
216: d62cbe5 = 221: 4b7e289 mingw: support long paths
217: 01b0f0e = 222: a0dca2d win32(long path support): leave drive-less absolute paths intact
218: 3836deb = 223: de52fbe compat/fsmonitor/fsm-*-win32: support long paths
219: 3a26464 = 224: 3ce466f clean: suggest using
core.longPathsif paths are too long to remove220: 06f7ce2 = 225: e83085b mingw: Support
git_terminal_promptwith more terminals221: 214ecd3 = 226: 4d164db compat/terminal.c: only use the Windows console if bash 'read -r' fails
222: 9638138 = 227: 63192cb mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
223: 0762b43 = 228: cfd31bb Win32: symlink: move phantom symlink creation to a separate function
225: 0cc493f = 229: 93ffedb Introduce helper to create symlinks that knows about index_state
227: b85d1a2 = 230: 02b6f82 mingw: allow to specify the symlink type in .gitattributes
230: e20daf2 = 231: b209b99 Win32: symlink: add test for
symlinkattribute233: b3c5d41 = 232: ff0ba2a mingw: explicitly specify with which cmd to prefix the cmdline
236: 6e43aa6 = 233: dd5262d mingw: when path_lookup() failed, try BusyBox
237: e5ec8e4 = 234: 00d3ff0 test-tool: learn to act as a drop-in replacement for
iconv238: 48c6638 = 235: 46af0f7 tests(mingw): if
iconvis unavailable, usetest-helper --iconv239: 63ddf04 = 236: b0f9b46 gitattributes: mark .png files as binary
240: d36a8e1 = 237: d83a873 tests: move test PNGs into t/lib-diff/
224: c2b666e = 238: 7287a99 mingw: introduce code to detect whether we're inside a Windows container
241: e63172e = 239: ba34c78 tests: only override sort & find if there are usable ones in /usr/bin/
226: 8b702bd = 240: b039f84 mingw: when running in a Windows container, try to rename() harder
242: c749761 = 241: fc158a1 tests: use the correct path separator with BusyBox
229: 05531eb = 242: 92ef4c3 mingw: move the file_attr_to_st_mode() function definition
243: 34ad8e6 = 243: d1ac412 mingw: only use Bash-ism
builtin pwd -Wwhen available232: 93a1ebe = 244: a298f7a mingw: Windows Docker volumes are not symbolic links
244: bc6c5d4 = 245: 892f968 tests (mingw): remove Bash-specific pwd option
235: 8463ef6 = 246: 05cfdba mingw: work around rename() failing on a read-only file
245: 005321c = 247: a20e934 test-lib: add BUSYBOX prerequisite
246: a3d1761 = 248: f87aa28 Merge branch 'gitk-and-git-gui-patches'
247: 2633e79 = 249: 50ad5c4 t5003: use binary file from t/lib-diff/
248: a139240 = 250: 6634119 Merge branch 'long-paths'
249: e77b8a7 = 251: ef4b62c t5532: workaround for BusyBox on Windows
250: 5ecf65f = 252: 3ef75e4 Merge branch 'msys2'
252: 03d4683 = 253: f861e8f t5605: special-case hardlink test for BusyBox-w32
253: 5bb4934 = 254: 151b1e1 Merge 'docker-volumes-are-no-symlinks'
255: eb06235 = 255: 9b271a8 t5813: allow for $PWD to be a Windows path
256: 2ffe300 = 256: b4a6922 mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
258: bdac6af = 257: a9ab11c t9200: skip tests when $PWD contains a colon
259: a30a88d = 258: 279f859 Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
251: d0d4b30 = 259: 2fe6e8e Describe Git for Windows' architecture [no ci]
261: 5a5fa7a = 260: d2bf77b mingw: kill child processes in a gentler way
262: 29d4a69 = 261: 0af7c4e mingw: optionally enable wsl compability file mode bits
263: 9bf5060 = 262: dcf9eb0 Merge branch 'busybox-w32'
254: c472f56 = 263: 6b825a0 Modify the Code of Conduct for Git for Windows
265: 27dd22a = 264: c10361b mingw: really handle SIGINT
266: 9b7a282 = 265: 1263784 Merge branch 'wsl-file-mode-bits'
257: d66ef88 = 266: 0775a69 CONTRIBUTING.md: add guide for first-time contributors
269: 5351f4e = 267: f7e41c1 Partially un-revert "editor: save and reset terminal after calling EDITOR"
270: 1f03493 = 268: 349dee9 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
260: 62c885e = 269: 74e646c README.md: Add a Windows-specific preamble
271: 976b844 = 270: 77a3a2e reset: reinstate support for the deprecated --stdin option
275: def43dd = 271: c102ece Merge branch 'un-revert-editor-save-and-reset'
264: ba06ee3 = 272: 9ee4812 Add an issue template
267: 8d473c5 = 273: 75adad5 Add a GitHub workflow to monitor component updates
272: f417451 = 274: c6b8196 fsmonitor: reintroduce core.useBuiltinFSMonitor
276: f2dab1d = 275: 1b0b361 Merge branch 'phase-out-reset-stdin'
268: 25dbc6b = 276: b7c6ec9 Modify the GitHub Pull Request template (to reflect Git for Windows)
273: c8aac42 = 277: d8e8ba7 dependabot: help keeping GitHub Actions versions up to date
277: 4c85d4f = 278: 0a00a8e Merge branch 'deprecate-core.useBuiltinFSMonitor'
274: 26a0f7e = 279: 1015f61 SECURITY.md: document Git for Windows' policies
278: d0bba3b = 280: a9028ff Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
279: 1cd8f81 = 281: 8e28316 Merge 'readme' into HEAD
280: 8d36614 < -: ---------- Winansi: Drop pre-Vista workaround (Winansi: Drop pre-Vista workaround git#6109)