opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.0'

Browse Source 
* stable-3.0:
  Upgrade JGit to 5.3.5.201909031855-r
  Convert NoteDb migrator output into chars
  Revert "Revert "GerritServer: Silence non-critical logs from JGit's FS""
  Upgrade JGit to 5.1.11.201909031202-r
  Revert "Revert "GerritServer: Silence non-critical logs from JGit's FileSnapshot""
  Revert "Revert "Stop using deprecated DirCacheEntry#setLastModified(long)""
  Upgrade JGit to 4.11.9.201909030838-r

Change-Id: I582e5fcb86e8b73dba6b31293de77746117b70b9
This commit is contained in:
David Pursehouse
2019-09-06 12:08:12 +09:00
parent 8b5ee579a6 e46d5ae7fd
commit 08ba366bc6
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/acceptance/GerritServer.java
View File

@@ -259,6 +259,8 @@ public class GerritServer implements AutoCloseable {
// Silence non-critical messages from JGit. // Silence non-critical messages from JGit.
.put("org.eclipse.jgit.transport.PacketLineIn", Level.WARN) .put("org.eclipse.jgit.transport.PacketLineIn", Level.WARN)
.put("org.eclipse.jgit.transport.PacketLineOut", Level.WARN) .put("org.eclipse.jgit.transport.PacketLineOut", Level.WARN)
.put("org.eclipse.jgit.internal.storage.file.FileSnapshot", Level.WARN)
.put("org.eclipse.jgit.util.FS", Level.WARN)
.build(); .build();
private static boolean forceLocalDisk() { private static boolean forceLocalDisk() {

3
java/com/google/gerrit/server/edit/tree/ChangeFileContentModification.java
View File

@@ -23,6 +23,7 @@ import com.google.common.io.ByteStreams;
import com.google.gerrit.extensions.restapi.RawInput; import com.google.gerrit.extensions.restapi.RawInput;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.time.Instant;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.eclipse.jgit.dircache.DirCacheEditor; import org.eclipse.jgit.dircache.DirCacheEditor;
@@ -79,7 +80,7 @@ public class ChangeFileContentModification implements TreeModification {
try { try {
if (dirCacheEntry.getFileMode() == FileMode.GITLINK) { if (dirCacheEntry.getFileMode() == FileMode.GITLINK) {
dirCacheEntry.setLength(0); dirCacheEntry.setLength(0);
dirCacheEntry.setLastModified(0); dirCacheEntry.setLastModified(Instant.EPOCH);
ObjectId newObjectId = ObjectId.fromString(getNewContentBytes(), 0); ObjectId newObjectId = ObjectId.fromString(getNewContentBytes(), 0);
dirCacheEntry.setObjectId(newObjectId); dirCacheEntry.setObjectId(newObjectId);
} else { } else {