Change handling of submodules at upgrade #293
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Start with doing "submodule absorbgitdirs" as otherwise "submodule deinit" will fail if a module has been cloned first and later added as a submodule (as it will then contain the .git dir instead of it being under the superprojects .git dir). Then try to deinit the submodules before moving the repo and abort the upgrade if it fails for any submodule. Then do the move and finally initialize the submodules that were initialized before the upgrade. See yadm-dev#285
|
Looks super! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Changes how submodules are handled during upgrade.
What issues does this PR fix or reference?
Previous Behavior
Upgrade would deinit submodules after moving the repo and then initialize them all. There are a couple of issues with this:
-fis used during deinit, any local changes in the submodule would be lost.New Behavior
submodule absorbgitdirs. This makes sure thatsubmodule deinitwill not fail for modules that were cloned before being added.submodule deinitis called for each submodule that's initialized. If an error happens the deinit is undone and upgrade fails.Have tests been written for this change?
Yes, see #284.
Have these commits been signed with GnuPG?
Yes
Please review yadm's Contributing Guide for best practices.