cli: reorder import of git head/refs and snapshot #2888
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
I'm going to make WorkspaceCommandHelper::maybe_snapshot() snapshot the working copy before importing refs. git::import_some_refs() can rebase the working copy branch and therefore @ can be moved. git::import_head() doesn't, and it should be invoked before snapshotting. git::import_head() is inserted to some of the git:import_refs() callers where HEAD seems to matter. I feel it's a bit odd that the HEAD ref is imported to non-colocated repo, but "jj init --git-repo" relies on that, and I think the existence of HEAD@git is harmless. It's merely a ref to the revision checked out somewhere else.
Also added status message to import_git_head() as I think it's an unusual event.
The "::HEAD" set is usually smaller than "::git_refs". If these sets were imported in that order, "HEAD..git_refs" commits would be indexed on top of the "::HEAD" commits. It's not a problem, but undesirable.
Since import_git_refs() may check out new working-copy commit, it shouldn't be triggered before the snapshot. Fixes jj-vcs#2876
This is the source of the problem I noticed when debugging jj-vcs#924 and jj-vcs#1608. I don't think this can be easily fixed, so let's document it.
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.
#2876
Checklist
If applicable:
CHANGELOG.md