Skip to content

Commit bbe328b

Browse files
committed
Update some docs re the new native git
Fixes #430
1 parent 9879735 commit bbe328b

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

web/docs/ci.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
with:
3131
msystem: UCRT64
3232
update: true
33-
install: git mingw-w64-ucrt-x86_64-gcc
33+
install: mingw-w64-ucrt-x86_64-git mingw-w64-ucrt-x86_64-gcc
3434
- name: CI-Build
3535
run: |
3636
echo 'Running in MSYS2!'
@@ -65,7 +65,7 @@ Windows-MSYS2-UCRT64:
6565
- C:\msys64\usr\bin\bash -lc 'pacman --noconfirm -Syuu'
6666
- |
6767
C:\msys64\usr\bin\bash -lcx '
68-
pacman --noconfirm -Syu git mingw-w64-ucrt-x86_64-autotools mingw-w64-ucrt-x86_64-gcc
68+
pacman --noconfirm -Syu mingw-w64-ucrt-x86_64-git mingw-w64-ucrt-x86_64-autotools mingw-w64-ucrt-x86_64-gcc
6969
./bootstrap
7070
./configure
7171
make V=1 check VERBOSE=t'

web/docs/git.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
# Git
22

3-
We currently only provide a [cygwin based git](https://packages.msys2.org/base/git), which only understands and outputs Unix paths and thus behaves slightly differently compared to ["Git for Windows"](https://gitforwindows.org/). It also is quite a bit slower, which is especially noticeable on larger repositories.
4-
53
```bash
6-
pacman -S git
4+
pacman -S "$MINGW_PACKAGE_PREFIX-git" # native Windows build of git
5+
pacman -S git # cygwin based git
76
```
87

98
## FAQ
109

11-
### Why is there no MinGW based Git in MSYS2 despite "Git for Windows" being based on MSYS2?
12-
13-
The [git-for-windows](https://github.com/git-for-windows) project maintains various patches on top of git itself as well as patches various MSYS2 packages to get the git test suite to pass on Windows and provide a complete and bug-free git experience. Our long term goal is to include their git build, but no one has started working on this yet.
14-
15-
There exists a guide to install the official build into MSYS2: https://gitforwindows.org/install-inside-msys2-proper but note that this setup is only supported on a best effort basis and any issues should be verified with the official git build before reporting them upstream.
16-
1710
### Why are "gitk" and "git gui" not working in the MSYS environment?
1811

1912
They depend on Tcl/Tk and we only provide mingw builds for those. In all environments besides MSYS they should work fine though.
2013

21-
### Some tool I use fails to work with the git in MSYS2, but works fine with the official one
14+
### Some tool I use fails to work with the Cygwin git in MSYS2, but works fine with the official one
2215

2316
One common issue with external tools integrating git, is that they get confused by Unix paths, for example when figuring out the project root path via `git rev-parse --show-toplevel`. This can be worked around by using `git rev-parse --show-prefix` instead which outputs a relative path from the root to the current working directory, which is both a valid Unix and Windows path. Or `git rev-parse --show-cdup` which outputs a relative path from the current working directory to the root, which is also a valid Unix and Windows path.
2417

2518
If all fails you can `export GIT_DIR=/dev/null` to make git not find any repository at all, which usually makes tools skip any git related logic.
19+
20+
21+
## Changelog
22+
23+
* 2026-02-28: We now provide a native Windows build of git:
24+
https://packages.msys2.org/base/mingw-w64-git. Workarounds such as
25+
https://gitforwindows.org/install-inside-msys2-proper are no longer necessary.

0 commit comments

Comments
 (0)