opendev/gerrit
Code Issues Proposed changes

Merge "Fix ArrayIndexOutOfBoundsException on initial commits" into stable-2.8

Browse Source
This commit is contained in:
Shawn Pearce
2013-12-10 03:12:28 +00:00
committed by Gerrit Code Review
parent a3728d57cd eadec0d893
commit 0364027803
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
View File

@@ -370,8 +370,7 @@ public class PatchSetInserter {
public static ChangeKind getChangeKind(MergeUtil.Factory mergeUtilFactory, ProjectState project, public static ChangeKind getChangeKind(MergeUtil.Factory mergeUtilFactory, ProjectState project,
Repository git, RevCommit prior, RevCommit next) { Repository git, RevCommit prior, RevCommit next) {
if (!next.getFullMessage().equals(prior.getFullMessage())) { if (!next.getFullMessage().equals(prior.getFullMessage())) {
if (next.getTree() == prior.getTree() if (next.getTree() == prior.getTree() && isSameParents(prior, next)) {
&& prior.getParent(0).equals(next.getParent(0))) {
return ChangeKind.NO_CODE_CHANGE; return ChangeKind.NO_CODE_CHANGE;
} else { } else {
return ChangeKind.REWORK; return ChangeKind.REWORK;
@@ -384,7 +383,7 @@ public class PatchSetInserter {
} }
if (next.getTree() == prior.getTree() && if (next.getTree() == prior.getTree() &&
prior.getParent(0).equals(next.getParent(0))) { isSameParents(prior, next)) {
return ChangeKind.TRIVIAL_REBASE; return ChangeKind.TRIVIAL_REBASE;
} }
@@ -409,6 +408,15 @@ public class PatchSetInserter {
} }
} }
private static boolean isSameParents(RevCommit prior, RevCommit next) {
if (prior.getParentCount() != next.getParentCount()) {
return false;
} else if (prior.getParentCount() == 0) {
return true;
}
return prior.getParent(0).equals(next.getParent(0));
}
public class ChangeModifiedException extends InvalidChangeOperationException { public class ChangeModifiedException extends InvalidChangeOperationException {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;