From 0f58891771400fe1d9e97a8025208b3d38e3e689 Mon Sep 17 00:00:00 2001 From: Hector Oswaldo Caballero Date: Mon, 2 Oct 2017 10:25:11 -0400 Subject: [PATCH] Fix diff base gitweb link After I8508dcaf, gitweb link to the base commit in the diff page was broken because gitweb does not understand the ^1 syntax. Use the base commit SHA-1 instead which is also understood by gitiles. Bug: Issue 7098 Change-Id: I4794aed4921a97596fc0a46eb07fed4a0fb8920e --- .../main/java/com/google/gerrit/server/change/GetDiff.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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 5daf69aa1c..df583fd4b2 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 @@ public class GetDiff implements RestReadView { 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()