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

vcs: only convert tags that are part of branch #988

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -186,10 +186,17 @@ private void convertTags(Repository hgRepo, ReadOnlyRepository gitRepo, Map<Hash
}
var missing = new TreeSet<>(gitTags);
missing.removeAll(hgTags);
var gitBranchHead = gitRepo.resolve(branch).orElseThrow(() ->
new IOException("Cannot resolve Git branch " + branch)
);
for (var name : missing) {
var gitHash = gitRepo.resolve(name).orElseThrow(() ->
new IOException("Cannot resolve known tag " + name)
);
if (!gitRepo.isAncestor(gitBranchHead, gitHash)) {
// The tag is referring to a commit on another branch
continue;
}
var hgHash = gitToHg.get(gitHash);
var annotated = gitRepo.annotate(new Tag(name));
if (annotated.isPresent()) {