Merge branch 'stable-5.5' * stable-5.5: WorkingTreeIterator: handle different timestamp resolutions Change-Id: I61df7392d8826ab526c39da2a8718723a1cc602a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

commit: 7be05205ddfacc8a6d7445604629a4a4f6a3f90b [log] [tgz]
author: Matthias Sohn <matthias.sohn@sap.com> Tue Sep 17 00:42:26 2019 +0200
committer: Matthias Sohn <matthias.sohn@sap.com> Tue Sep 17 00:42:32 2019 +0200
tree: 39e46274943b3f315c48563dff4e58226f49625d
parent: 687044beb0e2a85c145147af229a7baaac57b748 [diff]
parent: 37c8b353441e3883594c0ea6820b4c3fbc711321 [diff]
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index 55f2274..bfa7861 100644
--- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF

@@ -5,13 +5,13 @@
 Automatic-Module-Name: org.eclipse.jgit.ant.test
 Bundle-SymbolicName: org.eclipse.jgit.ant.test
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.ant.tasks;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)",
+ org.eclipse.jgit.ant.tasks;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
  org.junit;version="[4.12,5.0.0)"

diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml
index b2641b0..6935af8 100644
--- a/org.eclipse.jgit.ant.test/pom.xml
+++ b/org.eclipse.jgit.ant.test/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ant.test</artifactId>

diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
index 660f88b..fbce458 100644
--- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF

@@ -3,13 +3,13 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ant
 Bundle-SymbolicName: org.eclipse.jgit.ant
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.tools.ant,
-  org.eclipse.jgit.storage.file;version="[5.5.1,5.6.0)"
+  org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)"
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.ant;version="5.5.1",
- org.eclipse.jgit.ant.tasks;version="5.5.1";
+Export-Package: org.eclipse.jgit.ant;version="5.6.0",
+ org.eclipse.jgit.ant.tasks;version="5.6.0";
   uses:="org.apache.tools.ant,
    org.apache.tools.ant.types"

diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF
index 40ed887..80c658e 100644
--- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF

@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.ant - Sources
 Bundle-SymbolicName: org.eclipse.jgit.ant.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.5.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.5.1.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.6.0.qualifier";roots="."

diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml
index 7ab0d08..8d9b1e3 100644
--- a/org.eclipse.jgit.ant/pom.xml
+++ b/org.eclipse.jgit.ant/pom.xml

@@ -48,7 +48,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ant</artifactId>

diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index d83669c..956d243 100644
--- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.archive
 Bundle-SymbolicName: org.eclipse.jgit.archive
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -13,17 +13,17 @@
  org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)",
  org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)",
  org.apache.commons.compress.compressors.xz;version="[1.4,2.0)",
- org.eclipse.jgit.api;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)",
+ org.eclipse.jgit.api;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.jgit.archive.FormatActivator
-Export-Package: org.eclipse.jgit.archive;version="5.5.1";
+Export-Package: org.eclipse.jgit.archive;version="5.6.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.api,
    org.apache.commons.compress.archivers,
    org.osgi.framework",
- org.eclipse.jgit.archive.internal;version="5.5.1";x-internal:=true
+ org.eclipse.jgit.archive.internal;version="5.6.0";x-internal:=true

diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
index 6a61183..c0b9670 100644
--- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF

@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.archive - Sources
 Bundle-SymbolicName: org.eclipse.jgit.archive.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.5.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.5.1.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.6.0.qualifier";roots="."

diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml
index 7b53260..65a1f52 100644
--- a/org.eclipse.jgit.archive/pom.xml
+++ b/org.eclipse.jgit.archive/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.archive</artifactId>

diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml
index d512c11..9dfb251 100644
--- a/org.eclipse.jgit.coverage/pom.xml
+++ b/org.eclipse.jgit.coverage/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -18,88 +18,88 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ant</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.archive</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.http.apache</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.http.server</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.lfs</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.lfs.server</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.pgm</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ui</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ssh.apache</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.test</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ant.test</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.http.test</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.pgm.test</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.lfs.test</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index cfb5b23..ff97910 100644
--- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.http.apache
 Bundle-SymbolicName: org.eclipse.jgit.http.apache
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
@@ -23,11 +23,11 @@
  org.apache.http.impl.client;version="[4.3.0,5.0.0)",
  org.apache.http.impl.conn;version="[4.3.0,5.0.0)",
  org.apache.http.params;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.http;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)"
-Export-Package: org.eclipse.jgit.transport.http.apache;version="5.5.1";
+ org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)"
+Export-Package: org.eclipse.jgit.transport.http.apache;version="5.6.0";
   uses:="org.apache.http.client,
    org.eclipse.jgit.transport.http,
    org.apache.http.entity,

diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF
index 4c14dda..8950164 100644
--- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF

@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.http.apache - Sources
 Bundle-SymbolicName: org.eclipse.jgit.http.apache.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.5.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.5.1.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.6.0.qualifier";roots="."

diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml
index 40cf7b4..4be8a98 100644
--- a/org.eclipse.jgit.http.apache/pom.xml
+++ b/org.eclipse.jgit.http.apache/pom.xml

@@ -48,7 +48,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.http.apache</artifactId>

diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index 3f07847..d4ce149 100644
--- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF

@@ -3,13 +3,13 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.http.server
 Bundle-SymbolicName: org.eclipse.jgit.http.server
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.http.server;version="5.5.1",
- org.eclipse.jgit.http.server.glue;version="5.5.1";
+Export-Package: org.eclipse.jgit.http.server;version="5.6.0",
+ org.eclipse.jgit.http.server.glue;version="5.6.0";
   uses:="javax.servlet,javax.servlet.http",
- org.eclipse.jgit.http.server.resolver;version="5.5.1";
+ org.eclipse.jgit.http.server.resolver;version="5.6.0";
   uses:="org.eclipse.jgit.transport.resolver,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.transport,
@@ -18,13 +18,13 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
  javax.servlet.http;version="[2.5.0,3.2.0)",
- org.eclipse.jgit.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.transport.parser;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.resolver;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)"
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)"

diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF
index 7fdc47e..e051fd8 100644
--- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF

@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.http.server - Sources
 Bundle-SymbolicName: org.eclipse.jgit.http.server.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.5.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.5.1.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.6.0.qualifier";roots="."

diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index 69249be..97d90d0 100644
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml

@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.http.server</artifactId>

diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 8eaa178..97f1105 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.http.test
 Bundle-SymbolicName: org.eclipse.jgit.http.test
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -28,25 +28,25 @@
  org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.http.server;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.http.server.glue;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.http.server.resolver;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.junit.http;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.http;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.resolver;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.http.server;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.http.server.glue;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.http.server.resolver;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
  org.hamcrest;version="[1.1.0,2.0.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
  org.junit;version="[4.12,5.0.0)",

diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml
index 824ea12..e055c58 100644
--- a/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml

@@ -51,7 +51,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.http.test</artifactId>

diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index df745c7..5806277 100644
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit.http
 Bundle-SymbolicName: org.eclipse.jgit.junit.http
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
@@ -22,16 +22,16 @@
  org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.ssl;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.http.server;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.resolver;version="[5.5.1,5.6.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.http.server;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)",
  org.junit;version="[4.12,5.0.0)"
-Export-Package: org.eclipse.jgit.junit.http;version="5.5.1";
+Export-Package: org.eclipse.jgit.junit.http;version="5.6.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.junit,
    javax.servlet.http,

diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF
index bd8787e..b454cd0 100644
--- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF

@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.junit.http - Sources
 Bundle-SymbolicName: org.eclipse.jgit.junit.http.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.5.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.5.1.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.6.0.qualifier";roots="."

diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index 5b271ac..c69f194 100644
--- a/org.eclipse.jgit.junit.http/pom.xml
+++ b/org.eclipse.jgit.junit.http/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.junit.http</artifactId>

diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
index 547d744..7ece760 100644
--- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit.ssh
 Bundle-SymbolicName: org.eclipse.jgit.junit.ssh
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
@@ -30,8 +30,8 @@
  org.apache.sshd.server.shell;version="[2.2.0,2.3.0)",
  org.apache.sshd.server.subsystem;version="[2.2.0,2.3.0)",
  org.apache.sshd.server.subsystem.sftp;version="[2.2.0,2.3.0)",
- org.eclipse.jgit.annotations;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.1,5.6.0)",
+ org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit.ssh;version="5.5.1"
+Export-Package: org.eclipse.jgit.junit.ssh;version="5.6.0"

diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF
index 1e18b4f..2438c00 100644
--- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF

@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources
 Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.5.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.5.1.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.6.0.qualifier";roots="."

diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml
index d50c78f..d4591d7 100644
--- a/org.eclipse.jgit.junit.ssh/pom.xml
+++ b/org.eclipse.jgit.junit.ssh/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.junit.ssh</artifactId>

diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index 24f9018..aedfaa9 100644
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF

@@ -3,35 +3,35 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit
 Bundle-SymbolicName: org.eclipse.jgit.junit
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.annotations;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.api;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.api.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.dircache;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.merge;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport;version="5.5.1",
- org.eclipse.jgit.treewalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util.io;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util.time;version="[5.5.1,5.6.0)",
+Import-Package: org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.dircache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.merge;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="5.6.0",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.time;version="[5.6.0,5.7.0)",
  org.junit;version="[4.12,5.0.0)",
  org.junit.rules;version="[4.12,5.0.0)",
  org.junit.runner;version="[4.12,5.0.0)",
  org.junit.runners;version="[4.12,5.0.0)",
  org.junit.runners.model;version="[4.12,5.0.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit;version="5.5.1";
+Export-Package: org.eclipse.jgit.junit;version="5.6.0";
   uses:="org.eclipse.jgit.dircache,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
@@ -44,4 +44,4 @@
    org.junit.runners.model,
    org.junit.runner,
    org.eclipse.jgit.util.time",
