opendev/gerrit
Code Issues Proposed changes

Merge "Merge branch 'stable-2.14' into stable-2.15" into stable-2.15

Browse Source
This commit is contained in:
David Pursehouse
2017-10-03 11:06:52 +00:00
committed by Gerrit Code Review
parent 2fe53f886f 29353191a9
commit 8df3ecbfba
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
View File

@@ -191,12 +191,7 @@ public class GetDiff implements RestReadView<FileResource> {
ProjectState state = projectCache.get(resource.getRevision().getChange().getProject());
DiffInfo result = new DiffInfo();
// TODO referring to the parent commit by refs/changes/12/60012/1^1
// will likely not work for inline edits
String revA =
basePatchSet != null
? basePatchSet.getRefName()
: resource.getRevision().getPatchSet().getRefName() + "^1";
String revA = basePatchSet != null ? basePatchSet.getRefName() : content.commitIdA;
String revB =
resource.getRevision().getEdit().isPresent()
? resource.getRevision().getEdit().get().getRefName()