Fix test_clone_unborn_head_sub on a managed branch #4792
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
test_clone_unborn_head_sub() sets up a scenario in which the to-be-cloned dataset has a submodule where HEAD points to a branch with no commits and another branch has commits. This is an uncommon state to get into with a local repository, but it's not too tricky to do when setting up remotes, particularly for datasets created with a create-sibling before 8452426 (ENH: create-sibling: Set HEAD of sibling to local repo's branch, 2020-04-01). When on a managed branch, the scenario is botched. The corresponding branch is renamed while the adjusted branches are left as is, leading to a mismatched set like refs/heads/other, refs/heads/adjusted/master(unlocked), and refs/basis/adjusted/master(unlocked). Fix the setup so that the adjusted branches are renamed as well, following the approach used in another test, test_clone_unborn_head(). Note that, without the changes here, this test doesn't start to fail until Git's 7c5045fc18 (ref-filter: apply fallback refname sort only after all user sorts, 2020-05-03), which was released with v2.27.0. With 7c5045fc18, the git-annex-init call in the cloned submodule fails trying to update a non-existent origin/master. But 7c5045fc18 is just about refname ordering; you can trigger the failure with Git versions before v2.27.0 by replacing the refname "other" with "abc" (i.e. changing the position of the non-master refname relative to master). Even though the scenario that triggers this is broken and unlikely to happen in the wild, this should probably be reported to git-annex in case it indicates a wider issue. Fixes datalad#4727.
The previous commit describes how test_clone_unborn_head_sub() unintentionally created a set of mismatched corresponding and adjusted branches, such as refs/heads/other, refs/heads/adjusted/master(unlocked), and refs/basis/adjusted/master(unlocked). If a repo with this setup is cloned and postclone_check_head() checks out the adjusted branch, the downstream git-annex-init call may crash. Teach postclone_check_head() to avoid adjusted branches. The subsequent git-annex-init call will take care of moving to an adjusted branch if it detects that the file system doesn't support symlinks. Re: datalad#4727
kyleam
changed the title
|
Test failure is #4773 |
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.
This fixes the test failure that @mih reported in gh-4727. The first commit is the main fix. It updates the test itself, which was setting up an unintended and bizarre repo state that happened to pass before Git 2.27. The second commit prevents
postclone_check_headfrom checking out adjusted branches. Either of these commits on their own avoid the failure.I've confirmed that the test passes when executed under
tools/eval_under_testloopfsboth before and after the git commit mentioned in that issue.