opendev/gerrit
Code Issues Proposed changes

MergeOp: Fix null dereference when HEAD is missing

Browse Source 
Coverity-CID: 101336
Change-Id: I80fda522625f66af0a2a21b7a5b8f48903c1c6dd
This commit is contained in:
Dave Borowitz
2015-09-03 10:56:30 -04:00
parent dd81b6a400
commit 83d2232f16
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@@ -501,7 +501,7 @@ public class MergeOp {
if (branchUpdate.getOldObjectId() != null) { if (branchUpdate.getOldObjectId() != null) {
branchTip = branchTip =
(CodeReviewCommit) rw.parseCommit(branchUpdate.getOldObjectId()); (CodeReviewCommit) rw.parseCommit(branchUpdate.getOldObjectId());
} else if (repo.getFullBranch().equals(destBranch.get())) { } else if (Objects.equals(repo.getFullBranch(), destBranch.get())) {
branchTip = null; branchTip = null;
branchUpdate.setExpectedOldObjectId(ObjectId.zeroId()); branchUpdate.setExpectedOldObjectId(ObjectId.zeroId());
} else { } else {