From 1358cc75cfad86d1aa0a1a946bf1295b34b053a5 Mon Sep 17 00:00:00 2001
From: Youssef Elghareeb <ghareeb@google.com>
Date: Tue, 26 Jan 2021 14:24:48 +0100
Subject: [PATCH] Add GITLINK to the list of available file modes for the Git
 file diff

The GITLINK is a file mode indicating an entry is a submodule commit in
another repository. Adding it to the list of available git file modes.

Change-Id: I03c06d1d9c1196ef2817c506a6585914eed31c44
---
 .../server/patch/gitfilediff/GitFileDiff.java | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/java/com/google/gerrit/server/patch/gitfilediff/GitFileDiff.java b/java/com/google/gerrit/server/patch/gitfilediff/GitFileDiff.java
index 6d63243119..81c0e5d4f9 100644
--- a/java/com/google/gerrit/server/patch/gitfilediff/GitFileDiff.java
+++ b/java/com/google/gerrit/server/patch/gitfilediff/GitFileDiff.java
@@ -45,17 +45,14 @@ import org.eclipse.jgit.patch.FileHeader;
 @AutoValue
 public abstract class GitFileDiff {
   private static final Map<FileMode, Patch.FileMode> fileModeMap =
-      ImmutableMap.of(
-          FileMode.TREE,
-          Patch.FileMode.TREE,
-          FileMode.SYMLINK,
-          Patch.FileMode.SYMLINK,
-          FileMode.REGULAR_FILE,
-          Patch.FileMode.REGULAR_FILE,
-          FileMode.EXECUTABLE_FILE,
-          Patch.FileMode.EXECUTABLE_FILE,
-          FileMode.MISSING,
-          Patch.FileMode.MISSING);
+      ImmutableMap.<FileMode, Patch.FileMode>builder()
+          .put(FileMode.TREE, Patch.FileMode.TREE)
+          .put(FileMode.SYMLINK, Patch.FileMode.SYMLINK)
+          .put(FileMode.GITLINK, Patch.FileMode.GITLINK)
+          .put(FileMode.REGULAR_FILE, Patch.FileMode.REGULAR_FILE)
+          .put(FileMode.EXECUTABLE_FILE, Patch.FileMode.EXECUTABLE_FILE)
+          .put(FileMode.MISSING, Patch.FileMode.MISSING)
+          .build();
 
   private static Patch.FileMode mapFileMode(FileMode jgitFileMode) {
     if (!fileModeMap.containsKey(jgitFileMode)) {