From: Matthias Sohn <matthias.sohn@sap.com>
Date: Sat, 18 Aug 2018 11:55:24 +0000 (+0200)
Subject: Merge branch 'stable-4.11' into stable-5.0
X-Git-Tag: v5.1.0.201808281540-m3~29^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F127633%2F2;p=jgit.git

Merge branch 'stable-4.11' into stable-5.0

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

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

78d7d9916cb84142f0ca03fbeb3a176c4223255e
diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java
index c159a94705,82458c1acf..0e587ce827
--- 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,8 +43,8 @@@
  
  package org.eclipse.jgit.internal.storage.file;
  
 -import static java.nio.charset.StandardCharsets.UTF_8;
 +import static org.eclipse.jgit.lib.Constants.CHARSET;
  
- import java.io.BufferedReader;
  import java.io.File;
  import java.io.IOException;
  import java.nio.file.Files;