- org.eclipse.jgit.junit.time;version="5.5.1";uses:="org.eclipse.jgit.util.time"
+ org.eclipse.jgit.junit.time;version="5.6.0";uses:="org.eclipse.jgit.util.time"

diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF
index ac8d1e4..d9a24d8 100644
--- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF

@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.junit - Sources
 Bundle-SymbolicName: org.eclipse.jgit.junit.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.5.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.5.1.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.6.0.qualifier";roots="."

diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index 5f8ce34..af0a7f1 100644
--- a/org.eclipse.jgit.junit/pom.xml
+++ b/org.eclipse.jgit.junit/pom.xml

@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.junit</artifactId>

diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
index ad38614..4279a4a 100644
--- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs.server.test
 Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -28,24 +28,24 @@
  org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.api;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.api.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.junit.http;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.server;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.server.fs;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.test;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.treewalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)",
+ org.eclipse.jgit.api;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.server;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.test;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
  org.junit;version="[4.12,5.0.0)",
  org.junit.rules;version="[4.12,5.0.0)",

diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml
index 3ad27a8..6fb9b78 100644
--- a/org.eclipse.jgit.lfs.server.test/pom.xml
+++ b/org.eclipse.jgit.lfs.server.test/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.lfs.server.test</artifactId>

diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
index ecaa638..fb0ee06 100644
--- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF

@@ -3,19 +3,19 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs.server
 Bundle-SymbolicName: org.eclipse.jgit.lfs.server
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs.server;version="5.5.1";
+Export-Package: org.eclipse.jgit.lfs.server;version="5.6.0";
   uses:="javax.servlet.http,
    org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.fs;version="5.5.1";
+ org.eclipse.jgit.lfs.server.fs;version="5.6.0";
   uses:="javax.servlet,
    javax.servlet.http,
    org.eclipse.jgit.lfs.server,
    org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.internal;version="5.5.1";x-internal:=true,
- org.eclipse.jgit.lfs.server.s3;version="5.5.1";
+ org.eclipse.jgit.lfs.server.internal;version="5.6.0";x-internal:=true,
+ org.eclipse.jgit.lfs.server.s3;version="5.6.0";
   uses:="org.eclipse.jgit.lfs.server,
    org.eclipse.jgit.lfs.lib"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -25,15 +25,15 @@
  javax.servlet.http;version="[3.1.0,4.0.0)",
  org.apache.http;version="[4.3.0,5.0.0)",
  org.apache.http.client;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.internal;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.http;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)",
+ org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
  org.slf4j;version="[1.7.0,2.0.0)"

diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF
index 38b5f21..6f1c3a4 100644
--- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF

@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.lfs.server - Sources
 Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.5.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.5.1.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.6.0.qualifier";roots="."

diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml
index 1e42c44..b95806b 100644
--- a/org.eclipse.jgit.lfs.server/pom.xml
+++ b/org.eclipse.jgit.lfs.server/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.lfs.server</artifactId>

diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
index c3dbc91..549a0ff 100644
--- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF

@@ -3,22 +3,22 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs.test
 Bundle-SymbolicName: org.eclipse.jgit.lfs.test
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.treewalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)",
+Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
  org.junit;version="[4.12,5.0.0)",
  org.junit.runner;version="[4.12,5.0.0)",
  org.junit.runners;version="[4.12,5.0.0)"
-Export-Package: org.eclipse.jgit.lfs.test;version="5.5.1";x-friends:="org.eclipse.jgit.lfs.server.test"
+Export-Package: org.eclipse.jgit.lfs.test;version="5.6.0";x-friends:="org.eclipse.jgit.lfs.server.test"

diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml
index a9a0309..d1691c3 100644
--- a/org.eclipse.jgit.lfs.test/pom.xml
+++ b/org.eclipse.jgit.lfs.test/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.lfs.test</artifactId>

diff --git a/org.eclipse.jgit.lfs/.settings/.api_filters b/org.eclipse.jgit.lfs/.settings/.api_filters
deleted file mode 100644
index 9747df8..0000000
--- a/org.eclipse.jgit.lfs/.settings/.api_filters
+++ /dev/null

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.jgit.lfs" version="2">
-    <resource path="src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java" type="org.eclipse.jgit.lfs.lib.AnyLongObjectId">
-        <filter id="1141899266">
-            <message_arguments>
-                <message_argument value="5.4"/>
-                <message_argument value="5.5"/>
-                <message_argument value="isEqual(AnyLongObjectId, AnyLongObjectId)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>

diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
index 22b8966..1fd1957 100644
--- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF

@@ -3,33 +3,33 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs
 Bundle-SymbolicName: org.eclipse.jgit.lfs
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs;version="5.5.1",
- org.eclipse.jgit.lfs.errors;version="5.5.1",
- org.eclipse.jgit.lfs.internal;version="5.5.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server",
- org.eclipse.jgit.lfs.lib;version="5.5.1"
+Export-Package: org.eclipse.jgit.lfs;version="5.6.0",
+ org.eclipse.jgit.lfs.errors;version="5.6.0",
+ org.eclipse.jgit.lfs.internal;version="5.6.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server",
+ org.eclipse.jgit.lfs.lib;version="5.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.gson;version="[2.8.2,3.0.0)",
  com.google.gson.stream;version="[2.8.2,3.0.0)",
  org.apache.http.impl.client;version="[4.2.6,5.0.0)",
  org.apache.http.impl.conn;version="[4.2.6,5.0.0)",
- org.eclipse.jgit.annotations;version="[5.5.1,5.6.0)";resolution:=optional,
- org.eclipse.jgit.api.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.attributes;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.diff;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.hooks;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.storage.pack;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.http;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.treewalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util.io;version="[5.5.1,5.6.0)"
+ org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)";resolution:=optional,
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.attributes;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.diff;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.hooks;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.pack;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)"

diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
index 16561d1..382d156 100644
--- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF

@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.lfs - Sources
 Bundle-SymbolicName: org.eclipse.jgit.lfs.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.5.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.5.1.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.6.0.qualifier";roots="."

diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml
index a69721b..f1df7a0 100644
--- a/org.eclipse.jgit.lfs/pom.xml
+++ b/org.eclipse.jgit.lfs/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.lfs</artifactId>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
index 9d7bd64..fb36ac0 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit"
       label="%featureName"
-      version="5.5.1.qualifier"
+      version="5.6.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
index 7916119..0cbe270 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
index 5855727..de604cd 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.http.apache"
       label="%featureName"
-      version="5.5.1.qualifier"
+      version="5.6.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.jgit" version="5.5.1" match="equivalent"/>
+      <import plugin="org.eclipse.jgit" version="5.6.0" match="equivalent"/>
    </requires>
 
    <plugin

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
index b9abfaf..81e69d2 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
index 06b154a..4604b4f 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.junit"
       label="%featureName"
-      version="5.5.1.qualifier"
+      version="5.6.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -24,7 +24,7 @@
 
    <requires>
       <import plugin="com.jcraft.jsch"/>
-      <import plugin="org.eclipse.jgit" version="5.5.1" match="equivalent"/>
+      <import plugin="org.eclipse.jgit" version="5.6.0" match="equivalent"/>
    </requires>
 
    <plugin

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
index cb39fd9..5d07fa4 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
index 0ad330d..1b2897d 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.lfs"
       label="%featureName"
-      version="5.5.1.qualifier"
+      version="5.6.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="5.5.1" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="5.6.0" match="equivalent"/>
    </requires>
 
    <plugin

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
index 17c6d54..0a82897 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
index 35d92b4..dd662c9 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.pgm"
       label="%featureName"
-      version="5.5.1.qualifier"
+      version="5.6.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -35,9 +35,9 @@
          version="0.0.0"/>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="5.5.1" match="equivalent"/>
-      <import feature="org.eclipse.jgit.lfs" version="5.5.1" match="equivalent"/>
-      <import feature="org.eclipse.jgit.ssh.apache" version="5.5.1" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="5.6.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit.lfs" version="5.6.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit.ssh.apache" version="5.6.0" match="equivalent"/>
    </requires>
 
    <plugin

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
index 8607e74..504c1a8 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
index 48013f0..8f21d1d 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.repository</artifactId>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
index 3b9c3e6..d4828e4 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.source"
       label="%featureName"
-      version="5.5.1.qualifier"
+      version="5.6.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="5.5.1" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="5.6.0" match="equivalent"/>
    </requires>
 
    <plugin

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
index 8782dfc..933cc8f 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>org.eclipse.jgit.feature</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>5.6.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
index 0795455..2582a77 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.ssh.apache"
       label="%featureName"
-      version="5.5.1.qualifier"
+      version="5.6.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="5.5.1" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="5.6.0" match="equivalent"/>
    </requires>
 
    <plugin

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml
index 99472af..6fa69ea 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
index 56d441c..068c15d 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF

@@ -2,4 +2,4 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: JGit Target Platform Bundle
 Bundle-SymbolicName: org.eclipse.jgit.target
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
index 70e759a..e8d9df0 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml

@@ -49,7 +49,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.target</artifactId>

diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index 1fee3d6..68295a0 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml

@@ -49,7 +49,7 @@
 
   <groupId>org.eclipse.jgit</groupId>
   <artifactId>jgit.tycho.parent</artifactId>
-  <version>5.5.1-SNAPSHOT</version>
+  <version>5.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>JGit Tycho Parent</name>

diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
index c6b0617..fc36051 100644
--- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF

@@ -3,28 +3,28 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.pgm.test
 Bundle-SymbolicName: org.eclipse.jgit.pgm.test
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.api;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.api.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.diff;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.dircache;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="5.5.1",
- org.eclipse.jgit.junit;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.merge;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.pgm;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.pgm.internal;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.pgm.opt;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.treewalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util.io;version="[5.5.1,5.6.0)",
+Import-Package: org.eclipse.jgit.api;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.diff;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.dircache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="5.6.0",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.merge;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.pgm;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.pgm.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.pgm.opt;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.junit;version="[4.12,5.0.0)",
  org.junit.rules;version="[4.12,5.0.0)",

diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml
index 6907b37..1ba893c 100644
--- a/org.eclipse.jgit.pgm.test/pom.xml
+++ b/org.eclipse.jgit.pgm.test/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.pgm.test</artifactId>

diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index d79d85d..48dc730 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.pgm
 Bundle-SymbolicName: org.eclipse.jgit.pgm
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
@@ -28,50 +28,50 @@
  org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.api;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.api.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.archive;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.awtui;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.blame;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.diff;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.dircache;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.gitrepo;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.ketch;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.io;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.reftree;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.server;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.server.fs;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs.server.s3;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.merge;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.notes;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revplot;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.storage.pack;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.resolver;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.sshd;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.treewalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util.io;version="[5.5.1,5.6.0)",
+ org.eclipse.jgit.api;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.archive;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.awtui;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.blame;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.diff;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.dircache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.gitrepo;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.ketch;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.io;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.reftree;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.server;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.server.s3;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.merge;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.notes;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revplot;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.pack;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)",
  org.kohsuke.args4j;version="[2.33.0,3.0.0)",
  org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)"
-Export-Package: org.eclipse.jgit.console;version="5.5.1";
+Export-Package: org.eclipse.jgit.console;version="5.6.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.util",
- org.eclipse.jgit.pgm;version="5.5.1";
+ org.eclipse.jgit.pgm;version="5.6.0";
   uses:="org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.pgm.opt,
@@ -82,11 +82,11 @@
    org.eclipse.jgit.treewalk,
    javax.swing,
    org.eclipse.jgit.transport",
- org.eclipse.jgit.pgm.debug;version="5.5.1";
+ org.eclipse.jgit.pgm.debug;version="5.6.0";
   uses:="org.eclipse.jgit.util.io,
    org.eclipse.jgit.pgm",
- org.eclipse.jgit.pgm.internal;version="5.5.1";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
- org.eclipse.jgit.pgm.opt;version="5.5.1";
+ org.eclipse.jgit.pgm.internal;version="5.6.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
+ org.eclipse.jgit.pgm.opt;version="5.6.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.kohsuke.args4j.spi,

diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
index 74cb9fb..70aa500 100644
--- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF

@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.pgm - Sources
 Bundle-SymbolicName: org.eclipse.jgit.pgm.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.5.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.5.1.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.6.0.qualifier";roots="."

diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index 6e933c2..003076f 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.pgm</artifactId>

diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
index cac64e5..4bae3d9 100644
--- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test
 Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -15,15 +15,15 @@
  org.apache.sshd.common.session;version="[2.2.0,2.3.0)",
  org.apache.sshd.common.util.net;version="[2.2.0,2.3.0)",
  org.apache.sshd.common.util.security;version="[2.2.0,2.3.0)",
- org.eclipse.jgit.api.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.junit.ssh;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.ssh;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.sshd;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)",
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit.ssh;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.ssh;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
  org.junit;version="[4.12,5.0.0)",
  org.junit.experimental.theories;version="[4.12,5.0.0)",
  org.junit.runner;version="[4.12,5.0.0)"

diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml
index 21a69c6..838fd83 100644
--- a/org.eclipse.jgit.ssh.apache.test/pom.xml
+++ b/org.eclipse.jgit.ssh.apache.test/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>

diff --git a/org.eclipse.jgit.ssh.apache/.settings/.api_filters b/org.eclipse.jgit.ssh.apache/.settings/.api_filters
new file mode 100644
index 0000000..a0e4695
--- /dev/null
+++ b/org.eclipse.jgit.ssh.apache/.settings/.api_filters

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.jgit.ssh.apache" version="2">
+    <resource path="src/org/eclipse/jgit/transport/sshd/ServerKeyDatabase.java" type="org.eclipse.jgit.transport.sshd.ServerKeyDatabase">
+        <filter id="1108344834">
+            <message_arguments>
+                <message_argument value="5.5"/>
+                <message_argument value="5.6"/>
+                <message_argument value="org.eclipse.jgit.transport.sshd.ServerKeyDatabase"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/jgit/transport/sshd/SshdSessionFactory.java" type="org.eclipse.jgit.transport.sshd.SshdSessionFactory">
+        <filter id="1141899266">
+            <message_arguments>
+                <message_argument value="5.5"/>
+                <message_argument value="5.6"/>
+                <message_argument value="getServerKeyDatabase(File, File)"/>
+            </message_arguments>
+        </filter>
+        <filter id="1141899266">
+            <message_arguments>
+                <message_argument value="5.5"/>
+                <message_argument value="5.6"/>
+                <message_argument value="getSshConfig(File)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>

diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index f45c342..209a10f 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF

@@ -6,9 +6,9 @@
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.5.1";x-internal:=true;
+Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.6.0";x-internal:=true;
   uses:="org.apache.sshd.client,
    org.apache.sshd.client.auth,
    org.apache.sshd.client.auth.keyboard,
@@ -23,9 +23,9 @@
    org.apache.sshd.common.signature,
    org.apache.sshd.common.util.buffer,
    org.eclipse.jgit.transport",
- org.eclipse.jgit.internal.transport.sshd.auth;version="5.5.1";x-internal:=true,
- org.eclipse.jgit.internal.transport.sshd.proxy;version="5.5.1";x-friends:="org.eclipse.jgit.ssh.apache.test",
- org.eclipse.jgit.transport.sshd;version="5.5.1";
+ org.eclipse.jgit.internal.transport.sshd.auth;version="5.6.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="5.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test",
+ org.eclipse.jgit.transport.sshd;version="5.6.0";
   uses:="org.eclipse.jgit.transport,
    org.apache.sshd.client.config.hosts,
    org.apache.sshd.common.keyprovider,
@@ -75,12 +75,12 @@
  org.apache.sshd.common.util.net;version="[2.2.0,2.3.0)",
  org.apache.sshd.common.util.security;version="[2.2.0,2.3.0)",
  org.apache.sshd.server.auth;version="[2.2.0,2.3.0)",
- org.eclipse.jgit.annotations;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.fnmatch;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)",
+ org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.fnmatch;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
  org.slf4j;version="[1.7.0,2.0.0)"

diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF
index e7deb5f..c1d8d9a 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF

@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources
 Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.5.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.5.1.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.6.0.qualifier";roots="."

diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml
index 2b7f4d1..26e44b0 100644
--- a/org.eclipse.jgit.ssh.apache/pom.xml
+++ b/org.eclipse.jgit.ssh.apache/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ssh.apache</artifactId>

diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 64e9247..8d240d3 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.test
 Bundle-SymbolicName: org.eclipse.jgit.test
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
@@ -18,57 +18,57 @@
  org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)",
  org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)",
  org.bouncycastle.util.encoders;version="[1.61.0,2.0.0)",
- org.eclipse.jgit.annotations;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.api;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.api.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.archive;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.attributes;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.awtui;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.blame;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.diff;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.dircache;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.events;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.fnmatch;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.gitrepo;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.hooks;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.ignore;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.ignore.internal;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.fsck;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.io;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.storage.reftree;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.transport.http;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.internal.transport.parser;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.junit.ssh;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.junit.time;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lfs;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.merge;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.notes;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.patch;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.pgm;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.pgm.internal;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revplot;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.storage.pack;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.submodule;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.http;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport.resolver;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.treewalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util.io;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util.sha1;version="[5.5.1,5.6.0)",
+ org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.archive;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.attributes;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.awtui;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.blame;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.diff;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.dircache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.events;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.fnmatch;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.gitrepo;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.hooks;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.ignore;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.ignore.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.fsck;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.io;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.reftree;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.transport.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit.ssh;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit.time;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.merge;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.notes;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.patch;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.pgm;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.pgm.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revplot;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.pack;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.submodule;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.sha1;version="[5.6.0,5.7.0)",
  org.junit;version="[4.12,5.0.0)",
  org.junit.experimental.theories;version="[4.12,5.0.0)",
  org.junit.rules;version="[4.12,5.0.0)",
@@ -83,4 +83,4 @@
  org.tukaani.xz;version="[1.6.0,2.0)"
 Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.library;bundle-version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.jgit.transport.ssh;version="5.5.1";x-friends:="org.eclipse.jgit.ssh.apache.test"
+Export-Package: org.eclipse.jgit.transport.ssh;version="5.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test"

diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml
index 8a361a8..d8af7dc 100644
--- a/org.eclipse.jgit.test/pom.xml
+++ b/org.eclipse.jgit.test/pom.xml

@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.test</artifactId>

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java
index 0e33fa6..a45548d 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java

@@ -66,6 +66,8 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
 
 import org.eclipse.jgit.internal.JGitText;
 import org.eclipse.jgit.internal.storage.io.BlockSource;
@@ -76,6 +78,7 @@
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.ReflogEntry;
 import org.eclipse.jgit.lib.SymbolicRef;
