diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java')
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java index 60a4daf263..6ccd460055 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java @@ -48,9 +48,14 @@ public class FileInfoJson { Map<String, FileInfo> toFileInfoMap(Change change, RevId revision, @Nullable PatchSet base) throws PatchListNotAvailableException { + ObjectId objectId = ObjectId.fromString(revision.get()); + return toFileInfoMap(change, objectId, base); + } + + Map<String, FileInfo> toFileInfoMap(Change change, ObjectId objectId, @Nullable PatchSet base) + throws PatchListNotAvailableException { ObjectId a = (base == null) ? null : ObjectId.fromString(base.getRevision().get()); - ObjectId b = ObjectId.fromString(revision.get()); - return toFileInfoMap(change, new PatchListKey(a, b, Whitespace.IGNORE_NONE)); + return toFileInfoMap(change, PatchListKey.againstCommit(a, objectId, Whitespace.IGNORE_NONE)); } Map<String, FileInfo> toFileInfoMap(Change change, RevId revision, int parent) |