Open
Conversation
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>
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>
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>
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 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>
The intention of this change is to align with how the top-level git `Makefile` defines its own test target (which also internally calls `$(MAKE) -C t/ all`). This change also ensures the consistency of `make -C contrib/subtree test` with other testing in CI executions (which rely on `$DEFAULT_TEST_TARGET` being defined as `prove`). Signed-off-by: Victoria Dye <vdye@github.com>
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>
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>
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>
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>
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>
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>
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>
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 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>
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>
On Windows, the current working directory is pretty much guaranteed to contain a colon. If we feed that path to CVS, it mistakes it for a separator between host and port, though. This has not been a problem so far because Git for Windows uses MSYS2's Bash using a POSIX emulation layer that also pretends that the current directory is a Unix path (at least as long as we're in a shell script). However, that is rather limiting, as Git for Windows also explores other ports of other Unix shells. One of those is BusyBox-w32's ash, which is a native port (i.e. *not* using any POSIX emulation layer, and certainly not emulating Unix paths). So let's just detect if there is a colon in $PWD and punt in that case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The Windows Subsystem for Linux (WSL) version 2 allows to use `chmod` on NTFS volumes provided that they are mounted with metadata enabled (see https://devblogs.microsoft.com/commandline/chmod-chown-wsl-improvements/ for details), for example: $ chmod 0755 /mnt/d/test/a.sh In order to facilitate better collaboration between the Windows version of Git and the WSL version of Git, we can make the Windows version of Git also support reading and writing NTFS file modes in a manner compatible with WSL. Since this slightly slows down operations where lots of files are created (such as an initial checkout), this feature is only enabled when `core.WSLCompat` is set to true. Note that you also have to set `core.fileMode=true` in repositories that have been initialized without enabling WSL compatibility. There are several ways to enable metadata loading for NTFS volumes in WSL, one of which is to modify `/etc/wsl.conf` by adding: ``` [automount] enabled = true options = "metadata,umask=027,fmask=117" ``` And reboot WSL. It can also be enabled temporarily by this incantation: $ sudo umount /mnt/c && sudo mount -t drvfs C: /mnt/c -o metadata,uid=1000,gid=1000,umask=22,fmask=111 It's important to note that this modification is compatible with, but does not depend on WSL. The helper functions in this commit can operate independently and functions normally on devices where WSL is not installed or properly configured. Signed-off-by: xungeng li <xungeng@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Previously, we did not install any handler for Ctrl+C, but now we really want to because the MSYS2 runtime learned the trick to call the ConsoleCtrlHandler when Ctrl+C was pressed. With this, hitting Ctrl+C while `git log` is running will only terminate the Git process, but not the pager. This finally matches the behavior on Linux and on macOS. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ITOR" In e3f7e01 (Revert "editor: save and reset terminal after calling EDITOR", 2021-11-22), we reverted the commit wholesale where the terminal state would be saved and restored before/after calling an editor. The reverted commit was intended to fix a problem with Windows Terminal where simply calling `vi` would cause problems afterwards. To fix the problem addressed by the revert, but _still_ keep the problem with Windows Terminal fixed, let's revert the revert, with a twist: we restrict the save/restore _specifically_ to the case where `vi` (or `vim`) is called, and do not do the same for any other editor. This should still catch the majority of the cases, and will bridge the time until the original patch is re-done in a way that addresses all concerns. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands, therefore we implemented it in `git reset` for use by Visual Studio. Unfortunately, upstream Git decided that it is time to introduce `--pathspec-from-file` instead. To keep backwards-compatibility for some grace period, we therefore reinstate the `--stdin` option on top of the `--pathspec-from-file` option, but mark it firmly as deprecated. Helped-by: Victoria Dye <vdye@github.com> Helped-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added in 0a756b2 (fsmonitor: config settings are repository-specific, 2021-03-05)) after its removal from the upstream version of FSMonitor. Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by "overloading" the 'core.fsmonitor' setting to take a boolean value. However, several applications (e.g., 'scalar') utilize the original config setting, so it should be preserved for a deprecation period before complete removal: * if 'core.fsmonitor' is a boolean, the user is correctly using the new config syntax; do not use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'. * if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if 'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook indicated by the path. Additionally, for this deprecation period, advise users to switch to using 'core.fsmonitor' to specify their use of the builtin FSMonitor. Signed-off-by: Victoria Dye <vdye@github.com>
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>
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 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>
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>
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>
Includes touch-ups by 마누엘, Philip Oakley and 孙卓识. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and Philip Oakley. Helped-by: Clive Chan <cc@clive.io> Helped-by: Adric Norris <landstander668@gmail.com> Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com> Helped-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Brendan Forster <brendan@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows 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>
This was pull request git-for-windows#1645 from ZCube/master Support windows container. 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>
…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
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>
Handle Ctrl+C in Git Bash nicely Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was reverted. We partially un-revert this, to get the fix again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This topic branch re-adds the deprecated --stdin/-z options to `git reset`. Those patches were overridden by a different set of options in the upstream Git project before we could propose `--stdin`. We offered this in MinGit to applications that wanted a safer way to pass lots of pathspecs to Git, and these applications will need to be adjusted. Instead of `--stdin`, `--pathspec-from-file=-` should be used, and instead of `-z`, `--pathspec-file-nul`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows and developed, improved and stabilized there, the built-in FSMonitor only made it into upstream Git (after unnecessarily long hemming and hawing and throwing overly perfectionist style review sticks into the spokes) as `core.fsmonitor = true`. In Git for Windows, with this topic branch, we re-introduce the now-obsolete config setting, with warnings suggesting to existing users how to switch to the new config setting, with the intention to ultimately drop the patch at some stage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Range-diff
1: 3b2e009 (upstream: 66dd13f) < -: ------------ unify and bump _WIN32_WINNT definition to Windows 8.12: 44760f1 (upstream: 2f8c3f6) < -: ------------ compat/winansi: drop pre-Vista workaround
4: cad0438 = 1: bec1102 sideband: mask control characters
5: dea5198 = 2: 49625dc sideband: introduce an "escape hatch" to allow control characters
6: 04bbc33 = 3: ef329a4 sideband: do allow ANSI color sequences by default
7: 9109830 = 4: 4a69e00 unix-socket: avoid leak when initialization fails
8: 6b71bc1 = 5: c85d30f grep: prevent
^$false match at end of file9: 564e8c5 = 6: 9195696 t9350: point out that refs are not updated correctly
10: 19e20cd = 7: 672dc0d transport-helper: add trailing --
11: 225237b = 8: 5703180 remote-helper: check helper status after import/export
12: 675a8cd = 9: 6834379 Always auto-gc after calling a fast-import transport
14: 72be1d2 = 10: c71f8c5 mingw: include the Python parts in the build
15: 684e39f = 11: 1638a8f win32/pthread: avoid name clashes with winpthread
16: 14ea9a6 = 12: 685995a git-compat-util: avoid redeclaring _DEFAULT_SOURCE
17: 1503396 = 13: cbe1d32 Import the source code of mimalloc v2.2.7
18: 40a30f3 = 14: 58e94be mimalloc: adjust for building inside Git
27: 1d9da7b = 15: d874829 mingw: demonstrate a
git addissue with NTFS junctions19: f60f855 = 16: bc89923 mimalloc: offer a build-time option to enable it
20: 251bd74 = 17: 14948cc clean: do not traverse mount points
30: 7f6416a = 18: b6a4e57 strbuf_realpath(): use platform-dependent API if available
21: 1f59b1c = 19: d768e7e mingw: use mimalloc
13: 4b8b233 = 20: 5e137ed mingw: prevent regressions with "drive-less" absolute paths
22: b447e49 = 21: 03a984f clean: remove mount points when possible
23: eea9edb = 22: a554805 transport: optionally disable side-band-64k
24: c2bf494 = 23: ea5475e mingw: fix fatal error working on mapped network drives on Windows
25: 259e3c4 = 24: 16a5b5a clink.pl: fix MSVC compile script to handle libcurl-d.lib
26: 80212b6 = 25: 906fcfe vcpkg_install: detect lack of Git
28: 931338a = 26: 00725dd vcpkg_install: add comment regarding slow network connections
31: 2574164 = 27: cc7fd6f vcbuild: install ARM64 dependencies when building ARM64 binaries
39: e6acdd1 = 28: 25faced vcbuild: add an option to install individual 'features'
40: 20de789 = 29: 507d54b cmake: allow building for Windows/ARM64
41: a44c79e = 30: 08d7fcc ci(vs-build) also build Windows/ARM64 artifacts
29: db6b111 = 31: 9fcb6e4 t5505/t5516: allow running without
.git/branches/in the templates42: da208ad = 32: d3e83cc Add schannel to curl installation
32: fe35be7 = 33: fc0d461 http: use new "best effort" strategy for Secure Channel revoke checking
33: 3ce58e9 = 34: 191a257 t5505/t5516: fix white-space around redirectors
34: 36e014a = 35: 4d62b84 mingw: implement a platform-specific
strbuf_realpath()35: e614af9 = 36: a469d35 t3701: verify that we can add lots of files interactively
36: 2d84814 = 37: 4223c88 commit: accept "scissors" with CR/LF line endings
37: 2f4b307 = 38: 217b1f1 t0014: fix indentation
38: b19616b = 39: f5148e5 git-gui: accommodate for intent-to-add files
46: d4e722e = 40: c61602d hash-object: demonstrate a >4GB/LLP64 problem
43: a0adc6f = 41: dc56461 cmake(): allow setting HOST_CPU for cross-compilation
49: 8ff63d6 = 42: 0ccb957 object-file.c: use size_t for header lengths
44: 9fda288 = 43: 8978e72 CMake: default Visual Studio generator has changed
55: 7918e8f = 44: b80b5d6 hash algorithms: use size_t for section lengths
45: 550b46c = 45: c4178f1 .gitignore: add Visual Studio CMakeSetting.json file
56: 07fa716 = 46: 1bf4b76 hash-object --stdin: verify that it works with >4GB/LLP64
47: 45df834 = 47: 7816c16 subtree: update
contrib/subtreetesttarget48: 55e8c83 = 48: 8ef3e27 CMakeLists: add default "x64-windows" arch for Visual Studio
57: 5821584 = 49: 4ef57bd hash-object: add another >4GB/LLP64 test case
58: 1f00fb3 = 50: 23be593 setup: properly use "%(prefix)/" when in WSL
50: bd3f9ea = 51: a146f28 mingw: allow for longer paths in
parse_interpreter()51: 37283dd = 52: 9264379 compat/vcbuild: document preferred way to build in Visual Studio
52: 1fa945c = 53: 1865813 http: optionally send SSL client certificate
53: 8f7d41a = 54: 2f94a31 ci: run
contrib/subtreetests in CI builds54: da65821 = 55: 2263509 CMake: show Win32 and Generator_platform build-option values
61: dc70a99 = 56: 215755d hash-object: add a >4GB/LLP64 test case using filtered input
68: 19dd456 = 57: d19431f windows: skip linking
git-<command>for built-ins69: 7ad040c = 58: 336add8 mingw: stop hard-coding
CC = gcc70: 7c99531 = 59: 28aa68f mingw: drop the -D_USE_32BIT_TIME_T option
71: 9968a5a = 60: 319e430 mingw: only use -Wl,--large-address-aware for 32-bit builds
72: 8551b75 = 61: 9a21881 mingw: avoid over-specifying
--pic-executable73: e6ef60d = 62: 7de4453 mingw: set the prefix and HOST_CPU as per MSYS2's settings
74: 2247b4a = 63: bb54e4c mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
59: 0e9db30 = 64: cc31a60 Add config option
windows.appendAtomically75: 6603cd0 = 65: e66b44b mingw: rely on MSYS2's metadata instead of hard-coding it
60: da26259 = 66: 0266f26 MinGW: link as terminal server aware
62: 7e59f5f = 67: f9020a0 compat/mingw.c: do not warn when failing to get owner
63: 2c544d2 = 68: 6df3465 mingw: $env:TERM="xterm-256color" for newer OSes
64: 3a40e80 = 69: 88605cb winansi: check result and Buffer before using Name
65: 98f17d2 = 70: 5f9348a mingw: change core.fsyncObjectFiles = 1 by default
66: 6db5111 = 71: f7b50f5 Fix Windows version resources
67: eefca7d = 72: bb3fe7c status: fix for old-style submodules with commondir
76: 363d1e3 = 73: f17966c mingw: always define
ETC_*for MSYS2 environments77: 7e228a6 = 74: 4bbfcaa max_tree_depth: lower it for clang builds in general on Windows
78: bbece75 = 75: a212a91 mingw: ensure valid CTYPE
79: 8460b86 = 76: 27bc190 mingw: allow
git.exeto be used instead of the "Git wrapper"80: 8dd949a = 77: 2fffaf6 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
81: 7662c98 = 78: 13ad956 clink.pl: fix libexpatd.lib link error when using MSVC
82: 5031072 = 79: b091534 Makefile: clean up .ilk files when MSVC=1
83: 5d0db36 = 80: 28a74a0 vcbuild: add support for compiling Windows resource files
84: 4653bf7 = 81: 6c019fe config.mak.uname: add git.rc to MSVC builds
85: 1e50e83 = 82: 73d2092 clink.pl: ignore no-stack-protector arg on MSVC=1 builds
87: ecc2110 = 83: dfb640e clink.pl: move default linker options for MSVC=1 builds
89: 4f834cf = 84: 486e910 cmake: install headless-git.
86: 2b4827a = 85: 2d675f5 http: optionally load libcurl lazily
91: 8d4e381 = 86: 0809bbe git.rc: include winuser.h
88: ad919d0 = 87: 5f3ac5d http: support lazy-loading libcurl also on Windows
90: 7f54b2f = 88: 6b1abf6 http: when loading libcurl lazily, allow for multiple SSL backends
92: 5e7aecd = 89: a9bd866 mingw: do load libcurl dynamically by default
93: 0aef3ce = 90: 7739e04 Add a GitHub workflow to verify that Git/Scalar work in Nano Server
94: 363890f = 91: 46b73f6 mingw: suggest
windows.appendAtomicallyin more cases103: 39d3602 = 92: dd6288b win32: use native ANSI sequence processing, if possible
104: 726b538 = 93: 33841a5 common-main.c: fflush stdout buffer upon exit
105: 77f8f37 = 94: 9463106 t5601/t7406(mingw): do run tests with symlink support
106: 105df30 = 95: 0cc6cd5 win32: ensure that
localtime_r()is declared even in i686 builds107: 067395b = 96: ac34878 Fallback to AppData if XDG_CONFIG_HOME is unset
108: 17a1cfd = 97: 70bb34b run-command: be helpful with Git LFS fails on Windows 7
95: 639ba81 = 98: 9345c86 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
96: 07d8e26 = 99: 19de67f revision: create mark_trees_uninteresting_dense()
97: b4898c4 = 100: 2363edc survey: stub in new experimental 'git-survey' command
98: 1d719bf = 101: b7fa10f survey: add command line opts to select references
99: f13ffd0 = 102: 942bbfc survey: start pretty printing data in table form
100: dd88cf8 = 103: b7c6c74 survey: add object count summary
101: 288ae6c = 104: 98f7436 survey: summarize total sizes by object type
102: c0e7b85 = 105: a8e9988 survey: show progress during object walk
110: 1930def = 106: 4335560 survey: add ability to track prioritized lists
109: d462e00 = 107: a015c59 mingw: make sure
errnois set correctly when socket operations fail113: 795f5dc = 108: eade8c0 survey: add report of "largest" paths
111: d623629 = 109: c11404e compat/mingw: handle WSA errors in strerror
116: f303c99 = 110: ed3bbd3 survey: add --top= option and config
114: c82a9f4 = 111: 640d8a8 compat/mingw: drop outdated comment
119: dec8ec7 = 112: c5dee63 survey: clearly note the experimental nature in the output
112: 1c27023 = 113: a38f86c t5563: verify that NTLM authentication works
115: 9affb87 = 114: 2ff1538 http: disallow NTLM authentication by default
117: 1d9c888 = 115: 70c92e7 t0301: actually test credential-cache on Windows
118: 5612c83 = 116: a554f9b http: warn if might have failed because of NTLM
120: 3d8351f = 117: 3f8e7c5 credential-cache: handle ECONNREFUSED gracefully
121: bf05a58 = 118: 0e2e179 reftable: do make sure to use custom allocators
122: dfa6a7c = 119: 7d3b7ff check-whitespace: avoid alerts about upstream commits
123: a1bd514 = 120: 731b6d3 t/t5571-prep-push-hook.sh: Add test with writing to stderr
124: 75d09c7 = 121: 252d160 credential: advertise NTLM suppression and allow helpers to re-enable
126: b93f3c7 = 122: 0f29e91 dir: do not traverse mount points
3: 5ce2b45 = 123: 123c79c win32: thread-utils: handle multi-socket systems
125: a47dcfd (upstream: c664ee2) < -: ------------ mingw: use strftime() directly in UCRT builds
127: 3b8f7fa = 124: a77d57e ci(macos): skip the
git p4tests128: ff97fec = 125: bada4bc Win32: make FILETIME conversion functions public
129: 60aed93 = 126: 91fb7ff Win32: dirent.c: Move opendir down
130: 67a5395 = 127: ca3a902 mingw: make the dirent implementation pluggable
131: 3f0d3c5 = 128: d1c5be1 Win32: make the lstat implementation pluggable
132: 6144194 = 129: 4764175 mingw: add infrastructure for read-only file system level caches
134: 580aee5 = 130: 9a8a5fd mingw: add a cache below mingw's lstat and dirent implementations
136: 861d981 = 131: 06e6ac8 fscache: load directories only once
137: 448749b = 132: 0a87028 fscache: add key for GIT_TRACE_FSCACHE
133: 9d0813f = 133: 939fe2d git-gui--askyesno: fix funny text wrapping
138: 82d09a9 = 134: 5f8f9ed fscache: remember not-found directories
135: 2a8f933 = 135: 260fa55 git-gui--askyesno (mingw): use Git for Windows' icon, if available
139: 8b6c3cc = 136: 00bb68a fscache: add a test for the dir-not-found optimization
140: 486873c = 137: 334d051 add: use preload-index and fscache for performance
141: 111ac06 = 138: 1a018d0 dir.c: make add_excludes aware of fscache during status
142: 6cfa7ae = 139: fba04fe fscache: make fscache_enabled() public
143: 5a24cbb = 140: da03204 dir.c: regression fix for add_excludes with fscache
144: be7243c = 141: c2f237d fetch-pack.c: enable fscache for stats under .git/objects
145: c97953a = 142: c6fdd8f checkout.c: enable fscache for checkout again
146: ad44d84 = 143: be117ca Enable the filesystem cache (fscache) in refresh_index().
147: dfb3c53 = 144: f571ee7 fscache: use FindFirstFileExW to avoid retrieving the short name
148: 22b8267 = 145: 5fd4c12 fscache: add GIT_TEST_FSCACHE support
149: 9d416ef = 146: 22de66a fscache: add fscache hit statistics
150: 90970d9 = 147: 7057bcc unpack-trees: enable fscache for sparse-checkout
151: 6409d56 = 148: 76621dc status: disable and free fscache at the end of the status command
152: 0bdb2cf = 149: f288d1a mem_pool: add GIT_TRACE_MEMPOOL support
153: 621be54 = 150: 5f82193 fscache: fscache takes an initial size
154: 9e00f99 = 151: b17c1ab fscache: update fscache to be thread specific instead of global
155: 4773626 = 152: 46a799d fscache: teach fscache to use mempool
156: 44df3c4 = 153: 9df1da2 fscache: make fscache_enable() thread safe
157: e8cfdf1 = 154: 42fa270 fscache: teach fscache to use NtQueryDirectoryFile
158: 1e93c8b = 155: d483f78 fscache: remember the reparse tag for each entry
159: c9dd4fb = 156: 579d425 fscache: implement an FSCache-aware is_mount_point()
160: 8bd9d50 = 157: 740ba37 clean: make use of FSCache
161: adadbb5 = 158: 6c80f38 pack-objects (mingw): demonstrate a segmentation fault with large deltas
162: 17d3187 = 159: b8a7891 mingw: support long paths
163: faf8168 = 160: f07c648 win32(long path support): leave drive-less absolute paths intact
164: 3763a6b = 161: 8cf88c8 compat/fsmonitor/fsm-*-win32: support long paths
165: 598fe6b = 162: 560f57a clean: suggest using
core.longPathsif paths are too long to remove166: ec67885 = 163: 0b048a6 mingw: Support
git_terminal_promptwith more terminals167: df7032d = 164: 5913b03 compat/terminal.c: only use the Windows console if bash 'read -r' fails
168: beb26cd = 165: 566add0 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
173: 2a55a1b = 166: bbb7777 Win32: symlink: move phantom symlink creation to a separate function
174: 11a294f = 167: 7b02b5f Introduce helper to create symlinks that knows about index_state
175: 83e41f0 = 168: b8498b0 mingw: allow to specify the symlink type in .gitattributes
176: 3371f54 = 169: 50c3456 Win32: symlink: add test for
symlinkattribute177: 98ef286 = 170: e65b1e9 mingw: explicitly specify with which cmd to prefix the cmdline
178: 4542c7d = 171: 0046c75 mingw: when path_lookup() failed, try BusyBox
179: c78b42d = 172: 063fa72 test-tool: learn to act as a drop-in replacement for
iconv180: 3f0d0b8 = 173: 2f7aa93 tests(mingw): if
iconvis unavailable, usetest-helper --iconv181: 5429073 = 174: fd4393b gitattributes: mark .png files as binary
182: eec1e68 = 175: d6023e4 tests: move test PNGs into t/lib-diff/
169: eadec2d = 176: f1846f2 mingw: introduce code to detect whether we're inside a Windows container
183: fc233c3 = 177: 40d85fc tests: only override sort & find if there are usable ones in /usr/bin/
170: 9ba7444 = 178: 50132a1 mingw: when running in a Windows container, try to rename() harder
184: 5d98c34 = 179: 68c5df3 tests: use the correct path separator with BusyBox
171: fa9b834 = 180: 2941911 mingw: move the file_attr_to_st_mode() function definition
185: 02882f8 = 181: 44a63d3 mingw: only use Bash-ism
builtin pwd -Wwhen available172: f773ee6 = 182: 321b1f8 mingw: Windows Docker volumes are not symbolic links
187: 9864990 = 183: 9c4a3b6 tests (mingw): remove Bash-specific pwd option
186: 81456c0 = 184: e6bd949 mingw: work around rename() failing on a read-only file
188: 3b75e32 = 185: b2cfbea test-lib: add BUSYBOX prerequisite
189: 472e2ad = 186: fd8ff66 t5003: use binary file from t/lib-diff/
190: 4772e27 = 187: 3a94764 t5532: workaround for BusyBox on Windows
191: f2c4668 = 188: dc17984 t5605: special-case hardlink test for BusyBox-w32
192: 566ab3c = 189: 0361a2f t5813: allow for $PWD to be a Windows path
193: d748035 = 190: 2259c00 t9200: skip tests when $PWD contains a colon
194: 0f22b67 = 191: 2b416f7 mingw: kill child processes in a gentler way
203: 9da95d9 = 192: 709b80b Add a GitHub workflow to monitor component updates
195: d1e78a1 = 193: 5743ca1 mingw: optionally enable wsl compability file mode bits
196: a5c2baa = 194: 893a8e2 mingw: really handle SIGINT
197: 57557b4 = 195: b128ba4 Partially un-revert "editor: save and reset terminal after calling EDITOR"
205: 3e94fd6 = 196: fd86795 reset: reinstate support for the deprecated --stdin option
206: 70f0dfc = 197: 27c9085 fsmonitor: reintroduce core.useBuiltinFSMonitor
207: 9bbffaa = 198: 2d4fafd dependabot: help keeping GitHub Actions versions up to date
198: 26d2f52 = 199: f54641d Describe Git for Windows' architecture [no ci]
199: 14acb60 = 200: 8ec31e8 Modify the Code of Conduct for Git for Windows
200: c060827 = 201: 02208e5 CONTRIBUTING.md: add guide for first-time contributors
201: 9d20a0f = 202: 7157f67 README.md: Add a Windows-specific preamble
202: bb67eb5 = 203: 52b8979 Add an issue template
204: 471eb8e = 204: 27a8471 Modify the GitHub Pull Request template (to reflect Git for Windows)
208: 42dd91b = 205: 47175e7 SECURITY.md: document Git for Windows' policies
209: a2409ca (upstream: 89152af) < -: ------------ cmake: use writev(3p) wrapper as needed