From: Matthias Sohn <matthias.sohn@sap.com>
Date: Sat, 18 Aug 2018 11:47:51 +0000 (+0200)
Subject: Merge branch 'stable-4.8' into stable-4.9
X-Git-Tag: v5.1.0.201808281540-m3~29^2^2^2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ce84d0dfc64f6171aef677fa979b8ba2b21213ab;p=jgit.git

Merge branch 'stable-4.8' into stable-4.9

* stable-4.8:
  Fix GC run in foreground to not use executor

Change-Id: Id9d864a8e727fefa35ca87eccb4e3801eb689c3c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---

ce84d0dfc64f6171aef677fa979b8ba2b21213ab
diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java
index 994a4325a8,35049d4063..e5fc0c5bad
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java
@@@ -43,9 -43,13 +43,8 @@@
  
  package org.eclipse.jgit.internal.storage.file;
  
 -import org.eclipse.jgit.api.errors.JGitInternalException;
 -import org.eclipse.jgit.lib.ConfigConstants;
 -import org.eclipse.jgit.util.GitDateParser;
 -import org.eclipse.jgit.util.SystemReader;
 -
  import static java.nio.charset.StandardCharsets.UTF_8;
  
- import java.io.BufferedReader;
  import java.io.File;
  import java.io.IOException;
  import java.nio.file.Files;
@@@ -54,13 -58,6 +53,11 @@@ import java.nio.file.attribute.FileTime
  import java.text.ParseException;
  import java.time.Instant;
  
 +import org.eclipse.jgit.api.errors.JGitInternalException;
- import org.eclipse.jgit.internal.JGitText;
 +import org.eclipse.jgit.lib.ConfigConstants;
 +import org.eclipse.jgit.util.GitDateParser;
 +import org.eclipse.jgit.util.SystemReader;
 +
  /**
   * This class manages the gc.log file for a {@link FileRepository}.
   */