Rebase shears/seen: 3 conflict(s) (3 skipped, 0 resolved) (#23946917784)#87
Open
gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/seen-23946917784from
Open
Rebase shears/seen: 3 conflict(s) (3 skipped, 0 resolved) (#23946917784)#87gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/seen-23946917784from
gitforwindowshelper[bot] wants to merge 282 commits intobase/shears/seen-23946917784from
Conversation
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>
These fixes have been sent to the Git mailing list but have not been picked up by the Git project yet. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
On LLP64 systems, such as Windows, the size of `long`, `int`, etc. is only 32 bits (for backward compatibility). Git's use of `unsigned long` for file memory sizes in many places, rather than size_t, limits the handling of large files on LLP64 systems (commonly given as `>4GB`). Provide a minimum test for handling a >4GB file. The `hash-object` command, with the `--literally` and without `-w` option avoids writing the object, either loose or packed. This avoids the code paths hitting the `bigFileThreshold` config test code, the zlib code, and the pack code. Subsequent patches will walk the test's call chain, converting types to `size_t` (which is larger in LLP64 data models) where appropriate. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In bf2d5d8 (Don't let ld strip relocations, 2016-01-16) (picked from 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>
Continue walking the code path for the >4GB `hash-object --literally` test. The `hash_object_file_literally()` function internally uses both `hash_object_file()` and `write_object_file_prepare()`. Both function signatures use `unsigned long` rather than `size_t` for the mem buffer sizes. Use `size_t` instead, for LLP64 compatibility. While at it, convert those function's object's header buffer length to `size_t` for consistency. The value is already upcast to `uintmax_t` for print format compatibility. Note: The hash-object test still does not pass. A subsequent commit continues to walk the call tree's lower level hash functions to identify further fixes. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 already defines a couple of helpful environment variables, and we can use those to infer the installation location as well as the CPU. No need for hard-coding ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
Correct some wording and inform users regarding the Visual Studio changes (from V16.6) to the default generator. Subsequent commits ensure that Git for Windows can be directly opened in modern Visual Studio without needing special configuration of the CMakeLists settings. It appeares that internally Visual Studio creates it's own version of the .sln file (etc.) for extension tools that expect them. The large number of references below document the shifting of Visual Studio default and CMake setting options. refs: https://docs.microsoft.com/en-us/search/?scope=C%2B%2B&view=msvc-150&terms=Ninja 1. https://docs.microsoft.com/en-us/cpp/linux/cmake-linux-configure?view=msvc-160 (note the linux bit) "In Visual Studio 2019 version 16.6 or later ***, Ninja is the default generator for configurations targeting a remote system or WSL. For more information, see this post on the C++ Team Blog [https://devblogs.microsoft.com/cppblog/linux-development-with-visual-studio-first-class-support-for-gdbserver-improved-build-times-with-ninja-and-updates-to-the-connection-manager/]. For more information about these settings, see CMakeSettings.json reference [https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-160]." 2. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160 "CMake supports two files that allow users to specify common configure, build, and test options and share them with others: CMakePresets.json and CMakeUserPresets.json." " Both files are supported in Visual Studio 2019 version 16.10 or later. ***" 3. https://devblogs.microsoft.com/cppblog/linux-development-with-visual-studio-first-class-support-for-gdbserver-improved-build-times-with-ninja-and-updates-to-the-connection-manager/ " Ninja has been the default generator (underlying build system) for CMake configurations targeting Windows for some time***, but in Visual Studio 2019 version 16.6 Preview 3*** we added support for Ninja on Linux." 4. https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-160 " `generator`: specifies CMake generator to use for this configuration. May be one of: Visual Studio 2019 only: Visual Studio 16 2019 Visual Studio 16 2019 Win64 Visual Studio 16 2019 ARM Visual Studio 2017 and later: Visual Studio 15 2017 Visual Studio 15 2017 Win64 Visual Studio 15 2017 ARM Visual Studio 14 2015 Visual Studio 14 2015 Win64 Visual Studio 14 2015 ARM Unix Makefiles Ninja Because Ninja is designed for fast build speeds instead of flexibility and function, it is set as the default. However, some CMake projects may be unable to correctly build using Ninja. If this occurs, you can instruct CMake to generate Visual Studio projects instead. To specify a Visual Studio generator in Visual Studio 2017, open the settings editor from the main menu by choosing CMake | Change CMake Settings. Delete "Ninja" and type "V". This activates IntelliSense, which enables you to choose the generator you want." "To specify a Visual Studio generator in Visual Studio 2019, right-click on the CMakeLists.txt file in Solution Explorer and choose CMake Settings for project > Show Advanced Settings > CMake Generator. When the active configuration specifies a Visual Studio generator, by default MSBuild.exe is invoked with` -m -v:minimal` arguments." 5. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#enable-cmakepresetsjson-integration-in-visual-studio-2019 "Enable CMakePresets.json integration in Visual Studio 2019 CMakePresets.json integration isn't enabled by default in Visual Studio 2019. You can enable it for all CMake projects in Tools > Options > CMake > General: (tick a box)" ... see more. 6. https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-140 (whichever v140 is..) "CMake projects are supported in Visual Studio 2017 and later." 7. https://docs.microsoft.com/en-us/cpp/overview/what-s-new-for-cpp-2017?view=msvc-150 "Support added for the CMake Ninja generator." 8. https://docs.microsoft.com/en-us/cpp/overview/what-s-new-for-cpp-2017?view=msvc-150#cmake-support-via-open-folder "CMake support via Open Folder Visual Studio 2017 introduces support for using CMake projects without converting to MSBuild project files (.vcxproj). For more information, see CMake projects in Visual Studio[https://docs.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=msvc-150]. Opening CMake projects with Open Folder automatically configures the environment for C++ editing, building, and debugging." ... +more! 9. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#supported-cmake-and-cmakepresetsjson-versions "Visual Studio reads and evaluates CMakePresets.json and CMakeUserPresets.json itself and doesn't invoke CMake directly with the --preset option. So, CMake version 3.20 or later isn't strictly required when you're building with CMakePresets.json inside Visual Studio. We recommend using CMake version 3.14 or later." 10. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#enable-cmakepresetsjson-integration-in-visual-studio-2019 "If you don't want to enable CMakePresets.json integration for all CMake projects, you can enable CMakePresets.json integration for a single CMake project by adding a CMakePresets.json file to the root of the open folder. You must close and reopen the folder in Visual Studio to activate the integration. 11. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#default-configure-presets ***(doesn't actually say which version..) "Default Configure Presets If no CMakePresets.json or CMakeUserPresets.json file exists, or if CMakePresets.json or CMakeUserPresets.json is invalid, Visual Studio will fall back*** on the following default Configure Presets: Windows example JSON { "name": "windows-default", "displayName": "Windows x64 Debug", "description": "Sets Ninja generator, compilers, x64 architecture, build and install directory, debug build type", "generator": "Ninja", "binaryDir": "${sourceDir}/out/build/${presetName}", "architecture": { "value": "x64", "strategy": "external" }, "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}" }, "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { "hostOS": [ "Windows" ] } } }, " Signed-off-by: Philip Oakley <philipoakley@iee.email>
Continue walking the code path for the >4GB `hash-object --literally`
test to the hash algorithm step for LLP64 systems.
This patch lets the SHA1DC code use `size_t`, making it compatible with
LLP64 data models (as used e.g. by Windows).
The interested reader of this patch will note that we adjust the
signature of the `git_SHA1DCUpdate()` function without updating _any_
call site. This certainly puzzled at least one reviewer already, so here
is an explanation:
This function is never called directly, but always via the macro
`platform_SHA1_Update`, which is usually called via the macro
`git_SHA1_Update`. However, we never call `git_SHA1_Update()` directly
in `struct git_hash_algo`. Instead, we call `git_hash_sha1_update()`,
which is defined thusly:
static void git_hash_sha1_update(git_hash_ctx *ctx,
const void *data, size_t len)
{
git_SHA1_Update(&ctx->sha1, data, len);
}
i.e. it contains an implicit downcast from `size_t` to `unsigned long`
(before this here patch). With this patch, there is no downcast anymore.
With this patch, finally, the t1007-hash-object.sh "files over 4GB hash
literally" test case is fixed.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The tell-tale is the presence of the `MSYSTEM` value while compiling, of course. In that case, we want to ensure that `MSYSTEM` is set when running `git.exe`, and also enable the magic MSYS2 tty detection. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Teach MSVC=1 builds to depend on the `git.rc` file so that the resulting executables have Windows-style resources and version number information within them. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This compile-time option allows to ask Git to load libcurl dynamically at runtime. Together with a follow-up patch that optionally overrides the file name depending on the `http.sslBackend` setting, this kicks open the door for installing multiple libcurl flavors side by side, and load the one corresponding to the (runtime-)configured SSL/TLS backend. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The CMakeSettings.json file is tool generated. Developers may track it should they provide additional settings. Signed-off-by: Philip Oakley <philipoakley@iee.email>
Just like the `hash-object --literally` code path, the `--stdin` code path also needs to use `size_t` instead of `unsigned long` to represent memory sizes, otherwise it would cause problems on platforms using the LLP64 data model (such as Windows). To limit the scope of the test case, the object is explicitly not written to the object store, nor are any filters applied. The `big` file from the previous test case is reused to save setup time; To avoid relying on that side effect, it is generated if it does not exist (e.g. when running via `sh t1007-*.sh --long --run=1,41`). Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
MSYS2 defines some helpful environment variables, e.g. `MSYSTEM`. There is code in Git for Windows to ensure that that `MSYSTEM` variable is set, hard-coding a default. However, the existing solution jumps through hoops to reconstruct the proper default, and is even incomplete doing so, as we found out when we extended it to support CLANGARM64. This is absolutely unnecessary because there is already a perfectly valid `MSYSTEM` value we can use at build time. This is even true when building the MINGW32 variant on a MINGW64 system because `makepkg-mingw` will override the `MSYSTEM` value as per the `MINGW_ARCH` array. The same is equally true for the `/mingw64`, `/mingw32` and `/clangarm64` prefix: those values are already available via the `MINGW_PREFIX` environment variable, and we just need to pass that setting through. Only when `MINGW_PREFIX` is not set (as is the case in Git for Windows' minimal SDK, where only `MSYSTEM` is guaranteed to be set correctly), we use as fall-back the top-level directory whose name is the down-cased value of the `MSYSTEM` variable. Incidentally, this also broadens the support to all the configurations supported by the MSYS2 project, i.e. clang64 & ucrt64, too. Note: This keeps the same, hard-coded MSYSTEM platform support for CMake as before, but drops it for Meson (because it is unclear how Meson could do this in a more flexible manner). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
To support Git Bash running in a MinTTY, we use a dirty trick to access the MSYS2 pseudo terminal: we execute a Bash snippet that accesses /dev/tty. The idea was to fall back to writing to/reading from CONOUT$/CONIN$ if that Bash call failed because Bash was not found. However, we should fall back even in other error conditions, because we have not successfully read the user input. Let's make it so. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
These are Git for Windows' Git GUI and gitk patches. We will have to decide at some point what to do about them, but that's a little lower priority (as Git GUI seems to be unmaintained for the time being, and the gitk maintainer keeps a very low profile on the Git mailing list, too). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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 is a companion patch of 3b9b2c2 (compat/posix: introduce writev(3p) wrapper, 2026-03-13) where support for using the `writev()` wrapper was introduced in the `Makefile` and the Meson-based build, but the CMake build still needs that treatment, too. 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: a2409caf40 (cmake: use writev(3p) wrapper as needed, 2026-04-02) (0935e6b916..a2409caf40)
Skipped: cad0438 (sideband: mask control characters, 2024-11-06)
Upstream equivalent: 0494953 (sideband: mask control characters, 2026-03-05)
Range-diff
1: cad0438 ! 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: dea5198 (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: dea5198 ! 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: 04bbc33 (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: 04bbc33 ! 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: 4d2834e431 (cmake: use writev(3p) wrapper as needed, 2026-04-02) (8c03a96ef2..4d2834e431)
Statistics
Range-diff (click to expand)
1: 9559b16 = 1: 6125d4c unix-socket: avoid leak when initialization fails
2: 20651df = 2: 63d9b64 grep: prevent
^$false match at end of file3: 39e9adb = 3: b43dba5 Merge branch 'fixes-from-the-git-mailing-list'
4: 0631d0f = 4: 329617e vcpkg_install: detect lack of Git
9: 588131c = 5: efa197b mingw: include the Python parts in the build
5: bd99c2b = 6: 514c5dc vcpkg_install: add comment regarding slow network connections
11: e54a8b2 = 7: 3435d0c win32/pthread: avoid name clashes with winpthread
6: a30e9a4 = 8: ae16a55 vcbuild: install ARM64 dependencies when building ARM64 binaries
14: 03186fa = 9: 57dd4a3 git-compat-util: avoid redeclaring _DEFAULT_SOURCE
7: 8529f5c = 10: 9c4c8ff vcbuild: add an option to install individual 'features'
17: e28788a = 11: 815bbb9 Import the source code of mimalloc v2.2.7
8: d8b7cac = 12: 1f25bea cmake: allow building for Windows/ARM64
18: d4a387c = 13: aee30f0 t9350: point out that refs are not updated correctly
21: 8283529 = 14: bee761c mimalloc: adjust for building inside Git
10: 8e384ef = 15: f1770cf ci(vs-build) also build Windows/ARM64 artifacts
22: 5753037 = 16: b36ae4a transport-helper: add trailing --
23: 26770b6 = 17: b9108d7 mingw: demonstrate a
git addissue with NTFS junctions26: daac07a = 18: a3855e9 mimalloc: offer a build-time option to enable it
27: 5ef1085 = 19: 47dc7c9 t5505/t5516: allow running without
.git/branches/in the templates12: dd77cde = 20: c8fdff2 Add schannel to curl installation
28: d084a47 = 21: 3305306 remote-helper: check helper status after import/export
29: dca9f19 = 22: feca6a7 clean: do not traverse mount points
30: bb597a4 = 23: f82e04a strbuf_realpath(): use platform-dependent API if available
31: 919754b = 24: bc991b9 http: use new "best effort" strategy for Secure Channel revoke checking
32: 6366214 = 25: 1fd4c2c subtree: update
contrib/subtreetesttarget36: ec66bd3 = 26: 208b960 mingw: use mimalloc
37: 22e324d = 27: 3729939 t5505/t5516: fix white-space around redirectors
15: b290f9a = 28: 28a4ea7 cmake(): allow setting HOST_CPU for cross-compilation
38: f7b46fa = 29: 0a47ec5 Always auto-gc after calling a fast-import transport
39: a84c24f = 30: c836bce mingw: prevent regressions with "drive-less" absolute paths
40: 19a5264 = 31: b4f7c15 clean: remove mount points when possible
41: 4e7551c = 32: 7b8fef2 transport: optionally disable side-band-64k
42: 0a12378 = 33: 428c196 mingw: fix fatal error working on mapped network drives on Windows
43: 333df6b = 34: a689c74 clink.pl: fix MSVC compile script to handle libcurl-d.lib
44: f37ab29 = 35: be33b65 mingw: implement a platform-specific
strbuf_realpath()45: 85c096c = 36: 64365a9 t3701: verify that we can add lots of files interactively
46: a09622c = 37: 1e4c8c5 commit: accept "scissors" with CR/LF line endings
47: e1369eb = 38: 610e9d0 t0014: fix indentation
48: 0ebde6d = 39: 64ef97d git-gui: accommodate for intent-to-add files
49: 155d4e5 = 40: b581739 mingw: allow for longer paths in
parse_interpreter()50: 7c0746e = 41: eba86fb compat/vcbuild: document preferred way to build in Visual Studio
51: f5de552 = 42: 184d1d7 http: optionally send SSL client certificate
52: b307eb7 = 43: f33af8c ci: run
contrib/subtreetests in CI builds57: cfce444 = 44: 5cdf982 windows: skip linking
git-<command>for built-ins58: 49394de = 45: 25fa35d mingw: stop hard-coding
CC = gcc59: 3268f2c = 46: 94c936e mingw: drop the -D_USE_32BIT_TIME_T option
60: 588ddda = 47: ebbb327 mingw: only use -Wl,--large-address-aware for 32-bit builds
61: 0ae2588 = 48: fd78b34 mingw: avoid over-specifying
--pic-executable62: 22beae8 = 49: ceb5dda mingw: set the prefix and HOST_CPU as per MSYS2's settings
63: 456e037 = 50: 9c97410 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
64: 898d3f9 = 51: b4a1e14 mingw: rely on MSYS2's metadata instead of hard-coding it
65: 4598c73 = 52: 15bd375 mingw: always define
ETC_*for MSYS2 environments66: 0bbca2b = 53: 483317d max_tree_depth: lower it for clang builds in general on Windows
67: 57e4ce4 = 54: aec0d27 mingw: ensure valid CTYPE
69: 9d35cd3 = 55: 427d39e mingw: allow
git.exeto be used instead of the "Git wrapper"71: a125f8b = 56: db3416b mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
73: d0354a5 = 57: 5e103a2 Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
75: f352e88 = 58: 2dcdc99 clink.pl: fix libexpatd.lib link error when using MSVC
77: 77ec66a = 59: 7d21d60 Makefile: clean up .ilk files when MSVC=1
13: 18dedec = 60: 3108f25 hash-object: demonstrate a >4GB/LLP64 problem
79: 42d341e = 61: 637b21b vcbuild: add support for compiling Windows resource files
16: 5b6a209 = 62: 58a8e79 object-file.c: use size_t for header lengths
81: b07dbd4 = 63: 0bd2118 config.mak.uname: add git.rc to MSVC builds
82: f1dbffd = 64: bf85f93 MinGW: link as terminal server aware
19: 1157c63 = 65: d11983c CMake: default Visual Studio generator has changed
20: 51526ed = 66: db01b44 hash algorithms: use size_t for section lengths
84: 1a90c1f = 67: 2d4b811 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
85: 5566471 = 68: 280a43a http: optionally load libcurl lazily
24: c63439b = 69: 968c3de .gitignore: add Visual Studio CMakeSetting.json file
25: ccf476a = 70: cb52d6d hash-object --stdin: verify that it works with >4GB/LLP64
88: aeaf9b9 = 71: 04ce64d clink.pl: move default linker options for MSVC=1 builds
89: b09c5ea = 72: bb83c38 http: support lazy-loading libcurl also on Windows
68: 8f0f680 = 73: fca63e2 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
33: 5d9cb8d = 74: 909778a CMakeLists: add default "x64-windows" arch for Visual Studio
34: d755f30 = 75: 2728733 hash-object: add another >4GB/LLP64 test case
35: e98a5f6 = 76: 6988340 setup: properly use "%(prefix)/" when in WSL
92: 494c317 = 77: 8d03725 Add config option
windows.appendAtomically93: 6ac710c = 78: b051648 cmake: install headless-git.
94: c45e6f8 = 79: 2b06c9f http: when loading libcurl lazily, allow for multiple SSL backends
70: b63e54b = 80: 41098c2 revision: create mark_trees_uninteresting_dense()
53: 1bc6826 = 81: 7da146c CMake: show Win32 and Generator_platform build-option values
54: 593b2b2 = 82: 9526f11 hash-object: add a >4GB/LLP64 test case using filtered input
55: f1a6e21 = 83: 0f676f1 compat/mingw.c: do not warn when failing to get owner
56: 0e3bd0b = 84: 1c7eefd mingw: $env:TERM="xterm-256color" for newer OSes
96: 750e331 = 85: f72e92c winansi: check result and Buffer before using Name
98: bd74e7f = 86: 74504b8 mingw: change core.fsyncObjectFiles = 1 by default
99: b7075b0 = 87: bb81f50 Fix Windows version resources
100: 65afe3b = 88: 74607ea status: fix for old-style submodules with commondir
101: 624dafc = 89: cdc295b git.rc: include winuser.h
102: c07540e = 90: 0d66970 mingw: do load libcurl dynamically by default
103: 7f716d0 = 91: 280b172 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
104: cbe5085 = 92: 3756d7e mingw: suggest
windows.appendAtomicallyin more cases105: 87d4f0d = 93: d60a3af win32: use native ANSI sequence processing, if possible
106: 6ddab32 = 94: 03ff20b common-main.c: fflush stdout buffer upon exit
107: 3a556f6 = 95: 1f63ef9 t5601/t7406(mingw): do run tests with symlink support
108: a4c3859 = 96: e2470af win32: ensure that
localtime_r()is declared even in i686 builds109: 879f62b = 97: b7da4e1 Fallback to AppData if XDG_CONFIG_HOME is unset
110: cc0f82a = 98: f7676d5 run-command: be helpful with Git LFS fails on Windows 7
112: c6f0588 = 99: c6f4a2a Merge 'remote-hg-prerequisites' into HEAD
113: 7334606 = 100: 0021389 Merge branch 'drive-prefix'
114: 8ddc445 = 101: fa93c54 Merge branch 'dont-clean-junctions'
115: 0b7ab02 = 102: bde092c Merge branch 'msys2-python'
116: 875bb2a = 103: d2390f9 Update mimalloc to v2.2.7 (Update mimalloc to v2.2.7 git#6048)
117: 6d2c011 = 104: bdf363e Merge pull request Config option to disable side-band-64k for transport git#2375 from assarbad/reintroduce-sideband-config
118: e322667 = 105: 8dedae0 Merge pull request mingw: fix fatal error working on mapped network drives on Windows git#2488 from bmueller84/master
119: 805bf8d = 106: 6531bf0 Merge pull request clink.pl: fix MSVC compile script to handle libcurl-d.lib git#2501 from jeffhostetler/clink-debug-curl
72: aa26c83 ! 107: f0a40d5 survey: stub in new experimental 'git-survey' command
@@ builtin/survey.c (new) + +#include "builtin.h" +#include "config.h" ++#include "environment.h" +#include "parse-options.h" + +static const char * const survey_usage[] = {120: cca7f0e = 108: 2f69ae3 Merge pull request Handle
git add <file>where <file> traverses an NTFS junction git#2504 from dscho/access-repo-via-junction74: d6543c7 ! 109: 876bfb1 survey: add command line opts to select references
121: 0ef72a5 = 110: bcc6cb2 Merge pull request Introduce and use the new "best effort" strategy for Secure Channel revoke checking git#2535 from dscho/schannel-revoke-best-effort
76: ab4d26f = 111: 7238e40 survey: start pretty printing data in table form
122: 9f7dd16 = 112: c7a343d Merge pull request ci: avoid d/f conflict in vs/master git#2618 from dscho/avoid-d/f-conflict-in-vs/master
78: 8127a9b ! 113: 87b606c survey: add object count summary
123: 7db82fd = 114: 11d31e3 Merge 'add-p-many-files'
80: 980705c = 115: ec94533 survey: summarize total sizes by object type
124: 8bc8c9a = 116: 631a0bb Merge pull request Rationalize line endings for scissors-cleanup git#2714 from lbonanomi/crlf-scissors
83: 2c04b84 = 117: f715189 survey: show progress during object walk
87: bf78b41 = 118: c3dba46 mingw: make sure
errnois set correctly when socket operations fail125: c5393f3 = 119: c3c1ce8 Merge pull request t/t0014: fix: eliminate additional lines from trace git#2655 from jglathe/jg/t0014_trace_extra_info
86: 16bf7dc = 120: 84ca691 survey: add ability to track prioritized lists
91: c4ea4c8 = 121: 1c0d10a compat/mingw: handle WSA errors in strerror
275: 0a78de3 ! 122: 97e7fd5 Merge branch 'disallow-ntlm-auth-by-default'
"
-+ "disabled in Git by default. You can "
-+ "re-enable it for trusted servers
"
-+ "by running:
"
-+ "git config set "
-+ "http.%s://%s.allowNTLMAuth true"),
-+ http_auth.protocol, http_auth.host);
-+ }
t/lib-httpd.sh
@@ t/t5563-simple-http-auth.sh: test_expect_success 'access using three-legged auth
+ EOF
+
+ test_config_global credential.helper test-helper &&
-+ test_must_fail env GIT_TRACE_CURL=1 git
-+ ls-remote "$HTTPD_URL/ntlm_auth/repo.git" 2>err &&
-+ test_grep "allowNTLMAuth" err &&
-+
-+ # Can be enabled via config
-+ GIT_TRACE_CURL=1 git -c http.$HTTPD_URL.allowNTLMAuth=true
-+ ls-remote "$HTTPD_URL/ntlm_auth/repo.git" &&
-+
-+ # Or via credential helper responding with ntlm=allow
-+ set_credential_reply get <<-EOF &&
-+ username=user
-+ password=pwd
-+ ntlm=allow
-+ EOF
-+
++ GIT_TRACE_CURL=1
+ git ls-remote "$HTTPD_URL/ntlm_auth/repo.git"
+'
+
184: dfd1bf4 = 188: e89115e fscache: load directories only once
185: 97b3c90 = 189: 46dd9bd fscache: add key for GIT_TRACE_FSCACHE
186: 9d5a126 = 190: 2b2664d fscache: remember not-found directories
187: 70902cd = 191: 701b157 fscache: add a test for the dir-not-found optimization
188: e3ab439 = 192: 02a43dc add: use preload-index and fscache for performance
189: a28fdc2 ! 193: 95f3270 dir.c: make add_excludes aware of fscache during status
190: d933c45 ! 194: dc5e44c fscache: make fscache_enabled() public
191: 22a9974 = 195: adcf370 dir.c: regression fix for add_excludes with fscache
192: d0cc3cb = 196: ac31af1 fetch-pack.c: enable fscache for stats under .git/objects
193: 7e6e184 = 197: 085bcba checkout.c: enable fscache for checkout again
194: 623583e = 198: 55650d9 Enable the filesystem cache (fscache) in refresh_index().
195: 2c8ae53 = 199: 660dbdc fscache: use FindFirstFileExW to avoid retrieving the short name
196: eb946c8 = 200: 7f500a8 fscache: add GIT_TEST_FSCACHE support
197: da9e2e8 = 201: 66b618f fscache: add fscache hit statistics
198: 9db6eea ! 202: 15b92a5 unpack-trees: enable fscache for sparse-checkout
175: 8d3a6c7 = 203: 1fb5398 git-gui--askyesno: fix funny text wrapping
199: 1960553 = 204: dd4adcb status: disable and free fscache at the end of the status command
176: 9bf2a63 = 205: 378ab18 git-gui--askyesno (mingw): use Git for Windows' icon, if available
200: 3690864 = 206: 77a99cf mem_pool: add GIT_TRACE_MEMPOOL support
177: 53ebf11 = 207: f62e131 Merge branch 'git-gui-askyesno'
201: 6890830 ! 208: ac9fd7b fscache: fscache takes an initial size
202: 8e3f5c2 = 209: e1357aa fscache: update fscache to be thread specific instead of global
203: 3604f33 ! 210: fdc2e02 fscache: teach fscache to use mempool
204: b46ed1c = 211: ca7f32c fscache: make fscache_enable() thread safe
205: 6b02015 ! 212: f82591b fscache: teach fscache to use NtQueryDirectoryFile
206: b91dc49 = 213: b87658e fscache: remember the reparse tag for each entry
207: 9462a24 = 214: 6f984dd Merge branch 'fscache'
208: 47287cb = 215: 47fc1bb fscache: implement an FSCache-aware is_mount_point()
209: f9bca97 = 216: b02e597 Merge pull request status: disable and free fscache at the end of the status command git#1909 from benpeart/free-fscache-after-status-gfw
210: c92d442 = 217: e13163d clean: make use of FSCache
211: 0db5701 = 218: 2089151 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
212: 5921d69 = 219: 2b47ff5 Merge branch 'dont-clean-junctions-fscache'
213: f6f478b = 220: 4fe4406 pack-objects (mingw): demonstrate a segmentation fault with large deltas
214: c059fae ! 221: f1a799c mingw: support long paths
215: f90285f = 222: 3181230 win32(long path support): leave drive-less absolute paths intact
216: efc5e69 = 223: 6e5b1cb compat/fsmonitor/fsm-*-win32: support long paths
217: fa289d5 = 224: d3d3590 clean: suggest using
core.longPathsif paths are too long to remove218: a71611b = 225: e5ad60b mingw: Support
git_terminal_promptwith more terminals219: 73cab03 = 226: 91d89e6 compat/terminal.c: only use the Windows console if bash 'read -r' fails
220: bc82bb2 = 227: 71523da mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
221: 25b1f3c = 228: 1003b90 Win32: symlink: move phantom symlink creation to a separate function
222: 5b2f4e6 = 229: 391519f Introduce helper to create symlinks that knows about index_state
223: 7a8f494 = 230: 211dfb2 mingw: allow to specify the symlink type in .gitattributes
224: 6d6f691 = 231: 65ba0e2 Win32: symlink: add test for
symlinkattribute225: a204729 = 232: 54ca855 mingw: explicitly specify with which cmd to prefix the cmdline
226: d20745b = 233: 77e8602 mingw: when path_lookup() failed, try BusyBox
228: fe4a653 = 234: ece187b test-tool: learn to act as a drop-in replacement for
iconv230: 78cf9c3 = 235: c3612bd tests(mingw): if
iconvis unavailable, usetest-helper --iconv232: 313996f = 236: 0a9fe41 gitattributes: mark .png files as binary
234: 3170eab = 237: 65a659b tests: move test PNGs into t/lib-diff/
236: 088cbdd = 238: 790b8d2 tests: only override sort & find if there are usable ones in /usr/bin/
237: 933e40e = 239: ab3e41b tests: use the correct path separator with BusyBox
238: 7133f73 = 240: 61a9743 mingw: only use Bash-ism
builtin pwd -Wwhen available239: 5f314b8 = 241: 97f5625 tests (mingw): remove Bash-specific pwd option
240: 6f26b53 = 242: 5b7b661 test-lib: add BUSYBOX prerequisite
242: c7dd2bc = 243: 1e55dac t5003: use binary file from t/lib-diff/
227: 39555dd = 244: 0af9dc1 mingw: introduce code to detect whether we're inside a Windows container
244: 33422bc = 245: df43f70 t5532: workaround for BusyBox on Windows
229: b5cd0af ! 246: 0378d0d mingw: when running in a Windows container, try to rename() harder
@@ compat/mingw.c: int mingw_rename(const char *pold, const char *pnew) + if (gle == ERROR_ACCESS_DENIED && is_inside_windows_container()) { + /* Fall back to copy to destination & remove source */ -+ if (CopyFileW(wpold, wpnew, FALSE) && !mingw_unlink(pold)) ++ if (CopyFileW(wpold, wpnew, FALSE) && !mingw_unlink(pold, 1)) + return 0; + gle = GetLastError(); + }246: 04a9cff = 247: e3e1779 t5605: special-case hardlink test for BusyBox-w32
231: 44cfe8f = 248: 31f147d mingw: move the file_attr_to_st_mode() function definition
248: 3ecbb32 = 249: cd8c97b t5813: allow for $PWD to be a Windows path
233: 8d7e5a3 ! 250: 25098b0 mingw: Windows Docker volumes are not symbolic links
251: b64faa2 = 251: 08dd9da t9200: skip tests when $PWD contains a colon
235: a5eda41 ! 252: 4d3a1e0 mingw: work around rename() failing on a read-only file
@@ compat/mingw.c: int mingw_rename(const char *pold, const char *pnew) - if (gle == ERROR_ACCESS_DENIED && is_inside_windows_container()) { - /* Fall back to copy to destination & remove source */ -- if (CopyFileW(wpold, wpnew, FALSE) && !mingw_unlink(pold)) +- if (CopyFileW(wpold, wpnew, FALSE) && !mingw_unlink(pold, 1)) - return 0; - gle = GetLastError(); + if (gle == ERROR_ACCESS_DENIED) {254: 4c0ab64 = 253: ae58519 mingw: kill child processes in a gentler way
255: e79d1ca = 254: 906f335 mingw: optionally enable wsl compability file mode bits
241: 7890519 = 255: 137f48a Merge branch 'gitk-and-git-gui-patches'
243: 303744c = 256: d445d5d Merge branch 'long-paths'
245: a5ddd72 = 257: 478eef9 Merge branch 'msys2'
247: 7cfd3e3 = 258: e902b1b Merge 'docker-volumes-are-no-symlinks'
249: d49b348 = 259: bfb9fca mingw: try resetting the read-only bit if rename fails (Reset READONLY if rename fails git#4527)
252: 51f6105 = 260: 4ef54cb Merge pull request Specify symlink type in .gitattributes git#1897 from piscisaureus/symlink-attr
250: 7a494b9 = 261: a41b346 Describe Git for Windows' architecture [no ci]
256: e25a4d2 = 262: 94281bc Merge branch 'busybox-w32'
253: ff59f74 = 263: 4ea3435 Modify the Code of Conduct for Git for Windows
258: a03bcdc = 264: 3337336 mingw: really handle SIGINT
259: f47de56 = 265: 2260049 Merge branch 'wsl-file-mode-bits'
257: b790692 = 266: 5af8154 CONTRIBUTING.md: add guide for first-time contributors
261: 2ecb53e = 267: b3bbed6 Partially un-revert "editor: save and reset terminal after calling EDITOR"
262: 4ad9a4d = 268: 5dfcb90 Merge pull request Handle Ctrl+C in Git Bash nicely git#1170 from dscho/mingw-kill-process
260: d109641 = 269: 2381499 README.md: Add a Windows-specific preamble
264: ddee20b = 270: 59412e3 reset: reinstate support for the deprecated --stdin option
265: 2351287 = 271: 12ea905 Merge branch 'un-revert-editor-save-and-reset'
263: 88042cb = 272: dd5a530 Add an issue template
266: 71ca1aa = 273: 2aea764 Add a GitHub workflow to monitor component updates
268: f787dbd = 274: 718b69a fsmonitor: reintroduce core.useBuiltinFSMonitor
269: 5c32e69 = 275: 2ccb9d2 Merge branch 'phase-out-reset-stdin'
267: 9a8dd1f = 276: e1797dc Modify the GitHub Pull Request template (to reflect Git for Windows)
270: 8485d34 = 277: fbe7914 dependabot: help keeping GitHub Actions versions up to date
272: 94368e3 = 278: d1192dd Merge branch 'deprecate-core.useBuiltinFSMonitor'
271: 38f333b = 279: d32299c SECURITY.md: document Git for Windows' policies
273: 7ba6242 = 280: 4a887fc Merge pull request Start monitoring updates of Git for Windows' components in the open git#2837 from dscho/monitor-component-updates
274: acb6fce = 281: bbfde3b Merge 'readme' into HEAD
276: 943ad3d < -: ---------- http: fix bug in ntlm_allow=1 handling
277: d955d41 < -: ---------- http: fix bug in ntlm_allow=1 handling (http: fix bug in ntlm_allow=1 handling git#6136)
278: 8d11f8e < -: ---------- fixup! git-svn: mark it as unsupported by the Git for Windows project
279: 5557d0b < -: ----------
git svn: remove deprecation note (since it is no longer included in Git for Windows, anyway) (git svn: remove deprecation note (since it is no longer included in Git for Windows, anyway) git#6142)280: 236d3e8 < -: ---------- mingw: use strftime() directly in UCRT builds (mingw: use strftime() directly in UCRT builds git#6130)
-: ---------- > 282: 4d2834e cmake: use writev(3p) wrapper as needed