Skip to content
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

Fix nested submodules #36

Merged
merged 3 commits into from
Jul 12, 2022
Merged

Conversation

pwithnall
Copy link
Contributor

While top-level submodules (e.g. $GIT_DIR/mysubmodule) were working
fine, those in subdirectories (for example,
$GIT_DIR/subprojects/mysubmodule) were not, since the middle part of the
path (‘subprojects’) was being dropped during the checksum recursion.

Fixing this is especially important for any project using Meson-style
subprojects, which are conventionally all grouped in the ‘subprojects’
directory.

Signed-off-by: Philip Withnall withnall@endlessm.com

While top-level submodules (e.g. $GIT_DIR/mysubmodule) were working
fine, those in subdirectories (for example,
$GIT_DIR/subprojects/mysubmodule) were not, since the middle part of the
path (‘subprojects’) was being dropped during the checksum recursion.

Fixing this is especially important for any project using Meson-style
subprojects, which are conventionally all grouped in the ‘subprojects’
directory.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
As in the previous commit.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Signed-off-by: Philip Withnall <withnall@endlessm.com>
@pwithnall
Copy link
Contributor Author

pwithnall commented May 11, 2021

Trivially rebased and added one tiny fix to the TAP line which lists the number of tests. I haven’t re-tested it; that can be done if anyone ever takes a look at this for review.

@pwithnall
Copy link
Contributor Author

Any chance of getting this reviewed and landed? I’ve been using it for over a year without problems now, and aiui it’s not possible to release GLib without it (due to use of submodules within Meson’s subprojects/ directory).

@pwithnall
Copy link
Contributor Author

/cc @cgwalters

@3v1n0
Copy link

3v1n0 commented Jul 12, 2022

Would be quite nice to have this merged and released :)

@cgwalters
Copy link
Owner

Sorry, I completely missed notifications for this!

Looks good to me!

@cgwalters cgwalters merged commit 12b1686 into cgwalters:master Jul 12, 2022
@pwithnall pwithnall deleted the fix-nested-submodules branch July 13, 2022 09:13
@pwithnall
Copy link
Contributor Author

Thank you!

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.

None yet

3 participants