+import org.hamcrest.Matchers;
 import org.junit.Test;
 
 public class ReftableTest {
@@ -523,6 +526,85 @@ public void withReflog() throws IOException {
 	}
 
 	@Test
+	public void reflogReader() throws IOException {
+		Ref master = ref(MASTER, 1);
+		Ref next = ref(NEXT, 2);
+
+		ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+		ReftableWriter writer = new ReftableWriter().setMinUpdateIndex(1)
+				.setMaxUpdateIndex(1).begin(buffer);
+
+		writer.writeRef(master);
+		writer.writeRef(next);
+
+		PersonIdent who1 = new PersonIdent("Log", "Ger", 1500079709, -8 * 60);
+		writer.writeLog(MASTER, 3, who1, ObjectId.zeroId(), id(1), "1");
+		PersonIdent who2 = new PersonIdent("Log", "Ger", 1500079710, -8 * 60);
+		writer.writeLog(MASTER, 2, who2, id(1), id(2), "2");
+		PersonIdent who3 = new PersonIdent("Log", "Ger", 1500079711, -8 * 60);
+		writer.writeLog(MASTER, 1, who3, id(2), id(3), "3");
+
+		writer.finish();
+		byte[] table = buffer.toByteArray();
+
+		ReentrantLock lock = new ReentrantLock();
+		ReftableReader t = read(table);
+		ReftableReflogReader rlr = new ReftableReflogReader(lock, t, MASTER);
+
+		assertEquals(rlr.getLastEntry().getWho(), who1);
+		List<PersonIdent> all = rlr.getReverseEntries().stream()
+				.map(x -> x.getWho()).collect(Collectors.toList());
+		Matchers.contains(all, who3, who2, who1);
+
+		assertEquals(rlr.getReverseEntry(1).getWho(), who2);
+
+		List<ReflogEntry> reverse2 = rlr.getReverseEntries(2);
+		Matchers.contains(reverse2, who3, who2);
+
+		List<PersonIdent> more = rlr.getReverseEntries(4).stream()
+				.map(x -> x.getWho()).collect(Collectors.toList());
+		assertEquals(all, more);
+	}
+
+	@Test
+	public void allRefs() throws IOException {
+		ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+		ReftableConfig cfg = new ReftableConfig();
+		cfg.setRefBlockSize(1024);
+		cfg.setLogBlockSize(1024);
+		cfg.setAlignBlocks(true);
+		ReftableWriter writer = new ReftableWriter()
+				.setMinUpdateIndex(1)
+				.setMaxUpdateIndex(1)
+				.setConfig(cfg)
+				.begin(buffer);
+		PersonIdent who = new PersonIdent("Log", "Ger", 1500079709, -8 * 60);
+
+		// Fill out the 1st ref block.
+		List<String> names = new ArrayList<>();
+		for (int i = 0; i < 4; i++) {
+			String name = new String(new char[220]).replace("\0", String.format("%c", i + 'a'));
+			names.add(name);
+			writer.writeRef(ref(name, i));
+		}
+
+		// Add some log data.
+		writer.writeLog(MASTER, 1, who, ObjectId.zeroId(), id(1), "msg");
+		writer.finish();
+		byte[] table = buffer.toByteArray();
+
+		ReftableReader t = read(table);
+		RefCursor c = t.allRefs();
+
+		int j = 0;
+		while (c.next()) {
+			assertEquals(names.get(j), c.getRef().getName());
+			j++;
+		}
+	}
+
+
+	@Test
 	public void reflogSeek() throws IOException {
 		PersonIdent who = new PersonIdent("Log", "Ger", 1500079709, -8 * 60);
 		String msg = "test";

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java
index c1e078d..d6c7a61 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java

@@ -55,10 +55,9 @@
 import org.eclipse.jgit.internal.JGitText;
 import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription;
 import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
-import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.lib.NullProgressMonitor;
 import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.ObjectInserter;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
 import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
@@ -73,8 +72,8 @@ public class AtomicPushTest {
 	private Object ctx = new Object();
 	private InMemoryRepository server;
 	private InMemoryRepository client;
-	private ObjectId obj1;
-	private ObjectId obj2;
+	private ObjectId commit1;
+	private ObjectId commit2;
 
 	@Before
 	public void setUp() throws Exception {
@@ -92,10 +91,11 @@ public ReceivePack create(Object req, Repository db)
 				});
 		uri = testProtocol.register(ctx, server);
 
-		try (ObjectInserter ins = client.newObjectInserter()) {
-			obj1 = ins.insert(Constants.OBJ_BLOB, Constants.encode("test"));
-			obj2 = ins.insert(Constants.OBJ_BLOB, Constants.encode("file"));
-			ins.flush();
+		try (TestRepository<?> clientRepo = new TestRepository<>(client)) {
+			commit1 = clientRepo.commit().noFiles().message("test commit 1")
+					.create();
+			commit2 = clientRepo.commit().noFiles().message("test commit 2")
+					.create();
 		}
 	}
 
@@ -149,13 +149,13 @@ public void pushAtomicDisabled() throws Exception {
 		List<RemoteRefUpdate> cmds = new ArrayList<>();
 		cmds.add(new RemoteRefUpdate(
 				null, null,
-				obj1, "refs/heads/one",
+				commit1, "refs/heads/one",
 				true /* force update */,
 				null /* no local tracking ref */,
 				ObjectId.zeroId()));
 		cmds.add(new RemoteRefUpdate(
 				null, null,
-				obj2, "refs/heads/two",
+				commit2, "refs/heads/two",
 				true /* force update */,
 				null /* no local tracking ref */,
 				ObjectId.zeroId()));
@@ -176,16 +176,16 @@ private List<RemoteRefUpdate> commands() throws IOException {
 		List<RemoteRefUpdate> cmds = new ArrayList<>();
 		cmds.add(new RemoteRefUpdate(
 				null, null,
-				obj1, "refs/heads/one",
+				commit1, "refs/heads/one",
 				true /* force update */,
 				null /* no local tracking ref */,
 				ObjectId.zeroId()));
 		cmds.add(new RemoteRefUpdate(
 				null, null,
-				obj2, "refs/heads/two",
+				commit2, "refs/heads/two",
 				true /* force update */,
 				null /* no local tracking ref */,
-				obj1));
+				commit1));
 		return cmds;
 	}
 }

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushOptionsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushOptionsTest.java
index fd1c3bf..18946e0 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushOptionsTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushOptionsTest.java

@@ -62,10 +62,9 @@
 import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription;
 import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
 import org.eclipse.jgit.junit.RepositoryTestCase;
-import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.lib.NullProgressMonitor;
 import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.ObjectInserter;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.StoredConfig;
 import org.eclipse.jgit.revwalk.RevCommit;
