checkout: Provide useful error with checkout -H and incompat mode #779
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
Previously we'd assert and dump core if one used `checkout -H` without `-U` on a bare-user repo, because we'd hit the bare-user symlink case. Rework the code to handle this, and add tests. I hit this when I was going to suggest to someone to use `-H` to ensure they were getting hardlinks.
jlebon
reviewed
Apr 12, 2017
src/libostree/ostree-repo-checkout.c
Outdated
| (current_repo->mode == OSTREE_REPO_MODE_BARE | ||
| && options->mode == OSTREE_REPO_CHECKOUT_MODE_NONE) || | ||
| (repo_is_usermode && options->mode == OSTREE_REPO_CHECKOUT_MODE_USER); | ||
| /* NOTE: bare-user symlinks are not stored as symlinks */ |
There was a problem hiding this comment.
Can we add a e.g. (see comment in write_object()) here? It's not intuitive offhand why we can't hardlink symlinks in bare-user mode. It took me some digging through git logs to find 47c612e and the associated comment in write_object().
src/libostree/ostree-repo-checkout.c
Outdated
| && options->mode == OSTREE_REPO_CHECKOUT_MODE_NONE) || | ||
| (repo_is_usermode && options->mode == OSTREE_REPO_CHECKOUT_MODE_USER); | ||
| /* NOTE: bare-user symlinks are not stored as symlinks */ | ||
| gboolean is_bare_symlink = (repo_is_usermode && is_symlink); |
There was a problem hiding this comment.
Should this be renamed is_bare_user_symlink ?
src/libostree/ostree-repo-checkout.c
Outdated
| * assertion is intended to ensure that for regular files at least, we | ||
| * succeeded at hardlinking above. | ||
| */ | ||
| if (!is_symlink) |
There was a problem hiding this comment.
Would the intent here be better expressed as:
if (options->no_copy_fallback)
g_assert (is_bare_user_symlink);?
|
Fixup for comments ⬆️ |
|
☀️ Test successful - status-atomicjenkins |
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.
Previously we'd assert and dump core if one used
checkout -Hwithout-Uon a bare-user repo, because we'd hit the bare-user symlink case.Rework the code to handle this, and add tests. I hit this when I was going to
suggest to someone to use
-Hto ensure they were getting hardlinks.