[New msys2-runtime version] 2 new items

[github-actions]

[New msys2-runtime version]

    Cygwin: Add missing IsWow64Process2 declaration

Cygwin: Add missing IsWow64Process2 declaration

The previous patch is accidentally missing the declaration of
IsWow64Process2. Add it belatedly.

Fixes: 1865a41cb383 ("Cygwin: suppress FAST_CWD warnings on ARM64")
Signed-off-by: Corinna Vinschen corinna@vinschen.de

msys2/msys2-runtime@d77a022

[New msys2-runtime version]

    Cygwin: suppress FAST_CWD warnings on ARM64

Cygwin: suppress FAST_CWD warnings on ARM64

The old check was insufficient: new insider preview builds of Windows
allow running x86_64 process on ARM64. The IsWow64Process2 function
seems to be the intended way to figure this situation out.

msys2/msys2-runtime@25d1543

[dscho]

We will see whether it is necessary to backport this fix.

[bobbylowstetter]

Hello! I believe this may be necessary. I am running Windows 10 Pro Evaluation Build 21354.co_release.210402-1630. When I pull from git, I get the following response:

Cloning into 'foo'...
Cygwin WARNING:
Couldn't compute FAST_CWD pointer. This typically occurs if you're using
an older Cygwin version on a newer Windows. Please update to the latest
available Cygwin version from https://cygwin.com/. If the problem persists,
please see https://cygwin.com/problems.html

Cygwin WARNING:
Couldn't compute FAST_CWD pointer. This typically occurs if you're using
an older Cygwin version on a newer Windows. Please update to the latest
available Cygwin version from https://cygwin.com/. If the problem persists,
please see https://cygwin.com/problems.html

remote: Enumerating objects: 84, done.
remote: Counting objects: 100% (84/84), done.
remote: Compressing objects: 100% (66/66), done.
....and so on

That Windows build is running o a MacBook Pro 13 with the Apple M1

[dscho]

Hello! I believe this may be necessary. I am running Windows 10 Pro Evaluation Build 21354.co_release.210402-1630. When I pull from git, I get the following response:

Cloning into 'foo'...
Cygwin WARNING:
Couldn't compute FAST_CWD pointer. This typically occurs if you're using
an older Cygwin version on a newer Windows. Please update to the latest
available Cygwin version from https://cygwin.com/. If the problem persists,
please see https://cygwin.com/problems.html

Cygwin WARNING:
Couldn't compute FAST_CWD pointer. This typically occurs if you're using
an older Cygwin version on a newer Windows. Please update to the latest
available Cygwin version from https://cygwin.com/. If the problem persists,
please see https://cygwin.com/problems.html

remote: Enumerating objects: 84, done.
remote: Counting objects: 100% (84/84), done.
remote: Compressing objects: 100% (66/66), done.
....and so on

That Windows build is running o a MacBook Pro 13 with the Apple M1

Could I ask you to work on this? This is how you would get started:

1. install Git for Windows' SDK,
2. sdk cd MSYS2-packages,
3. cd msys2-runtime
4. sdk build
5. cd to src/msys2-runtime, which is a checkout of https://github.com/git-for-windows/msys2-runtime/
6. fetch the cygwin remote
7. cherry-pick the changes
8. build again using sdk build in /usr/src/MSYS2-packages/msys2-runtime
9. test by copying /usr/src/MSYS2-packages/msys2-runtime/src/build-x86_64-pc-msys/x86_64-pc-msys/winsup/cygwin/msys0.dll into an extracted Portable Git, then running that Portable Git's git-bash.exe
10. open a PR?

Alternatively, if you don't want to build locally but use GitHub Actions for you, you could

1. clone https://github.com/git-for-windows/msys2-runtime/,
2. add https://github.com/msys2/msys2-runtime/ as a remote,
3. cherry-pick msys2/msys2-runtime@3667030 and msys2/msys2-runtime@4606a4f so that a push will build it via GitHub Actions
4. then cherry-pick the fixes indicated in this here ticket
5. push
6. wait for the build to finish (you will have to make sure that Actions are enabled in your fork)
7. download the build artifact and test (probably in a just-extracted Portable Git)

[bobbylowstetter]

Hello @dscho,

I am currently following this procedure above and am stuck on step 5: cd to src/msys2-runtime, which is a checkout of https://github.com/git-for-windows/msys2-runtime/

The src directory does not exist. Is there a step I may have missed? I reran through the procedure a couple times so hopefully, the question will not be foolish!

Thanks for working with me on this by the way! Very much appreciated!

[dscho]

That directory should be created as part of sdk build in /usr/src/MSYS2-packages/msys2-runtime

(sorry for the terseness, am on a phone)

[bobbylowstetter]

Apologies for this but I ended up sending the laptop back. I will not be able to complete this task.

[dscho]

We will get this automatically once we rebase to v3.2.1.

[Alovchin91]

Hi @dscho Do you plan to rebase on v3.2.1? I'm using Git for Windows x64 on Surface Pro X and this issue is bothering me constantly 😬 I could also do what you described above, if you have no plans to rebase msys2-runtime yet.

[dscho]

You had me worried that I missed v3.2.1! But according to http://cygwin.com/:

The most recent version of the Cygwin DLL is 3.2.0.

[Alovchin91]

Oops, sorry 😅 I don't see this issue with x64 MSYS2, but it's all over the place in Git for Windows. Do you think it's worth cherry-picking the fix, as you've mentioned before?

[dscho]

Do you think it's worth cherry-picking the fix, as you've mentioned before?

As I've mentioned before, I think it's worth cherry-picking the fix. Yes.

[Alovchin91]

Cool, will try to do that this week 👍 BTW it seems Git for Windows package sources actually downgrade msys2-runtime from 3.2.0 to 3.1.7 (compared to MSYS2). Not sure if it's just the SDK or if it was intentional not to upgrade it to 3.2.0 🤔

[dscho]

Not sure if it's just the SDK or if it was intentional not to upgrade it to 3.2.0

I intentionally keep Git for Windows at v3.1.7 for the moment. In my personal testing, I ran into too many snags. Now that I think about it, it might have been that "wonderful" COLUMNS problem that was actually introduced by a new less version. But I lack the time to start another round of dogfooding v3.2.0 over here, so I'll keep it at v3.1.7 unless I hear of extensive testing that would make me confident to upgrade.

[Alovchin91]

Hmm, okay 🤔 I'll prepare a cherry pick later this week then 😬

[Alovchin91]

Hi @dscho ,

I'm sorry, it took me slightly more than a week to get to this 😅

Here's a PR: git-for-windows/msys2-runtime#33

I've built it in my fork and it resolves the issue for me: https://github.com/Alovchin91/msys2-runtime/actions/runs/1323220334

Please consider taking it into the next release, if it's not too late yet 😄

[dscho]

@Alovchin91 could you give v2.33.1 a spin? It should have your fix.

[Alovchin91]

Will do! Thanks 👏

[Alovchin91]

@dscho Tried it, the issue is resolved! Thank you! 👏 🎉