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

276: Merge style PRs should generate "merge" webrevs #501

Closed
wants to merge 3 commits into from
Closed
Changes from 1 commit
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
@@ -40,14 +40,7 @@ private ArchiveItem(ArchiveItem parent, String id, ZonedDateTime created, ZonedD

private static Optional<Commit> mergeCommit(Repository localRepo, Hash head) {
try {
var mergeCommit = localRepo.lookup(head);
if (mergeCommit.isEmpty()) {
return Optional.empty();
}
if (!mergeCommit.get().isMerge()) {
return Optional.empty();
}
return mergeCommit;
return localRepo.lookup(head).filter(Commit::isMerge);
} catch (IOException e) {
return Optional.empty();
}