Skip to content

git-extra(i686): remove libunistring workaround #594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 17, 2025
Merged

git-extra(i686): remove libunistring workaround #594

merged 3 commits into from
Feb 17, 2025

Conversation

jeremyd2019
Copy link
Contributor

After git-for-windows/MSYS2-packages#219 the extra file is no longer needed.

@jeremyd2019
Copy link
Contributor Author

Or I could just make a PR against git-sdk-32 removing the file 😁

After git-for-windows/MSYS2-packages#219 the extra file is no longer needed.

Signed-off-by: Jeremy Drake <github@jdrake.com>
Signed-off-by: Jeremy Drake <github@jdrake.com>
@jeremyd2019
Copy link
Contributor Author

hmm, was thinking it'd be a good idea to make sure no package owns the file before removing it, but now I'm concerned about calling pacman from an install script - the pacman calling the script is probably still holding the db.lck...

Signed-off-by: Jeremy Drake <github@jdrake.com>
@dscho
Copy link
Member

dscho commented Feb 17, 2025

/deploy git-extra

The i686/x86_64 and the arm64 workflow runs were started.

@dscho
Copy link
Member

dscho commented Feb 17, 2025

/deploy git-extra

Dangit. I should have rebased this PR after merging #595... Since I did not, the changes were not in effect and the changes were not reflected in https://github.com/git-for-windows/pacman-repo... Will synchronize that now, manually.

@jeremyd2019
Copy link
Contributor Author

cool. I just confirmed that this worked. Guess it is OK to call pacman from the install script (at least -Q).

@dscho
Copy link
Member

dscho commented Feb 17, 2025

Guess it is OK to call pacman from the install script (at least -Q).

Well, in line with the insane tradition originally pursued even by Git, namely to rely on Unix shell scripts in production code (including the outstanding and excellent error checking, type safety and locking capabilities of that language </s>) it is no surprise to me that Pacman might still perform some operations improperly not under a lock ;-)

@dscho
Copy link
Member

dscho commented Feb 17, 2025

/deploy git-extra

Dangit. I should have rebased this PR after merging #595... Since I did not, the changes were not in effect and the changes were not reflected in https://github.com/git-for-windows/pacman-repo... Will synchronize that now, manually.

Here it is:

And with this, I really call this PR done.

@dscho dscho merged commit 23c707a into git-for-windows:main Feb 17, 2025
8 checks passed
@jeremyd2019 jeremyd2019 deleted the patch-1 branch February 17, 2025 18:27
@jeremyd2019
Copy link
Contributor Author

Guess it is OK to call pacman from the install script (at least -Q).

Well, in line with the insane tradition originally pursued even by Git, namely to rely on Unix shell scripts in production code (including the outstanding and excellent error checking, type safety and locking capabilities of that language ) it is no surprise to me that Pacman might still perform some operations improperly not under a lock ;-)

Actually, maybe it did fail... I send stderr and stdout to /dev/null, and the if check wants it to fail, so it very well could have failed due to a locked db rather than the file not being owned

@dscho
Copy link
Member

dscho commented Feb 17, 2025

But it removed the libunistring-2.dll?

@jeremyd2019
Copy link
Contributor Author

jeremyd2019 commented Feb 17, 2025

yes, because the arch was i686, the msys-unistring-2.dll existed, the pacman call failed (either due to the msys-unistring-2.dll not being owned by any package, or due to the database being locked by the pacman currently installing git-extra), and the grep failed (not matching msys-unistring-2 in msys-gnutls-30.dll.

It doesn't really matter at this point, it did what it was supposed to do, and won't do it again because the file's gone (and presumably that chunk will be removed the next time there's a git-extra update).

@dscho
Copy link
Member

dscho commented Feb 17, 2025

It doesn't really matter at this point, it did what it was supposed to do, and won't do it again because the file's gone (and presumably that chunk will be removed the next time there's a git-extra update).

Right. I'd leave it in for a few moments, though, because there are still a number of people who ignore my warnings that installing Git for Windows in MSYS2 proper is not supported and they should do that only if they can fix it themselves if things go wrong (which many of them actually cannot, and then open tickets in git-for-windows/git, to my great annoyance).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants