Skip to content

Conversation

@dennisameling
Copy link
Contributor

@dennisameling dennisameling commented Dec 27, 2022

⚠️ This needs #457 to be merged first
⚠️ This needs #461 to be merged first

I used the list of files that need updating from this comment (thanks @dscho!)

Let's leave the rename of the git-extra folder to mingw-w64-git-extra for a follow-up PR.

Important note regarding Wiki updates: the updates to the wiki currently live on a branch that are not accessible through GitHub's UI. To see them, do the following:

git clone https://github.com/git-for-windows/git.wiki.git
git checkout update-git-extra-docs

As we can't create a PR for the changes from that branch, we'll have to commit straight to the main branch if all looks good. CC @dscho

@dennisameling dennisameling changed the title [WIP] start using new git-extra prefix Start using new git-extra prefix Dec 27, 2022
@dennisameling dennisameling marked this pull request as ready for review December 27, 2022 21:46
@dennisameling
Copy link
Contributor Author

dennisameling commented Dec 27, 2022

UPDATE Jan 22nd 2023: the error below no longer applies.

Ha, interesting. CI is failing with the following error:

error: package 'mingw-w64-x86_64-git-extra' not found

That's because the changes we need to install mingw-w64-git-extra instead of git-extra through the sync () function in please.sh are in this PR too.

So we could e.g. take the first three commits, c0e0a7a, 26350da and d98adb1, and open a separate PR for those, merge it, let the sync CI job run in git-sdk-64 and git-sdk-32 so that it installs mingw-w64-git-extra, and then add the other commits from this PR on top. WDYT?

UPDATE: I'm optimistic that'll work. For example, pactree -u git-extra still works even if mingw-w64-x86_64-git-extra is installed, because it provides git-extra. I confirmed this by testing locally. Will now proceed by creating a separate PR and then leaving this one in place as a follow-up.

@dennisameling dennisameling changed the title Start using new git-extra prefix Start using new git-extra prefix (follow-up) Dec 27, 2022
@dennisameling dennisameling marked this pull request as draft December 27, 2022 22:21
In a recent commit, we started publishing the mingw-w64-git-extra
package in addition to git-extra. We intend to completely remove the old
git-extra package over time, but let's start using the new
mingw-w64-git-extra prefix now. More background on this change can be
found in the attached commit.

Ref: git-for-windows@3f26b1b
Signed-off-by: Dennis Ameling <[email protected]>
In a recent commit, we started publishing the mingw-w64-git-extra
package in addition to git-extra. We intend to completely remove the old
git-extra package over time, but let's start using the new
mingw-w64-git-extra prefix now. More background on this change can be
found in the attached commit.

Ref: git-for-windows@3f26b1b
Signed-off-by: Dennis Ameling <[email protected]>
@dennisameling dennisameling marked this pull request as ready for review January 22, 2023 19:07
@dennisameling dennisameling requested a review from dscho January 22, 2023 19:09
@dscho dscho merged commit 5eb4525 into git-for-windows:main Jan 23, 2023
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