commit 15d5f1e920b6500b2a015169fcc91cc346de9939
author Edwin Kempin <ekempin@google.com> Tue Oct 03 10:32:51 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 03 10:32:51 2017 +0000
tree b3684ebd87f6f4ad49f6f9c103bb98df8b299a72
parent 2da0d111586503de11b5cd13dded88dae6770d12
parent 0f58891771400fe1d9e97a8025208b3d38e3e689

Merge "Fix diff base gitweb link" into stable-2.14

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

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
index 5daf69a..df583fd 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
@@ -202,12 +202,7 @@
       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()