@@ -79,8 +78,8 @@ public class PushOptionsTest extends RepositoryTestCase {
 	private Object ctx = new Object();
 	private InMemoryRepository server;
 	private InMemoryRepository client;
-	private ObjectId obj1;
-	private ObjectId obj2;
+	private ObjectId commit1;
+	private ObjectId commit2;
 	private ReceivePack receivePack;
 
 	@Override
@@ -101,10 +100,11 @@ public void setUp() throws Exception {
 
 		uri = testProtocol.register(ctx, server);
 
-		try (ObjectInserter ins = client.newObjectInserter()) {
-			obj1 = ins.insert(Constants.OBJ_BLOB, Constants.encode("test"));
-			obj2 = ins.insert(Constants.OBJ_BLOB, Constants.encode("file"));
-			ins.flush();
+		try (TestRepository<?> clientRepo = new TestRepository<>(client)) {
+			commit1 = clientRepo.commit().noFiles().message("test commit 1")
+					.create();
+			commit2 = clientRepo.commit().noFiles().message("test commit 2")
+					.create();
 		}
 	}
 
@@ -121,12 +121,12 @@ private static InMemoryRepository newRepo(String name) {
 	private List<RemoteRefUpdate> commands(boolean atomicSafe)
 			throws IOException {
 		List<RemoteRefUpdate> cmds = new ArrayList<>();
-		cmds.add(new RemoteRefUpdate(null, null, obj1, "refs/heads/one",
+		cmds.add(new RemoteRefUpdate(null, null, commit1, "refs/heads/one",
 				true /* force update */, null /* no local tracking ref */,
 				ObjectId.zeroId()));
-		cmds.add(new RemoteRefUpdate(null, null, obj2, "refs/heads/two",
+		cmds.add(new RemoteRefUpdate(null, null, commit2, "refs/heads/two",
 				true /* force update */, null /* no local tracking ref */,
-				atomicSafe ? ObjectId.zeroId() : obj1));
+				atomicSafe ? ObjectId.zeroId() : commit1));
 		return cmds;
 	}
 

diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index 6f69d27..38f63f9 100644
--- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF

@@ -4,14 +4,14 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ui
 Bundle-SymbolicName: org.eclipse.jgit.ui
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.awtui;version="5.5.1"
-Import-Package: org.eclipse.jgit.errors;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revplot;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.1,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.1,5.6.0)"
+Export-Package: org.eclipse.jgit.awtui;version="5.6.0"
+Import-Package: org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revplot;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)"

diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
index 0e0a254..c19a634 100644
--- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF

@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.ui - Sources
 Bundle-SymbolicName: org.eclipse.jgit.ui.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.5.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.5.1.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.6.0.qualifier";roots="."

diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index 560c2ca..7d6c77d 100644
--- a/org.eclipse.jgit.ui/pom.xml
+++ b/org.eclipse.jgit.ui/pom.xml

@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ui</artifactId>

diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index f50ea9a..e4d023d 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters

@@ -1,166 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.jgit" version="2">
-    <resource path="src/org/eclipse/jgit/dircache/DirCacheEntry.java" type="org.eclipse.jgit.dircache.DirCacheEntry">
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="getLastModifiedInstant()"/>
-            </message_arguments>
-        </filter>
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="mightBeRacilyClean(Instant)"/>
-            </message_arguments>
-        </filter>
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="setLastModified(Instant)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/jgit/lib/AnyObjectId.java" type="org.eclipse.jgit.lib.AnyObjectId">
+    <resource path="src/org/eclipse/jgit/transport/SshConstants.java" type="org.eclipse.jgit.transport.SshConstants">
         <filter id="1141899266">
             <message_arguments>
-                <message_argument value="5.4"/>
                 <message_argument value="5.5"/>
-                <message_argument value="isEqual(AnyObjectId, AnyObjectId)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="CONFIG_FILESYSTEM_SECTION"/>
-            </message_arguments>
-        </filter>
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="CONFIG_KEY_MIN_RACY_THRESHOLD"/>
-            </message_arguments>
-        </filter>
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="CONFIG_KEY_TIMESTAMP_RESOLUTION"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java" type="org.eclipse.jgit.treewalk.WorkingTreeIterator">
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="getEntryLastModifiedInstant()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java" type="org.eclipse.jgit.treewalk.WorkingTreeIterator$Entry">
-        <filter id="336695337">
-            <message_arguments>
-                <message_argument value="org.eclipse.jgit.treewalk.WorkingTreeIterator.Entry"/>
-                <message_argument value="getLastModifiedInstant()"/>
-            </message_arguments>
-        </filter>
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="getLastModifiedInstant()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS">
-        <filter id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.jgit.util.FS"/>
-                <message_argument value="getFsTimerResolution(Path)"/>
-            </message_arguments>
-        </filter>
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="getFileStoreAttributes(Path)"/>
-            </message_arguments>
-        </filter>
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="lastModifiedInstant(File)"/>
-            </message_arguments>
-        </filter>
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="lastModifiedInstant(Path)"/>
-            </message_arguments>
-        </filter>
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="setAsyncFileStoreAttributes(boolean)"/>
-            </message_arguments>
-        </filter>
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="setLastModified(Path, Instant)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS$Attributes">
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="getLastModifiedInstant()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS$FileStoreAttributes">
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="FileStoreAttributes"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/jgit/util/References.java" type="org.eclipse.jgit.util.References">
-        <filter id="1108344834">
-            <message_arguments>
-                <message_argument value="5.4"/>
-                <message_argument value="5.5"/>
-                <message_argument value="org.eclipse.jgit.util.References"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/jgit/util/SimpleLruCache.java" type="org.eclipse.jgit.util.SimpleLruCache">
-        <filter id="1109393411">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="org.eclipse.jgit.util.SimpleLruCache"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/jgit/util/Stats.java" type="org.eclipse.jgit.util.Stats">
-        <filter id="1109393411">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="org.eclipse.jgit.util.Stats"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/jgit/util/SystemReader.java" type="org.eclipse.jgit.util.SystemReader">
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="getSystemConfig()"/>
-            </message_arguments>
-        </filter>
-        <filter id="1142947843">
-            <message_arguments>
-                <message_argument value="5.1.9"/>
-                <message_argument value="getUserConfig()"/>
+                <message_argument value="5.6"/>
+                <message_argument value="HASH_KNOWN_HOSTS"/>
             </message_arguments>
         </filter>
     </resource>

diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 1a8d43c..35f29aa 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF

@@ -3,12 +3,12 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit
 Bundle-SymbolicName: org.eclipse.jgit
-Bundle-Version: 5.5.1.qualifier
+Bundle-Version: 5.6.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.jgit.annotations;version="5.5.1",
- org.eclipse.jgit.api;version="5.5.1";
+Export-Package: org.eclipse.jgit.annotations;version="5.6.0",
+ org.eclipse.jgit.api;version="5.6.0";
   uses:="org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.diff,
@@ -22,53 +22,53 @@
    org.eclipse.jgit.submodule,
    org.eclipse.jgit.transport,
    org.eclipse.jgit.merge",
- org.eclipse.jgit.api.errors;version="5.5.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors",
- org.eclipse.jgit.attributes;version="5.5.1",
- org.eclipse.jgit.blame;version="5.5.1";
+ org.eclipse.jgit.api.errors;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors",
+ org.eclipse.jgit.attributes;version="5.6.0",
+ org.eclipse.jgit.blame;version="5.6.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.diff",
- org.eclipse.jgit.diff;version="5.5.1";
+ org.eclipse.jgit.diff;version="5.6.0";
   uses:="org.eclipse.jgit.patch,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.util",
- org.eclipse.jgit.dircache;version="5.5.1";
+ org.eclipse.jgit.dircache;version="5.6.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.util,
    org.eclipse.jgit.events,
    org.eclipse.jgit.attributes",
- org.eclipse.jgit.errors;version="5.5.1";
+ org.eclipse.jgit.errors;version="5.6.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.internal.storage.pack,
    org.eclipse.jgit.transport,
    org.eclipse.jgit.dircache",
- org.eclipse.jgit.events;version="5.5.1";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.fnmatch;version="5.5.1",
- org.eclipse.jgit.gitrepo;version="5.5.1";
+ org.eclipse.jgit.events;version="5.6.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.fnmatch;version="5.6.0",
+ org.eclipse.jgit.gitrepo;version="5.6.0";
   uses:="org.eclipse.jgit.api,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.xml.sax.helpers,
    org.xml.sax",
- org.eclipse.jgit.gitrepo.internal;version="5.5.1";x-internal:=true,
- org.eclipse.jgit.hooks;version="5.5.1";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.ignore;version="5.5.1",
- org.eclipse.jgit.ignore.internal;version="5.5.1";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal;version="5.5.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.fsck;version="5.5.1";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.ketch;version="5.5.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.revwalk;version="5.5.1";x-internal:=true,
- org.eclipse.jgit.internal.storage.dfs;version="5.5.1";
+ org.eclipse.jgit.gitrepo.internal;version="5.6.0";x-internal:=true,
+ org.eclipse.jgit.hooks;version="5.6.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.ignore;version="5.6.0",
+ org.eclipse.jgit.ignore.internal;version="5.6.0";x-friends:="org.eclipse.jgit.test",
+ org.eclipse.jgit.internal;version="5.6.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
+ org.eclipse.jgit.internal.fsck;version="5.6.0";x-friends:="org.eclipse.jgit.test",
+ org.eclipse.jgit.internal.ketch;version="5.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
+ org.eclipse.jgit.internal.revwalk;version="5.6.0";x-internal:=true,
+ org.eclipse.jgit.internal.storage.dfs;version="5.6.0";
   x-friends:="org.eclipse.jgit.test,
    org.eclipse.jgit.http.server,
    org.eclipse.jgit.http.test,
    org.eclipse.jgit.lfs.test",
- org.eclipse.jgit.internal.storage.file;version="5.5.1";
+ org.eclipse.jgit.internal.storage.file;version="5.6.0";
   x-friends:="org.eclipse.jgit.test,
    org.eclipse.jgit.junit,
    org.eclipse.jgit.junit.http,
@@ -77,19 +77,19 @@
    org.eclipse.jgit.pgm,
    org.eclipse.jgit.pgm.test,
    org.eclipse.jgit.ssh.apache",
- org.eclipse.jgit.internal.storage.io;version="5.5.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.pack;version="5.5.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.reftable;version="5.5.1";
+ org.eclipse.jgit.internal.storage.io;version="5.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
+ org.eclipse.jgit.internal.storage.pack;version="5.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
+ org.eclipse.jgit.internal.storage.reftable;version="5.6.0";
   x-friends:="org.eclipse.jgit.http.test,
    org.eclipse.jgit.junit,
    org.eclipse.jgit.test,
    org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.reftree;version="5.5.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.submodule;version="5.5.1";x-internal:=true,
- org.eclipse.jgit.internal.transport.http;version="5.5.1";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.parser;version="5.5.1";x-friends:="org.eclipse.jgit.http.server,org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.ssh;version="5.5.1";x-friends:="org.eclipse.jgit.ssh.apache",
- org.eclipse.jgit.lib;version="5.5.1";
+ org.eclipse.jgit.internal.storage.reftree;version="5.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
+ org.eclipse.jgit.internal.submodule;version="5.6.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.http;version="5.6.0";x-friends:="org.eclipse.jgit.test",
+ org.eclipse.jgit.internal.transport.parser;version="5.6.0";x-friends:="org.eclipse.jgit.http.server,org.eclipse.jgit.test",
+ org.eclipse.jgit.internal.transport.ssh;version="5.6.0";x-friends:="org.eclipse.jgit.ssh.apache",
+ org.eclipse.jgit.lib;version="5.6.0";
   uses:="org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.util,
@@ -99,33 +99,33 @@
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.transport,
    org.eclipse.jgit.submodule",
- org.eclipse.jgit.lib.internal;version="5.5.1";x-internal:=true,
- org.eclipse.jgit.merge;version="5.5.1";
+ org.eclipse.jgit.lib.internal;version="5.6.0";x-internal:=true,
+ org.eclipse.jgit.merge;version="5.6.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.diff,
    org.eclipse.jgit.dircache,
    org.eclipse.jgit.api",
- org.eclipse.jgit.nls;version="5.5.1",
- org.eclipse.jgit.notes;version="5.5.1";
+ org.eclipse.jgit.nls;version="5.6.0",
+ org.eclipse.jgit.notes;version="5.6.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.merge",
- org.eclipse.jgit.patch;version="5.5.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff",
- org.eclipse.jgit.revplot;version="5.5.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk",
- org.eclipse.jgit.revwalk;version="5.5.1";
+ org.eclipse.jgit.patch;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff",
+ org.eclipse.jgit.revplot;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk",
+ org.eclipse.jgit.revwalk;version="5.6.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.diff,
    org.eclipse.jgit.revwalk.filter",
- org.eclipse.jgit.revwalk.filter;version="5.5.1";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util",
- org.eclipse.jgit.storage.file;version="5.5.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util",
- org.eclipse.jgit.storage.pack;version="5.5.1";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="5.5.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk",
- org.eclipse.jgit.transport;version="5.5.1";
+ org.eclipse.jgit.revwalk.filter;version="5.6.0";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util",
+ org.eclipse.jgit.storage.file;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util",
+ org.eclipse.jgit.storage.pack;version="5.6.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.submodule;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk",
+ org.eclipse.jgit.transport;version="5.6.0";
   uses:="org.eclipse.jgit.transport.resolver,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.internal.storage.pack,
@@ -138,24 +138,24 @@
    org.eclipse.jgit.transport.http,
    org.eclipse.jgit.errors,
    org.eclipse.jgit.storage.pack",
- org.eclipse.jgit.transport.http;version="5.5.1";uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="5.5.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport",
- org.eclipse.jgit.treewalk;version="5.5.1";
+ org.eclipse.jgit.transport.http;version="5.6.0";uses:="javax.net.ssl",
+ org.eclipse.jgit.transport.resolver;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport",
+ org.eclipse.jgit.treewalk;version="5.6.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.attributes,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.util,
    org.eclipse.jgit.dircache",
- org.eclipse.jgit.treewalk.filter;version="5.5.1";uses:="org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util;version="5.5.1";
+ org.eclipse.jgit.treewalk.filter;version="5.6.0";uses:="org.eclipse.jgit.treewalk",
+ org.eclipse.jgit.util;version="5.6.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.transport.http,
    org.eclipse.jgit.storage.file,
    org.ietf.jgss",
- org.eclipse.jgit.util.io;version="5.5.1",
- org.eclipse.jgit.util.sha1;version="5.5.1",
- org.eclipse.jgit.util.time;version="5.5.1"
+ org.eclipse.jgit.util.io;version="5.6.0",
+ org.eclipse.jgit.util.sha1;version="5.6.0",
+ org.eclipse.jgit.util.time;version="5.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
  com.jcraft.jsch;version="[0.1.37,0.2.0)",

diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index d9e680a..01c9aa0 100644
--- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF

@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit - Sources
 Bundle-SymbolicName: org.eclipse.jgit.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.5.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="5.5.1.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="5.6.0.qualifier";roots="."

diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index bff6c7c..6b8cdaa 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml

@@ -53,7 +53,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.5.1-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit</artifactId>

diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index 6b09faf..280d95a 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties

@@ -448,6 +448,7 @@
 noMergeBase=No merge base could be determined. Reason={0}. {1}
 noMergeHeadSpecified=No merge head specified
 nonBareLinkFilesNotSupported=Link files are not supported with nonbare repos
+nonCommitToHeads=Cannot point a branch to a non-commit object
 noPathAttributesFound=No Attributes found for {0}.
 noSuchRef=no such ref
 noSuchSubmodule=no such submodule {0}

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index 6a7d22d..1aae4f4 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java

@@ -509,6 +509,7 @@ public static JGitText get() {
 	/***/ public String noMergeBase;
 	/***/ public String noMergeHeadSpecified;
 	/***/ public String nonBareLinkFilesNotSupported;
+	/***/ public String nonCommitToHeads;
 	/***/ public String noPathAttributesFound;
 	/***/ public String noSuchRef;
 	/***/ public String noSuchSubmodule;

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java
index c6e2fae..16e7a0d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java

@@ -412,8 +412,7 @@ DfsBlock getOrLoad(BlockBasedFile file, long position, DfsReader ctx,
 			getStat(statMiss, key).incrementAndGet();
 			boolean credit = true;
 			try {
-				v = file.readOneBlock(requestedPosition, ctx,
-						fileChannel.get());
+				v = file.readOneBlock(position, ctx, fileChannel.get());
 				credit = false;
 			} finally {
 				if (credit) {
@@ -450,7 +449,7 @@ DfsBlock getOrLoad(BlockBasedFile file, long position, DfsReader ctx,
 	}
 
 	@SuppressWarnings("unchecked")
-	private void reserveSpace(int reserve, DfsStreamKey key) {
+	private void reserveSpace(long reserve, DfsStreamKey key) {
 		clockLock.lock();
 		try {
 			long live = LongStream.of(getCurrentSize()).sum() + reserve;
@@ -487,7 +486,7 @@ private void reserveSpace(int reserve, DfsStreamKey key) {
 		}
 	}
 
-	private void creditSpace(int credit, DfsStreamKey key) {
+	private void creditSpace(long credit, DfsStreamKey key) {
 		clockLock.lock();
 		try {
 			getStat(liveBytes, key).addAndGet(-credit);
@@ -497,7 +496,7 @@ private void creditSpace(int credit, DfsStreamKey key) {
 	}
 
 	@SuppressWarnings("unchecked")
-	private void addToClock(Ref ref, int credit) {
+	private void addToClock(Ref ref, long credit) {
 		clockLock.lock();
 		try {
 			if (credit != 0) {
@@ -521,17 +520,20 @@ void put(DfsBlock v) {
 	 *
 	 * @param key
 	 *            the stream key of the pack.
+	 * @param position
+	 *            the position in the key. The default should be 0.
 	 * @param loader
 	 *            the function to load the reference.
 	 * @return the object reference.
 	 * @throws IOException
 	 *             the reference was not in the cache and could not be loaded.
 	 */
-	<T> Ref<T> getOrLoadRef(DfsStreamKey key, RefLoader<T> loader)
+	<T> Ref<T> getOrLoadRef(
+			DfsStreamKey key, long position, RefLoader<T> loader)
 			throws IOException {
-		int slot = slot(key, 0);
+		int slot = slot(key, position);
 		HashEntry e1 = table.get(slot);
-		Ref<T> ref = scanRef(e1, key, 0);
+		Ref<T> ref = scanRef(e1, key, position);
 		if (ref != null) {
 			getStat(statHit, key).incrementAndGet();
 			return ref;
@@ -543,7 +545,7 @@ <T> Ref<T> getOrLoadRef(DfsStreamKey key, RefLoader<T> loader)
 		try {
 			HashEntry e2 = table.get(slot);
 			if (e2 != e1) {
-				ref = scanRef(e2, key, 0);
+				ref = scanRef(e2, key, position);
 				if (ref != null) {
 					getStat(statHit, key).incrementAndGet();
 					return ref;
@@ -574,10 +576,10 @@ <T> Ref<T> getOrLoadRef(DfsStreamKey key, RefLoader<T> loader)
 	}
 
 	<T> Ref<T> putRef(DfsStreamKey key, long size, T v) {
-		return put(key, 0, (int) Math.min(size, Integer.MAX_VALUE), v);
+		return put(key, 0, size, v);
 	}
 
-	<T> Ref<T> put(DfsStreamKey key, long pos, int size, T v) {
+	<T> Ref<T> put(DfsStreamKey key, long pos, long size, T v) {
 		int slot = slot(key, pos);
 		HashEntry e1 = table.get(slot);
 		Ref<T> ref = scanRef(e1, key, pos);
@@ -720,12 +722,12 @@ private static final class HashEntry {
 	static final class Ref<T> {
 		final DfsStreamKey key;
 		final long position;
-		final int size;
+		final long size;
 		volatile T value;
 		Ref next;
 		volatile boolean hot;
 
-		Ref(DfsStreamKey key, long position, int size, T v) {
+		Ref(DfsStreamKey key, long position, long size, T v) {
 			this.key = key;
 			this.position = position;
 			this.size = size;

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsCachedPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsCachedPack.java
index 3605236e..9b28074 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsCachedPack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsCachedPack.java

@@ -61,6 +61,13 @@ public class DfsCachedPack extends CachedPack {
 	}
 
 	/**
+	 * @return the pack passed to the constructor
+	 */
+	public DfsPackFile getPackFile() {
+		return pack;
+	}
+
+	/**
 	 * Get the description of the pack.
 	 *
 	 * @return the description of the pack.

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java
index f10a1d8..6f0ea18 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java

@@ -765,12 +765,10 @@ private void writeReftable(DfsPackDescription pack, Collection<Ref> refs)
 			throws IOException {
 		try (DfsOutputStream out = objdb.writeFile(pack, REFTABLE)) {
 			ReftableConfig cfg = configureReftable(reftableConfig, out);
-			ReftableWriter writer = new ReftableWriter(cfg)
+			ReftableWriter writer = new ReftableWriter(cfg, out)
 					.setMinUpdateIndex(reftableInitialMinUpdateIndex)
-					.setMaxUpdateIndex(reftableInitialMaxUpdateIndex)
-					.begin(out)
-					.sortAndWriteRefs(refs)
-					.finish();
+					.setMaxUpdateIndex(reftableInitialMaxUpdateIndex).begin()
+					.sortAndWriteRefs(refs).finish();
 			pack.addFileExt(REFTABLE);
 			pack.setReftableStats(writer.getStats());
 		}

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
index be1387e..6c69019 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java

@@ -89,6 +89,7 @@
  */
 public final class DfsPackFile extends BlockBasedFile {
 	private static final int REC_SIZE = Constants.OBJECT_ID_LENGTH + 8;
+	private static final long REF_POSITION = 0;
 
 	/**
 	 * Lock for initialization of {@link #index} and {@link #corruptObjects}.
@@ -194,45 +195,10 @@ private PackIndex idx(DfsReader ctx) throws IOException {
 
 			try {
 				DfsStreamKey idxKey = desc.getStreamKey(INDEX);
-				DfsBlockCache.Ref<PackIndex> idxref = cache.getOrLoadRef(idxKey,
-						() -> {
-							try {
-								ctx.stats.readIdx++;
-								long start = System.nanoTime();
-								try (ReadableChannel rc = ctx.db.openFile(desc,
-										INDEX)) {
-									InputStream in = Channels
-											.newInputStream(rc);
-									int wantSize = 8192;
-									int bs = rc.blockSize();
-									if (0 < bs && bs < wantSize) {
-										bs = (wantSize / bs) * bs;
-									} else if (bs <= 0) {
-										bs = wantSize;
-									}
-									PackIndex idx = PackIndex.read(
-											new BufferedInputStream(in, bs));
-									int sz = (int) Math.min(
-											idx.getObjectCount() * REC_SIZE,
-											Integer.MAX_VALUE);
-									ctx.stats.readIdxBytes += rc.position();
-									index = idx;
-									return new DfsBlockCache.Ref<>(idxKey, 0,
-											sz, idx);
-								} finally {
-									ctx.stats.readIdxMicros += elapsedMicros(
-											start);
-								}
-							} catch (EOFException e) {
-								throw new IOException(MessageFormat.format(
-										DfsText.get().shortReadOfIndex,
-										desc.getFileName(INDEX)), e);
-							} catch (IOException e) {
-								throw new IOException(MessageFormat.format(
-										DfsText.get().cannotReadIndex,
-										desc.getFileName(INDEX)), e);
-							}
-						});
+				DfsBlockCache.Ref<PackIndex> idxref = cache.getOrLoadRef(
+						idxKey,
+						REF_POSITION,
+						() -> loadPackIndex(ctx, idxKey));
 				PackIndex idx = idxref.get();
 				if (index == null && idx != null) {
 					index = idx;
@@ -267,44 +233,10 @@ PackBitmapIndex getBitmapIndex(DfsReader ctx) throws IOException {
 			PackIndex idx = idx(ctx);
 			PackReverseIndex revidx = getReverseIdx(ctx);
 			DfsStreamKey bitmapKey = desc.getStreamKey(BITMAP_INDEX);
-			DfsBlockCache.Ref<PackBitmapIndex> idxref = cache
-					.getOrLoadRef(bitmapKey, () -> {
-						ctx.stats.readBitmap++;
-						long start = System.nanoTime();
-						try (ReadableChannel rc = ctx.db.openFile(desc,
-								BITMAP_INDEX)) {
-							long size;
-							PackBitmapIndex bmidx;
-							try {
-								InputStream in = Channels.newInputStream(rc);
-								int wantSize = 8192;
-								int bs = rc.blockSize();
-								if (0 < bs && bs < wantSize) {
-									bs = (wantSize / bs) * bs;
-								} else if (bs <= 0) {
-									bs = wantSize;
-								}
-								in = new BufferedInputStream(in, bs);
-								bmidx = PackBitmapIndex.read(in, idx, revidx);
-							} finally {
-								size = rc.position();
-								ctx.stats.readIdxBytes += size;
-								ctx.stats.readIdxMicros += elapsedMicros(start);
-							}
-							int sz = (int) Math.min(size, Integer.MAX_VALUE);
-							bitmapIndex = bmidx;
-							return new DfsBlockCache.Ref<>(bitmapKey, 0, sz,
-									bmidx);
-						} catch (EOFException e) {
-							throw new IOException(MessageFormat.format(
-									DfsText.get().shortReadOfIndex,
-									desc.getFileName(BITMAP_INDEX)), e);
-						} catch (IOException e) {
-							throw new IOException(MessageFormat.format(
-									DfsText.get().cannotReadIndex,
-									desc.getFileName(BITMAP_INDEX)), e);
-						}
-					});
+			DfsBlockCache.Ref<PackBitmapIndex> idxref = cache.getOrLoadRef(
+					bitmapKey,
+					REF_POSITION,
+					() -> loadBitmapIndex(ctx, bitmapKey, idx, revidx));
 			PackBitmapIndex bmidx = idxref.get();
 			if (bitmapIndex == null && bmidx != null) {
 				bitmapIndex = bmidx;
@@ -326,14 +258,10 @@ PackReverseIndex getReverseIdx(DfsReader ctx) throws IOException {
 			PackIndex idx = idx(ctx);
 			DfsStreamKey revKey = new DfsStreamKey.ForReverseIndex(
 					desc.getStreamKey(INDEX));
-			DfsBlockCache.Ref<PackReverseIndex> revref = cache
-					.getOrLoadRef(revKey, () -> {
-						PackReverseIndex revidx = new PackReverseIndex(idx);
-						int sz = (int) Math.min(idx.getObjectCount() * 8,
-								Integer.MAX_VALUE);
-						reverseIndex = revidx;
-						return new DfsBlockCache.Ref<>(revKey, 0, sz, revidx);
-					});
+			DfsBlockCache.Ref<PackReverseIndex> revref = cache.getOrLoadRef(
+					revKey,
+					REF_POSITION,
+					() -> loadReverseIdx(ctx, revKey, idx));
 			PackReverseIndex revidx = revref.get();
 			if (reverseIndex == null && revidx != null) {
 				reverseIndex = revidx;
@@ -1091,4 +1019,91 @@ private void setCorrupt(long offset) {
 			list.add(offset);
 		}
 	}
+
+	private DfsBlockCache.Ref<PackIndex> loadPackIndex(
+			DfsReader ctx, DfsStreamKey idxKey) throws IOException {
+		try {
+			ctx.stats.readIdx++;
+			long start = System.nanoTime();
+			try (ReadableChannel rc = ctx.db.openFile(desc, INDEX)) {
+				InputStream in = Channels.newInputStream(rc);
+				int wantSize = 8192;
+				int bs = rc.blockSize();
+				if (0 < bs && bs < wantSize) {
+					bs = (wantSize / bs) * bs;
+				} else if (bs <= 0) {
+					bs = wantSize;
+				}
+				PackIndex idx = PackIndex.read(new BufferedInputStream(in, bs));
+				ctx.stats.readIdxBytes += rc.position();
+				index = idx;
+				return new DfsBlockCache.Ref<>(
+						idxKey,
+						REF_POSITION,
+						idx.getObjectCount() * REC_SIZE,
+						idx);
+			} finally {
+				ctx.stats.readIdxMicros += elapsedMicros(start);
+			}
+		} catch (EOFException e) {
+			throw new IOException(MessageFormat.format(
+					DfsText.get().shortReadOfIndex,
+					desc.getFileName(INDEX)), e);
+		} catch (IOException e) {
+			throw new IOException(MessageFormat.format(
+					DfsText.get().cannotReadIndex,
+					desc.getFileName(INDEX)), e);
+		}
+	}
+
+	private DfsBlockCache.Ref<PackReverseIndex> loadReverseIdx(
+			DfsReader ctx, DfsStreamKey revKey, PackIndex idx) {
+		PackReverseIndex revidx = new PackReverseIndex(idx);
+		reverseIndex = revidx;
+		return new DfsBlockCache.Ref<>(
+				revKey,
+				REF_POSITION,
+				idx.getObjectCount() * 8,
+				revidx);
+	}
+
+	private DfsBlockCache.Ref<PackBitmapIndex> loadBitmapIndex(
+			DfsReader ctx,
+			DfsStreamKey bitmapKey,
+			PackIndex idx,
+			PackReverseIndex revidx) throws IOException {
+		ctx.stats.readBitmap++;
+		long start = System.nanoTime();
+		try (ReadableChannel rc = ctx.db.openFile(desc, BITMAP_INDEX)) {
+			long size;
+			PackBitmapIndex bmidx;
+			try {
+				InputStream in = Channels.newInputStream(rc);
+				int wantSize = 8192;
+				int bs = rc.blockSize();
+				if (0 < bs && bs < wantSize) {
+					bs = (wantSize / bs) * bs;
+				} else if (bs <= 0) {
+					bs = wantSize;
+				}
+				in = new BufferedInputStream(in, bs);
+				bmidx = PackBitmapIndex.read(in, idx, revidx);
+			} finally {
+				size = rc.position();
+				ctx.stats.readIdxBytes += size;
+				ctx.stats.readIdxMicros += elapsedMicros(start);
+			}
+			bitmapIndex = bmidx;
+			return new DfsBlockCache.Ref<>(
+					bitmapKey, REF_POSITION, size, bmidx);
+		} catch (EOFException e) {
+			throw new IOException(MessageFormat.format(
+					DfsText.get().shortReadOfIndex,
+					desc.getFileName(BITMAP_INDEX)), e);
+		} catch (IOException e) {
+			throw new IOException(MessageFormat.format(
+					DfsText.get().cannotReadIndex,
+					desc.getFileName(BITMAP_INDEX)), e);
+		}
+	}
 }

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java
index 6050c15..fc8320f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java

@@ -124,7 +124,7 @@ public BatchRefUpdate newBatchUpdate() {
 	 * @return configuration to write new reftables with.
 	 */
 	public ReftableConfig getReftableConfig() {
-		return new ReftableConfig(getRepository().getConfig());
+		return new ReftableConfig(getRepository());
 	}
 
 	/**

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ReftableBatchRefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ReftableBatchRefUpdate.java
index 07fd00f..682e156 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ReftableBatchRefUpdate.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ReftableBatchRefUpdate.java

@@ -141,8 +141,7 @@ public void execute(RevWalk rw, ProgressMonitor pm, List<String> options) {
 
 			lock.lock();
 			try {
-				Reftable table = refdb.reader();
-				if (!checkExpected(table, pending)) {
+				if (!checkExpected(pending)) {
 					return;
 				}
 				if (!checkConflicting(pending)) {
@@ -236,10 +235,10 @@ private boolean checkConflicting(List<ReceiveCommand> pending)
 		return ok;
 	}
 
-	private boolean checkExpected(Reftable table, List<ReceiveCommand> pending)
+	private boolean checkExpected(List<ReceiveCommand> pending)
 			throws IOException {
 		for (ReceiveCommand cmd : pending) {
-			if (!matchOld(cmd, table.exactRef(cmd.getRefName()))) {
+			if (!matchOld(cmd, refdb.exactRef(cmd.getRefName()))) {
 				cmd.setResult(LOCK_FAILURE);
 				if (isAtomic()) {
 					ReceiveCommand.abort(pending);

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java
index 4f0ff2d..02c2f5b 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java

@@ -169,11 +169,13 @@ public RefCursor allRefs() throws IOException {
 			readFileHeader();
 		}
 
-		long end = refEnd > 0 ? refEnd : (src.size() - FILE_FOOTER_LEN);
-		src.adviseSequentialRead(0, end);
+		if (refEnd == 0) {
+			readFileFooter();
+		}
+		src.adviseSequentialRead(0, refEnd);
 
-		RefCursorImpl i = new RefCursorImpl(end, null, false);
-		i.block = readBlock(0, end);
+		RefCursorImpl i = new RefCursorImpl(refEnd, null, false);
+		i.block = readBlock(0, refEnd);
 		return i;
 	}
 

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReflogReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReflogReader.java
new file mode 100644
index 0000000..c75d3cf
--- /dev/null
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReflogReader.java

@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2019, Google LLC
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following
+ *   disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ *   names of its contributors may be used to endorse or promote
+ *   products derived from this software without specific prior
+ *   written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.eclipse.jgit.internal.storage.reftable;
+
+import org.eclipse.jgit.lib.ReflogEntry;
+import org.eclipse.jgit.lib.ReflogReader;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.locks.Lock;
+
+/**
+ * Implement the ReflogReader interface for a reflog stored in reftable.
+ */
+public class ReftableReflogReader implements ReflogReader {
+	private final Lock lock;
+
+	private final Reftable reftable;
+
+	private final String refname;
+
+	ReftableReflogReader(Lock lock, Reftable merged, String refname) {
+		this.lock = lock;
+		this.reftable = merged;
+		this.refname = refname;
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public ReflogEntry getLastEntry() throws IOException {
+		lock.lock();
+		try {
+			LogCursor cursor = reftable.seekLog(refname);
+			return cursor.next() ? cursor.getReflogEntry() : null;
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public List<ReflogEntry> getReverseEntries() throws IOException {
+		return getReverseEntries(Integer.MAX_VALUE);
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public ReflogEntry getReverseEntry(int number) throws IOException {
+		lock.lock();
+		try {
+			LogCursor cursor = reftable.seekLog(refname);
+			while (true) {
+				if (!cursor.next() || number < 0) {
+					return null;
+				}
+				if (number == 0) {
+					return cursor.getReflogEntry();
+				}
+				number--;
+			}
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public List<ReflogEntry> getReverseEntries(int max) throws IOException {
+		lock.lock();
+		try {
+			LogCursor cursor = reftable.seekLog(refname);
+
+			List<ReflogEntry> result = new ArrayList<>();
+			while (cursor.next() && result.size() < max) {
+				result.add(cursor.getReflogEntry());
+			}
+
+			return result;
+		} finally {
+			lock.unlock();
+		}
+	}
+}

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableWriter.java
index 6459c27..2217caa 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableWriter.java

@@ -108,6 +108,7 @@ public class ReftableWriter {
 	private long minUpdateIndex;
 	private long maxUpdateIndex;
 
+	private OutputStream outputStream;
 	private ReftableOutputStream out;
 	private ObjectIdSubclassMap<RefList> obj2ref;
 
@@ -136,7 +137,20 @@ public ReftableWriter() {
 	 *            configuration for the writer.
 	 */
 	public ReftableWriter(ReftableConfig cfg) {
+		this(cfg, null);
+	}
+
+	/**
+	 * Initialize a writer with a configuration.
+	 *
+	 * @param cfg
+	 *            configuration for the writer
+	 * @param os
+	 *            output stream. Do not supply a stream to begin() on this writer.
+	 */
+	public ReftableWriter(ReftableConfig cfg, @Nullable OutputStream os) {
 		config = cfg;
+		outputStream = os;
 	}
 
 	/**
@@ -183,16 +197,32 @@ public ReftableWriter setMaxUpdateIndex(long max) {
 	}
 
 	/**
-	 * Begin writing the reftable.
+	 * Begin writing the reftable. Should be called only once.
 	 *
 	 * @param os
 	 *            stream to write the table to. Caller is responsible for
 	 *            closing the stream after invoking {@link #finish()}.
 	 * @return {@code this}
-	 * @throws java.io.IOException
-	 *             if reftable header cannot be written.
 	 */
-	public ReftableWriter begin(OutputStream os) throws IOException {
+	public ReftableWriter begin(OutputStream os) {
+		if (outputStream != null) {
+			throw new IllegalStateException("begin() called twice.");//$NON-NLS-1$
+		}
+		outputStream = os;
+		return begin();
+	}
+
+	/**
+	 * Begin writing the reftable. Should be called only once. Call this
+	 * if a stream was passed to the constructor.
+	 *
+	 * @return {@code this}
+	 */
+	public ReftableWriter begin() {
+		if (out != null) {
+			throw new IllegalStateException("begin() called twice.");//$NON-NLS-1$
+		}
+
 		refBlockSize = config.getRefBlockSize();
 		logBlockSize = config.getLogBlockSize();
 		restartInterval = config.getRestartInterval();
@@ -212,7 +242,7 @@ public ReftableWriter begin(OutputStream os) throws IOException {
 			restartInterval = refBlockSize < (60 << 10) ? 16 : 64;
 		}
 
-		out = new ReftableOutputStream(os, refBlockSize, alignBlocks);
+		out = new ReftableOutputStream(outputStream, refBlockSize, alignBlocks);
 		refs = new Section(REF_BLOCK_TYPE);
 		if (indexObjects) {
 			obj2ref = new ObjectIdSubclassMap<>();

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
index e402de0..954359e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java

@@ -1613,6 +1613,24 @@ protected void validateCommands() {
 			if (cmd.getResult() != Result.NOT_ATTEMPTED)
 				continue;
 
+			RevObject newObj = null;
+			if (cmd.getType() == ReceiveCommand.Type.CREATE
+					|| cmd.getType() == ReceiveCommand.Type.UPDATE) {
+				try {
+					newObj = walk.parseAny(cmd.getNewId());
+				} catch (IOException e) {
+					cmd.setResult(Result.REJECTED_MISSING_OBJECT,
+							cmd.getNewId().name());
+					continue;
+				}
+				if (cmd.getRefName().startsWith(Constants.R_HEADS)
+						&& !(newObj instanceof RevCommit)) {
+					cmd.setResult(Result.REJECTED_OTHER_REASON,
+							JGitText.get().nonCommitToHeads);
+					continue;
+				}
+			}
+
 			if (cmd.getType() == ReceiveCommand.Type.DELETE) {
 				if (!isAllowDeletes()) {
 					// Deletes are not supported on this repository.
@@ -1694,7 +1712,7 @@ protected void validateCommands() {
 
 				// Is this possibly a non-fast-forward style update?
 				//
-				RevObject oldObj, newObj;
+				RevObject oldObj;
 				try {
 					oldObj = walk.parseAny(cmd.getOldId());
 				} catch (IOException e) {
@@ -1703,14 +1721,6 @@ protected void validateCommands() {
 					continue;
 				}
 
-				try {
-					newObj = walk.parseAny(cmd.getNewId());
-				} catch (IOException e) {
-					cmd.setResult(Result.REJECTED_MISSING_OBJECT, cmd
-							.getNewId().name());
-					continue;
-				}
-
 				if (oldObj instanceof RevCommit && newObj instanceof RevCommit) {
 					try {
 						if (walk.isMergedInto((RevCommit) oldObj,

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
index 8bb68dc..3155916 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java

@@ -101,7 +101,6 @@
 import org.eclipse.jgit.util.RawParseUtils;
 import org.eclipse.jgit.util.TemporaryBuffer;
 import org.eclipse.jgit.util.TemporaryBuffer.LocalFile;
-import org.eclipse.jgit.util.io.AutoLFInputStream;
 import org.eclipse.jgit.util.io.EolStreamTypeUtil;
 import org.eclipse.jgit.util.sha1.SHA1;
 
@@ -1092,41 +1091,8 @@ private boolean contentCheck(DirCacheEntry entry, ObjectReader reader)
 				return !new File(readSymlinkTarget(current())).equals(
 						new File(readContentAsNormalizedString(entry, reader)));
 			}
-			// Content differs: that's a real change, perhaps
-			if (reader == null) // deprecated use, do no further checks
-				return true;
-
-			switch (getEolStreamType()) {
-			case DIRECT:
-				return true;
-			default:
-				try {
-					ObjectLoader loader = reader.open(entry.getObjectId());
-					if (loader == null)
-						return true;
-
-					// We need to compute the length, but only if it is not
-					// a binary stream.
-					long dcInLen;
-					try (InputStream dcIn = new AutoLFInputStream(
-							loader.openStream(), true,
-							true /* abort if binary */)) {
-						dcInLen = computeLength(dcIn);
-					} catch (AutoLFInputStream.IsBinaryException e) {
-						return true;
-					}
-
-					try (InputStream dcIn = new AutoLFInputStream(
-							loader.openStream(), true)) {
-						byte[] autoCrLfHash = computeHash(dcIn, dcInLen);
-						boolean changed = getEntryObjectId()
-								.compareTo(autoCrLfHash, 0) != 0;
-						return changed;
-					}
-				} catch (IOException e) {
-					return true;
-				}
-			}
+			// Content differs: that's a real change
+			return true;
 		}
 	}
 

diff --git a/pom.xml b/pom.xml
index 6105556..f0bf41b 100644
--- a/pom.xml
+++ b/pom.xml

@@ -51,7 +51,7 @@
   <groupId>org.eclipse.jgit</groupId>
   <artifactId>org.eclipse.jgit-parent</artifactId>
   <packaging>pom</packaging>
-  <version>5.5.1-SNAPSHOT</version>
+  <version>5.6.0-SNAPSHOT</version>
 
   <name>JGit - Parent</name>
   <url>${jgit-url}</url>
@@ -352,7 +352,7 @@
         <plugin>
           <groupId>org.eclipse.cbi.maven.plugins</groupId>
           <artifactId>eclipse-jarsigner-plugin</artifactId>
-          <version>1.1.6</version>
+          <version>1.1.7</version>
         </plugin>
         <plugin>
           <groupId>org.eclipse.tycho.extras</groupId>
@@ -438,7 +438,7 @@
             <configuration>
               <rules>
                 <requireMavenVersion>
-                  <version>3.5.2</version>
+                  <version>3.6.2</version>
                 </requireMavenVersion>
               </rules>
             </configuration>
commit	7be05205ddfacc8a6d7445604629a4a4f6a3f90b	[log] [tgz]
author	Matthias Sohn <matthias.sohn@sap.com>	Tue Sep 17 00:42:26 2019 +0200
committer	Matthias Sohn <matthias.sohn@sap.com>	Tue Sep 17 00:42:32 2019 +0200
tree	39e46274943b3f315c48563dff4e58226f49625d
parent	687044beb0e2a85c145147af229a7baaac57b748 [diff]
parent	37c8b353441e3883594c0ea6820b4c3fbc711321 [diff]