Merge branch 'stable-6.3'

* stable-6.3:
  Prepare 6.3.1-SNAPSHOT builds
  JGit v6.3.0.202209071007-r
  JGit v6.3.0.2022009070944-r
  [merge] Fix merge conflicts with symlinks
  Update DEPENDENCIES for 6.3.0
  Update tycho to 2.7.5
  Revert "Adds FilteredRevCommit that can overwrites its parents in the DAG."
  Revert "Option to pass start RevCommit to be blamed on to the BlameGenerator."
  Prepare 6.3.0-SNAPSHOT builds
  JGit v6.3.0.202208161710-m3

Change-Id: Ia9430fb516dca795e25064a190704b70689af364

105 files changed, 1078 insertions, 1470 deletions

diff --git a/DEPENDENCIES b/DEPENDENCIES
index be7ab17cb4..ffb3d90584 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -24,10 +24,10 @@ maven/mavencentral/org.apache.sshd/sshd-core/2.8.0, Apache-2.0, approved, #2331
 maven/mavencentral/org.apache.sshd/sshd-osgi/2.8.0, Apache-2.0, approved, CQ23892
 maven/mavencentral/org.apache.sshd/sshd-sftp/2.8.0, Apache-2.0, approved, CQ23893
 maven/mavencentral/org.assertj/assertj-core/3.20.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.bouncycastle/bcpg-jdk15on/1.70, Apache-2.0, approved, #1713
-maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.70, MIT, approved, clearlydefined
-maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.70, MIT, approved, #1712
-maven/mavencentral/org.bouncycastle/bcutil-jdk15on/1.70, MIT, approved, clearlydefined
+maven/mavencentral/org.bouncycastle/bcpg-jdk18on/1.71, Apache-2.0, approved, #2665
+maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.71, MIT, approved, #2662
+maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.71, MIT AND LicenseRef-scancode-ocb-open-source-2013, approved, #2666
+maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.71, MIT, approved, #2663
 maven/mavencentral/org.eclipse.jetty.toolchain/jetty-servlet-api/4.0.6, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-http/10.0.6, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-io/10.0.6, EPL-2.0 OR Apache-2.0, approved, rt.jetty
@@ -35,29 +35,29 @@ maven/mavencentral/org.eclipse.jetty/jetty-security/10.0.6, EPL-2.0 OR Apache-2.
 maven/mavencentral/org.eclipse.jetty/jetty-server/10.0.6, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-servlet/10.0.6, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-util/10.0.6, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant.test/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.archive/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.gpg.bc/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.apache/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.server/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.test/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.http/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.ssh/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server.test/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.test/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm.test/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache.agent/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache.test/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.jsch/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.test/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ui/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit/6.2.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant.test/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.archive/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.gpg.bc/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.apache/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.server/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.test/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.http/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.ssh/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server.test/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.test/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm.test/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache.agent/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache.test/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.jsch/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.test/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ui/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit/6.3.0-SNAPSHOT, BSD-3-Clause, approved, technology.jgit
 maven/mavencentral/org.hamcrest/hamcrest-core/1.3, BSD-2-Clause, approved, CQ11429
 maven/mavencentral/org.mockito/mockito-core/2.23.0, Apache-2.0 AND MIT, approved, #958
 maven/mavencentral/org.objenesis/objenesis/2.6, Apache-2.0, approved, CQ15478
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index 1a19d60786..87a5f5a9c1 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 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ant.test
 Bundle-SymbolicName: org.eclipse.jgit.ant.test
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.ant.tasks;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.ant.tasks;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)",
  org.hamcrest.core;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml
index 49c2236145..bcd87a7428 100644
--- a/org.eclipse.jgit.ant.test/pom.xml
+++ b/org.eclipse.jgit.ant.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 0e9390434b..0d3e40f5c4 100644
--- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ant
 Bundle-SymbolicName: org.eclipse.jgit.ant
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.apache.tools.ant,
-  org.eclipse.jgit.storage.file;version="[6.3.0,6.4.0)"
+  org.eclipse.jgit.storage.file;version="[6.3.1,6.4.0)"
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.ant;version="6.3.0",
- org.eclipse.jgit.ant.tasks;version="6.3.0";
+Export-Package: org.eclipse.jgit.ant;version="6.3.1",
+ org.eclipse.jgit.ant.tasks;version="6.3.1";
   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 58c00f0aea..af7a021cb0 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-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.ant - Sources
 Bundle-SymbolicName: org.eclipse.jgit.ant.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml
index 7312bad66a..df207caad6 100644
--- a/org.eclipse.jgit.ant/pom.xml
+++ b/org.eclipse.jgit.ant/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 d07f148d32..42e207d22d 100644
--- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.archive
 Bundle-SymbolicName: org.eclipse.jgit.archive
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -13,17 +13,17 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)",
  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="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.nls;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.api;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.nls;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.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="6.3.0";
+Export-Package: org.eclipse.jgit.archive;version="6.3.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.api,
    org.apache.commons.compress.archivers,
    org.osgi.framework",
- org.eclipse.jgit.archive.internal;version="6.3.0";x-internal:=true
+ org.eclipse.jgit.archive.internal;version="6.3.1";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 45c379b54c..816fef300a 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-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.archive - Sources
 Bundle-SymbolicName: org.eclipse.jgit.archive.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml
index bf586e3e82..3376350ade 100644
--- a/org.eclipse.jgit.archive/pom.xml
+++ b/org.eclipse.jgit.archive/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.archive</artifactId>
diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml
index a27ca7bc17..6bd2ab58ad 100644
--- a/org.eclipse.jgit.benchmarks/pom.xml
+++ b/org.eclipse.jgit.benchmarks/pom.xml
@@ -14,7 +14,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.eclipse.jgit</groupId>
-  <version>6.3.0-SNAPSHOT</version>
+  <version>6.3.1-SNAPSHOT</version>
   <artifactId>org.eclipse.jgit.benchmarks</artifactId>
   <packaging>jar</packaging>
 
diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml
index 744e7af2e1..d148b72ecd 100644
--- a/org.eclipse.jgit.coverage/pom.xml
+++ b/org.eclipse.jgit.coverage/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -27,88 +27,88 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ant</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.archive</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.http.apache</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.http.server</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.lfs</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.lfs.server</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.pgm</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ui</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ssh.apache</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.test</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ant.test</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.http.test</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.pgm.test</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.lfs.test</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
index 3304b36d40..0eec0f63e4 100644
--- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test
 Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -12,9 +12,9 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)",
  org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)",
  org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)",
  org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)",
- org.eclipse.jgit.gpg.bc.internal;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.gpg.bc.internal.keys;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util.sha1;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.gpg.bc.internal;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.gpg.bc.internal.keys;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util.sha1;version="[6.3.1,6.4.0)",
  org.hamcrest;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml
index c8c05b3f55..5f169566dc 100644
--- a/org.eclipse.jgit.gpg.bc.test/pom.xml
+++ b/org.eclipse.jgit.gpg.bc.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.gpg.bc.test</artifactId>
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
index c0711f3247..02d9cfe4d4 100644
--- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
@@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.gpg.bc
 Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true
-Fragment-Host: org.eclipse.jgit;bundle-version="[6.3.0,6.4.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[6.3.1,6.4.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)",
  org.bouncycastle.asn1.cryptlib;version="[1.69.0,2.0.0)",
@@ -29,9 +29,9 @@ Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)",
  org.bouncycastle.util;version="[1.69.0,2.0.0)",
  org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)",
  org.bouncycastle.util.io;version="[1.69.0,2.0.0)",
- org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.annotations;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.api.errors;version="[6.3.1,6.4.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.gpg.bc;version="6.3.0",
- org.eclipse.jgit.gpg.bc.internal;version="6.3.0";x-friends:="org.eclipse.jgit.gpg.bc.test",
- org.eclipse.jgit.gpg.bc.internal.keys;version="6.3.0";x-friends:="org.eclipse.jgit.gpg.bc.test"
+Export-Package: org.eclipse.jgit.gpg.bc;version="6.3.1",
+ org.eclipse.jgit.gpg.bc.internal;version="6.3.1";x-friends:="org.eclipse.jgit.gpg.bc.test",
+ org.eclipse.jgit.gpg.bc.internal.keys;version="6.3.1";x-friends:="org.eclipse.jgit.gpg.bc.test"
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
index 1622e26fe0..795cbce18e 100644
--- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources
 Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml
index 47387ed17c..3110807a54 100644
--- a/org.eclipse.jgit.gpg.bc/pom.xml
+++ b/org.eclipse.jgit.gpg.bc/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.gpg.bc</artifactId>
diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index bcf5dbce1b..0587abf217 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-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.http.apache
 Bundle-SymbolicName: org.eclipse.jgit.http.apache
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
@@ -25,11 +25,11 @@ Import-Package: org.apache.http;version="[4.3.0,5.0.0)",
  org.apache.http.impl.conn;version="[4.4.0,5.0.0)",
  org.apache.http.params;version="[4.3.0,5.0.0)",
  org.apache.http.ssl;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.nls;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.http;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)"
-Export-Package: org.eclipse.jgit.transport.http.apache;version="6.3.0";
+ org.eclipse.jgit.annotations;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.nls;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.http;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)"
+Export-Package: org.eclipse.jgit.transport.http.apache;version="6.3.1";
   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 bbbef38c5b..fcc2df7776 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-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.http.apache - Sources
 Bundle-SymbolicName: org.eclipse.jgit.http.apache.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml
index c116a4da88..a7e4f3bf64 100644
--- a/org.eclipse.jgit.http.apache/pom.xml
+++ b/org.eclipse.jgit.http.apache/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 fe9d4baf24..2eb2978359 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-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.http.server
 Bundle-SymbolicName: org.eclipse.jgit.http.server
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.http.server;version="6.3.0",
- org.eclipse.jgit.http.server.glue;version="6.3.0";
+Export-Package: org.eclipse.jgit.http.server;version="6.3.1",
+ org.eclipse.jgit.http.server.glue;version="6.3.1";
   uses:="javax.servlet,javax.servlet.http",
- org.eclipse.jgit.http.server.resolver;version="6.3.0";
+ org.eclipse.jgit.http.server.resolver;version="6.3.1";
   uses:="org.eclipse.jgit.transport.resolver,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.transport,
@@ -18,14 +18,14 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: javax.servlet;version="[2.5.0,5.0.0)",
  javax.servlet.http;version="[2.5.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.transport.parser;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.nls;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.resolver;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)"
+ org.eclipse.jgit.annotations;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.nls;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.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 2db85df836..b9aefb0489 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-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.http.server - Sources
 Bundle-SymbolicName: org.eclipse.jgit.http.server.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index 89ee339b14..8364fc6dd2 100644
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 b752d6012c..d585f2862b 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-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.http.test
 Bundle-SymbolicName: org.eclipse.jgit.http.test
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -26,26 +26,26 @@ Import-Package: javax.servlet;version="[2.5.0,5.0.0)",
  org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)",
  org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)",
  org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)",
- org.eclipse.jgit.api;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.http.server;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.http.server.glue;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.http.server.resolver;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit.http;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.nls;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.http;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.http.apache;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.resolver;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.api;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.http.server;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.http.server.glue;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.http.server.resolver;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit.http;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.nls;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.http;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.http.apache;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)",
  org.hamcrest;version="[1.1.0,3.0.0)",
  org.hamcrest.core;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml
index cc8c351a70..f71782b145 100644
--- a/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 584da62913..30e33065ce 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-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit.http
 Bundle-SymbolicName: org.eclipse.jgit.junit.http
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
@@ -21,17 +21,17 @@ Import-Package: javax.servlet;version="[2.5.0,5.0.0)",
  org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)",
  org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)",
  org.eclipse.jetty.util.ssl;version="[10.0.0,11.0.0)",
- org.eclipse.jgit.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.http.server;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.resolver;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.http.server;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.3.1,6.4.0)",
  org.junit;version="[4.13,5.0.0)",
  org.slf4j.helpers;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit.http;version="6.3.0";
+Export-Package: org.eclipse.jgit.junit.http;version="6.3.1";
   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 d1d92267f0..d50a9a426b 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-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.junit.http - Sources
 Bundle-SymbolicName: org.eclipse.jgit.junit.http.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index b7a76123be..7020d027dd 100644
--- a/org.eclipse.jgit.junit.http/pom.xml
+++ b/org.eclipse.jgit.junit.http/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 d9f75de5e0..e87809021e 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-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit.ssh
 Bundle-SymbolicName: org.eclipse.jgit.junit.ssh
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
@@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.8.0,2.9.0)",
  org.apache.sshd.server.subsystem;version="[2.8.0,2.9.0)",
  org.apache.sshd.sftp;version="[2.8.0,2.9.0)",
  org.apache.sshd.sftp.server;version="[2.8.0,2.9.0)",
- org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.api;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.annotations;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.api;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.api.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.experimental.theories;version="[4.13,5.0.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit.ssh;version="6.3.0"
+Export-Package: org.eclipse.jgit.junit.ssh;version="6.3.1"
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 9d1b9d0993..8627975289 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-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources
 Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml
index 2e20d62413..ba82ed4d78 100644
--- a/org.eclipse.jgit.junit.ssh/pom.xml
+++ b/org.eclipse.jgit.junit.ssh/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 7ae6529a05..b2cb44bb29 100644
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@ -3,35 +3,35 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit
 Bundle-SymbolicName: org.eclipse.jgit.junit
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.api;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.dircache;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.pack;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.merge;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="6.3.0",
- org.eclipse.jgit.treewalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.treewalk.filter;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util.io;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util.time;version="[6.3.0,6.4.0)",
+Import-Package: org.eclipse.jgit.annotations;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.api;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.api.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.dircache;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.merge;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="6.3.1",
+ org.eclipse.jgit.treewalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util.io;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util.time;version="[6.3.1,6.4.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.rules;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)",
  org.junit.runners;version="[4.13,5.0.0)",
  org.junit.runners.model;version="[4.13,5.0.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit;version="6.3.0";
+Export-Package: org.eclipse.jgit.junit;version="6.3.1";
   uses:="org.eclipse.jgit.dircache,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
@@ -44,4 +44,4 @@ Export-Package: org.eclipse.jgit.junit;version="6.3.0";
    org.junit.runners.model,
    org.junit.runner,
    org.eclipse.jgit.util.time",
- org.eclipse.jgit.junit.time;version="6.3.0";uses:="org.eclipse.jgit.util.time"
+ org.eclipse.jgit.junit.time;version="6.3.1";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 61c2da5d1f..4daa5769a7 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-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.junit - Sources
 Bundle-SymbolicName: org.eclipse.jgit.junit.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index 1e548491d1..fe2211ba5e 100644
--- a/org.eclipse.jgit.junit/pom.xml
+++ b/org.eclipse.jgit.junit/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.junit</artifactId>
diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java
index 54e4a09ee5..483b9a7c81 100644
--- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java
+++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java
@@ -276,6 +276,24 @@ public class TestRepository<R extends Repository> implements AutoCloseable {
 	}
 
 	/**
+	 * Construct a symlink mode tree entry.
+	 *
+	 * @param path
+	 *            path of the symlink.
+	 * @param blob
+	 *            a blob, previously constructed in the repository.
+	 * @return the entry.
+	 * @throws Exception
+	 * @since 6.3
+	 */
+	public DirCacheEntry link(String path, RevBlob blob) throws Exception {
+		DirCacheEntry e = new DirCacheEntry(path);
+		e.setFileMode(FileMode.SYMLINK);
+		e.setObjectId(blob);
+		return e;
+	}
+
+	/**
 	 * Construct a tree from a specific listing of file entries.
 	 *
 	 * @param entries
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 757e0363ff..5962ebb72e 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-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs.server.test
 Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -26,24 +26,24 @@ Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
  org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)",
  org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)",
  org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)",
- org.eclipse.jgit.api;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit.http;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.server;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.server.fs;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.test;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.treewalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.treewalk.filter;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.api;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.api.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit.http;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.server;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.test;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.treewalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)",
  org.hamcrest.core;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.rules;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml
index 77b6ea5378..baa6a9d392 100644
--- a/org.eclipse.jgit.lfs.server.test/pom.xml
+++ b/org.eclipse.jgit.lfs.server.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 f2a8ff00a8..1e7dc5f098 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-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs.server
 Bundle-SymbolicName: org.eclipse.jgit.lfs.server
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs.server;version="6.3.0";
+Export-Package: org.eclipse.jgit.lfs.server;version="6.3.1";
   uses:="javax.servlet.http,
    org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.fs;version="6.3.0";
+ org.eclipse.jgit.lfs.server.fs;version="6.3.1";
   uses:="javax.servlet,
    javax.servlet.http,
    org.eclipse.jgit.lfs.server,
    org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.internal;version="6.3.0";x-internal:=true,
- org.eclipse.jgit.lfs.server.s3;version="6.3.0";
+ org.eclipse.jgit.lfs.server.internal;version="6.3.1";x-internal:=true,
+ org.eclipse.jgit.lfs.server.s3;version="6.3.1";
   uses:="org.eclipse.jgit.lfs.server,
    org.eclipse.jgit.lfs.lib"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)",
  javax.servlet.annotation;version="[3.1.0,5.0.0)",
  javax.servlet.http;version="[3.1.0,5.0.0)",
  org.apache.http;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.internal;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.nls;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.http;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.http.apache;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.annotations;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.internal;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.nls;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.http;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.http.apache;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.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 529a225088..b42fb0a31d 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-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.lfs.server - Sources
 Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml
index 4e055731db..79449386f6 100644
--- a/org.eclipse.jgit.lfs.server/pom.xml
+++ b/org.eclipse.jgit.lfs.server/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 3998bcfc81..e849423dc4 100644
--- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
@@ -3,27 +3,27 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs.test
 Bundle-SymbolicName: org.eclipse.jgit.lfs.test
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: org.eclipse.jgit.api;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.attributes;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.internal;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.http;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.treewalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.treewalk.filter;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
+Import-Package: org.eclipse.jgit.api;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.attributes;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.internal;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.http;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.treewalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)",
  org.hamcrest.core;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)",
  org.junit.runners;version="[4.13,5.0.0)"
-Export-Package: org.eclipse.jgit.lfs.test;version="6.3.0";x-friends:="org.eclipse.jgit.lfs.server.test"
+Export-Package: org.eclipse.jgit.lfs.test;version="6.3.1";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 65cee9340c..ab82454421 100644
--- a/org.eclipse.jgit.lfs.test/pom.xml
+++ b/org.eclipse.jgit.lfs.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.lfs.test</artifactId>
diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
index bc94b5e09d..f1aee3a854 100644
--- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
@@ -3,32 +3,32 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs
 Bundle-SymbolicName: org.eclipse.jgit.lfs
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs;version="6.3.0",
- org.eclipse.jgit.lfs.errors;version="6.3.0",
- org.eclipse.jgit.lfs.internal;version="6.3.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="6.3.0"
+Export-Package: org.eclipse.jgit.lfs;version="6.3.1",
+ org.eclipse.jgit.lfs.errors;version="6.3.1",
+ org.eclipse.jgit.lfs.internal;version="6.3.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="6.3.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: com.google.gson;version="[2.8.2,3.0.0)",
  com.google.gson.stream;version="[2.8.2,3.0.0)",
- org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)";resolution:=optional,
- org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.attributes;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.diff;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.dircache;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.hooks;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.nls;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.storage.pack;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.http;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.treewalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.treewalk.filter;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util.io;version="[6.3.0,6.4.0)"
+ org.eclipse.jgit.annotations;version="[6.3.1,6.4.0)";resolution:=optional,
+ org.eclipse.jgit.api.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.attributes;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.diff;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.dircache;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.hooks;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.nls;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.storage.pack;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.http;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.treewalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util.io;version="[6.3.1,6.4.0)"
diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
index d3b28b20a9..e1ff6fa29d 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-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.lfs - Sources
 Bundle-SymbolicName: org.eclipse.jgit.lfs.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml
index e838d5c494..abf2ff7f5d 100644
--- a/org.eclipse.jgit.lfs/pom.xml
+++ b/org.eclipse.jgit.lfs/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 8861e68248..75f416ac80 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="6.3.0.qualifier"
+      version="6.3.1.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 8f9c0ae8b2..ee1104886d 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
index 744dd0a651..e73ae31f99 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.gpg.bc"
       label="%featureName"
-      version="6.3.0.qualifier"
+      version="6.3.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.jgit" version="6.3.0" match="equivalent"/>
+      <import plugin="org.eclipse.jgit" version="6.3.1" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
index ae93125c1e..1bbf567979 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 a6d76e609c..58d484f6ff 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="6.3.0.qualifier"
+      version="6.3.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.jgit" version="6.3.0" match="equivalent"/>
+      <import plugin="org.eclipse.jgit" version="6.3.1" 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 017835bb47..00ff3ce563 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
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 b885f86a25..9e2aec37ed 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="6.3.0.qualifier"
+      version="6.3.1.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="6.3.0" match="equivalent"/>
+      <import plugin="org.eclipse.jgit" version="6.3.1" 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 ee33bf1f9a..ecfcf55592 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
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 4e1169eb64..0996158503 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="6.3.0.qualifier"
+      version="6.3.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="6.3.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="6.3.1" 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 d82c37128e..6c415aae01 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
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 0c003e9d64..9aa6af124e 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="6.3.0.qualifier"
+      version="6.3.1.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="6.3.0" match="equivalent"/>
-      <import feature="org.eclipse.jgit.lfs" version="6.3.0" match="equivalent"/>
-      <import feature="org.eclipse.jgit.ssh.apache" version="6.3.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="6.3.1" match="equivalent"/>
+      <import feature="org.eclipse.jgit.lfs" version="6.3.1" match="equivalent"/>
+      <import feature="org.eclipse.jgit.ssh.apache" version="6.3.1" 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 d1428dcd9b..47a6a203b9 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
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 39a1f7ee59..9ed0f5ebb5 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 fd80e1d48c..fb5b764ac5 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="6.3.0.qualifier"
+      version="6.3.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="6.3.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="6.3.1" 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 67317e56f0..e558c89f3a 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
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.eclipse.jgit.feature</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>6.3.0-SNAPSHOT</version>
+      <version>6.3.1-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 5e5818ee0e..3cecf6d83a 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="6.3.0.qualifier"
+      version="6.3.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="6.3.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="6.3.1" 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 81c9001b72..92a0300632 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
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
index e4d852292d..a8bae00e99 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.ssh.jsch"
       label="%featureName"
-      version="6.3.0.qualifier"
+      version="6.3.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.jgit" version="6.3.0" match="equivalent"/>
+      <import plugin="org.eclipse.jgit" version="6.3.1" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
index 48603053da..bf08c98088 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 1ec326c240..8861f40dc8 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 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JGit Target Platform Bundle
 Bundle-SymbolicName: org.eclipse.jgit.target
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.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 6cbcca5da7..0baf5ac81c 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 56946faeca..bebd2a4a82 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -16,14 +16,14 @@
 
   <groupId>org.eclipse.jgit</groupId>
   <artifactId>jgit.tycho.parent</artifactId>
-  <version>6.3.0-SNAPSHOT</version>
+  <version>6.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>JGit Tycho Parent</name>
 
   <properties>
     <java.version>11</java.version>
-    <tycho-version>2.6.0</tycho-version>
+    <tycho-version>2.7.5</tycho-version>
     <tycho-extras-version>${tycho-version}</tycho-extras-version>
     <target-platform>jgit-4.17</target-platform>
   </properties>
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
index 602628eb3d..cd947f00f6 100644
--- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
@@ -3,30 +3,30 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.pgm.test
 Bundle-SymbolicName: org.eclipse.jgit.pgm.test
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: org.eclipse.jgit.api;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.diff;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.dircache;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.diffmergetool;version="6.3.0",
- org.eclipse.jgit.internal.storage.file;version="6.3.0",
- org.eclipse.jgit.junit;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib.internal;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.merge;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.pgm;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.pgm.internal;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.pgm.opt;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.treewalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util.io;version="[6.3.0,6.4.0)",
+Import-Package: org.eclipse.jgit.api;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.api.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.diff;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.dircache;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.diffmergetool;version="6.3.1",
+ org.eclipse.jgit.internal.storage.file;version="6.3.1",
+ org.eclipse.jgit.junit;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib.internal;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.merge;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.pgm;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.pgm.internal;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.pgm.opt;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.treewalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util.io;version="[6.3.1,6.4.0)",
  org.hamcrest.core;bundle-version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.rules;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml
index c252068bdd..fd87d922e7 100644
--- a/org.eclipse.jgit.pgm.test/pom.xml
+++ b/org.eclipse.jgit.pgm.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-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 925924a5db..39ea131291 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.pgm
 Bundle-SymbolicName: org.eclipse.jgit.pgm
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -14,49 +14,49 @@ Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
  org.eclipse.jetty.servlet;version="[10.0.0,11.0.0)",
  org.eclipse.jetty.util;version="[10.0.0,11.0.0)",
  org.eclipse.jetty.util.component;version="[10.0.0,11.0.0)",
- org.eclipse.jgit.api;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.archive;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.awtui;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.blame;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.diff;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.dircache;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.gitrepo;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.diffmergetool;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.io;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.pack;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.server;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.server.fs;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs.server.s3;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.merge;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib.internal;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.nls;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.notes;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revplot;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk.filter;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.storage.pack;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.http.apache;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.resolver;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.ssh.jsch;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.sshd;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.treewalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.treewalk.filter;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util.io;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.api;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.api.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.archive;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.awtui;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.blame;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.diff;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.dircache;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.gitrepo;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.diffmergetool;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.io;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.server;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs.server.s3;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.merge;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib.internal;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.nls;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.notes;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revplot;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk.filter;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.storage.pack;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.http.apache;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.ssh.jsch;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.sshd;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.treewalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util.io;version="[6.3.1,6.4.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="6.3.0";
+Export-Package: org.eclipse.jgit.console;version="6.3.1";
  uses:="org.eclipse.jgit.transport,
   org.eclipse.jgit.util",
- org.eclipse.jgit.pgm;version="6.3.0";
+ org.eclipse.jgit.pgm;version="6.3.1";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.util.io,
    org.eclipse.jgit.awtui,
@@ -68,14 +68,14 @@ Export-Package: org.eclipse.jgit.console;version="6.3.0";
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.api,
    javax.swing",
- org.eclipse.jgit.pgm.debug;version="6.3.0";
+ org.eclipse.jgit.pgm.debug;version="6.3.1";
   uses:="org.eclipse.jgit.util.io,
    org.eclipse.jgit.pgm,
    org.eclipse.jetty.servlet",
- org.eclipse.jgit.pgm.internal;version="6.3.0";
+ org.eclipse.jgit.pgm.internal;version="6.3.1";
   x-friends:="org.eclipse.jgit.pgm.test,
    org.eclipse.jgit.test",
- org.eclipse.jgit.pgm.opt;version="6.3.0";
+ org.eclipse.jgit.pgm.opt;version="6.3.1";
   uses:="org.kohsuke.args4j,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
index d0b60de56e..4850be9008 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-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.pgm - Sources
 Bundle-SymbolicName: org.eclipse.jgit.pgm.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index cb8b418ed2..2a9f5d70f1 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.pgm</artifactId>
diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF
index efbfdc0cfb..ac14d95561 100644
--- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.3.0,6.4.0)"
+Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.3.1,6.4.0)"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: org.eclipse.jgit.transport.sshd;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.nls;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)"
+Import-Package: org.eclipse.jgit.transport.sshd;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.nls;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)"
 Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)",
  com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)"
-Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="6.3.0";x-internal:=true
+Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="6.3.1";x-internal:=true
diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF
index d5580ed301..89a56b741d 100644
--- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources
 Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml
index eb08f94038..e43e3fcc52 100644
--- a/org.eclipse.jgit.ssh.apache.agent/pom.xml
+++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ssh.apache.agent</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 2e233af9f3..68b9ea03a0 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-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test
 Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -21,16 +21,16 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.8.0,2.9.0)",
  org.apache.sshd.core;version="[2.8.0,2.9.0)",
  org.apache.sshd.server;version="[2.8.0,2.9.0)",
  org.apache.sshd.server.forward;version="[2.8.0,2.9.0)",
- org.eclipse.jgit.api;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit.ssh;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.sshd;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.sshd.agent;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.api;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.api.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit.ssh;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.sshd;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.sshd.agent;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)",
  org.hamcrest;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.experimental.theories;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml
index 6c458732ed..fd882bd52f 100644
--- a/org.eclipse.jgit.ssh.apache.test/pom.xml
+++ b/org.eclipse.jgit.ssh.apache.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index b06a3ce77b..0ff3c8d66d 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-SymbolicName: org.eclipse.jgit.ssh.apache
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.3.0";x-internal:=true;
+Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.3.1";x-internal:=true;
   uses:="org.apache.sshd.client,
    org.apache.sshd.client.auth,
    org.apache.sshd.client.auth.keyboard,
@@ -23,17 +23,17 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.3.0";x-inter
    org.apache.sshd.common.signature,
    org.apache.sshd.common.util.buffer,
    org.eclipse.jgit.transport",
- org.eclipse.jgit.internal.transport.sshd.agent;version="6.3.0";x-internal:=true,
- org.eclipse.jgit.internal.transport.sshd.auth;version="6.3.0";x-internal:=true,
- org.eclipse.jgit.internal.transport.sshd.proxy;version="6.3.0";x-friends:="org.eclipse.jgit.ssh.apache.test",
- org.eclipse.jgit.transport.sshd;version="6.3.0";
+ org.eclipse.jgit.internal.transport.sshd.agent;version="6.3.1";x-internal:=true,
+ org.eclipse.jgit.internal.transport.sshd.auth;version="6.3.1";x-internal:=true,
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="6.3.1";x-friends:="org.eclipse.jgit.ssh.apache.test",
+ org.eclipse.jgit.transport.sshd;version="6.3.1";
   uses:="org.eclipse.jgit.transport,
    org.apache.sshd.client.config.hosts,
    org.apache.sshd.common.keyprovider,
    org.eclipse.jgit.util,
    org.apache.sshd.client.session,
    org.apache.sshd.client.keyverifier",
- org.eclipse.jgit.transport.sshd.agent;version="6.3.0"
+ org.eclipse.jgit.transport.sshd.agent;version="6.3.1"
 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)",
  org.apache.sshd.agent;version="[2.8.0,2.9.0)",
  org.apache.sshd.client;version="[2.8.0,2.9.0)",
@@ -86,12 +86,12 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)",
  org.apache.sshd.sftp;version="[2.8.0,2.9.0)",
  org.apache.sshd.sftp.client;version="[2.8.0,2.9.0)",
  org.apache.sshd.sftp.common;version="[2.8.0,2.9.0)",
- org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.fnmatch;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.nls;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.annotations;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.fnmatch;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.nls;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.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 afee593d3a..406a56db23 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-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources
 Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml
index 270d6dd43b..3a97b3a57f 100644
--- a/org.eclipse.jgit.ssh.apache/pom.xml
+++ b/org.eclipse.jgit.ssh.apache/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ssh.apache</artifactId>
diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
index a0a58e52f6..5a47db3036 100644
--- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
@@ -3,18 +3,18 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test
 Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)",
- org.eclipse.jgit.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit.ssh;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.ssh.jsch;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit.ssh;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.ssh.jsch;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)",
  org.hamcrest;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.experimental.theories;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml
index a6504f19e6..2d5b023ce9 100644
--- a/org.eclipse.jgit.ssh.jsch.test/pom.xml
+++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ssh.jsch.test</artifactId>
diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
index 8bbad782cc..18cb794cfc 100644
--- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
@@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ssh.jsch
 Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true
-Fragment-Host: org.eclipse.jgit;bundle-version="[6.3.0,6.4.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[6.3.1,6.4.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.3.0"
+Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.3.1"
 Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)",
- org.eclipse.jgit.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.nls;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util.io;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.nls;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util.io;version="[6.3.1,6.4.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
index 15904dbb4b..4ecfbe7505 100644
--- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources
 Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml
index a6d35c3215..d1d23917a8 100644
--- a/org.eclipse.jgit.ssh.jsch/pom.xml
+++ b/org.eclipse.jgit.ssh.jsch/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index bb155eace0..97fe1be744 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.test
 Bundle-SymbolicName: org.eclipse.jgit.test
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -16,62 +16,62 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
  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.assertj.core.api;version="[3.14.0,4.0.0)",
- org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.api;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.archive;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.attributes;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.awtui;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.blame;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.diff;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.dircache;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.events;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.fnmatch;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.gitrepo;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.hooks;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.ignore;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.ignore.internal;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.diff;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.diffmergetool;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.fsck;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.io;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.pack;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.transport.connectivity;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.transport.http;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.transport.parser;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.junit.time;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lfs;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib.internal;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.logging;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.merge;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.nls;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.notes;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.patch;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.pgm;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.pgm.internal;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revplot;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk.filter;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.storage.file;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.storage.pack;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.submodule;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.http;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport.resolver;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.treewalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.treewalk.filter;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util.io;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util.sha1;version="[6.3.0,6.4.0)",
+ org.eclipse.jgit.annotations;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.api;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.api.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.archive;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.attributes;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.awtui;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.blame;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.diff;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.dircache;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.events;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.fnmatch;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.gitrepo;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.hooks;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.ignore;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.ignore.internal;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.diff;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.diffmergetool;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.fsck;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.io;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.transport.connectivity;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.transport.http;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.junit.time;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lfs;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib.internal;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.logging;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.merge;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.nls;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.notes;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.patch;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.pgm;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.pgm.internal;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revplot;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk.filter;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.storage.file;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.storage.pack;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.submodule;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.http;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.treewalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util.io;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util.sha1;version="[6.3.1,6.4.0)",
  org.hamcrest;version="[1.1.0,3.0.0)",
  org.hamcrest.collection;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml
index 93036b264f..3eb762f0c2 100644
--- a/org.eclipse.jgit.test/pom.xml
+++ b/org.eclipse.jgit.test/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.test</artifactId>
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/blame/BlameGeneratorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/blame/BlameGeneratorTest.java
index b175ead8ec..f47f447375 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/blame/BlameGeneratorTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/blame/BlameGeneratorTest.java
@@ -13,247 +13,50 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import java.util.Iterator;
-
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.blame.BlameGenerator;
 import org.eclipse.jgit.blame.BlameResult;
 import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.merge.MergeStrategy;
-import org.eclipse.jgit.revwalk.FilteredRevCommit;
 import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevWalk;
 import org.junit.Test;
 
 /** Unit tests of {@link BlameGenerator}. */
 public class BlameGeneratorTest extends RepositoryTestCase {
-
-	public static final String OTHER_FILE = "other_file.txt";
-
-	public static final String INTERESTING_FILE = "interesting_file.txt";
-
 	@Test
-	public void testSingleBlame() throws Exception {
-
-		/**
-		 * <pre>
-		 * (ts) 	OTHER_FILE			INTERESTING_FILE
-		 * 1 		a
-		 * 2	 	a, b
-		 * 3							1, 2				c1 <--
-		 * 4	 	a, b, c										 |
-		 * 5							1, 2, 3				c2---
-		 * </pre>
-		 */
-		try (Git git = new Git(db);
-				RevWalk revWalk = new RevWalk(git.getRepository())) {
-			writeTrashFile(OTHER_FILE, join("a"));
-			git.add().addFilepattern(OTHER_FILE).call();
-			git.commit().setMessage("create file").call();
-
-			writeTrashFile(OTHER_FILE, join("a", "b"));
-			git.add().addFilepattern(OTHER_FILE).call();
-			git.commit().setMessage("amend file").call();
-
-			writeTrashFile(INTERESTING_FILE, join("1", "2"));
-			git.add().addFilepattern(INTERESTING_FILE).call();
+	public void testBoundLineDelete() throws Exception {
+		try (Git git = new Git(db)) {
+			String[] content1 = new String[] { "first", "second" };
+			writeTrashFile("file.txt", join(content1));
+			git.add().addFilepattern("file.txt").call();
 			RevCommit c1 = git.commit().setMessage("create file").call();
 
-			writeTrashFile(OTHER_FILE, join("a", "b", "c"));
-			git.add().addFilepattern(OTHER_FILE).call();
-			git.commit().setMessage("amend file").call();
-
-			writeTrashFile(INTERESTING_FILE, join("1", "2", "3"));
-			git.add().addFilepattern(INTERESTING_FILE).call();
-			RevCommit c2 = git.commit().setMessage("amend file").call();
-
-			RevCommit filteredC1 = new FilteredRevCommit(c1);
-			RevCommit filteredC2 = new FilteredRevCommit(c2, filteredC1);
-
-			revWalk.parseHeaders(filteredC2);
+			String[] content2 = new String[] { "third", "first", "second" };
+			writeTrashFile("file.txt", join(content2));
+			git.add().addFilepattern("file.txt").call();
+			RevCommit c2 = git.commit().setMessage("create file").call();
 
-			try (BlameGenerator generator = new BlameGenerator(db,
-					INTERESTING_FILE)) {
-				generator.push(filteredC2);
+			try (BlameGenerator generator = new BlameGenerator(db, "file.txt")) {
+				generator.push(null, db.resolve(Constants.HEAD));
 				assertEquals(3, generator.getResultContents().size());
 
 				assertTrue(generator.next());
 				assertEquals(c2, generator.getSourceCommit());
 				assertEquals(1, generator.getRegionLength());
-				assertEquals(2, generator.getResultStart());
-				assertEquals(3, generator.getResultEnd());
-				assertEquals(2, generator.getSourceStart());
-				assertEquals(3, generator.getSourceEnd());
-				assertEquals(INTERESTING_FILE, generator.getSourcePath());
-
-				assertTrue(generator.next());
-				assertEquals(c1, generator.getSourceCommit());
-				assertEquals(2, generator.getRegionLength());
 				assertEquals(0, generator.getResultStart());
-				assertEquals(2, generator.getResultEnd());
+				assertEquals(1, generator.getResultEnd());
 				assertEquals(0, generator.getSourceStart());
-				assertEquals(2, generator.getSourceEnd());
-				assertEquals(INTERESTING_FILE, generator.getSourcePath());
-
-				assertFalse(generator.next());
-			}
-		}
-	}
-
-	@Test
-	public void testMergeSingleBlame() throws Exception {
-		try (Git git = new Git(db);
-				RevWalk revWalk = new RevWalk(git.getRepository())) {
-
-			/**
-			 *
-			 *
-			 * <pre>
-			 *  refs/heads/master
-			 *      A
-			 *     / \       		 refs/heads/side
-			 *    /   ---------------->  side
-			 *   /                        |
-			 *  merge <-------------------
-			 * </pre>
-			 */
-
-			writeTrashFile(INTERESTING_FILE, join("1", "2"));
-			git.add().addFilepattern(INTERESTING_FILE).call();
-			RevCommit c1 = git.commit().setMessage("create file").call();
-
-			createBranch(c1, "refs/heads/side");
-			checkoutBranch("refs/heads/side");
-			writeTrashFile(INTERESTING_FILE, join("1", "2", "3", "4"));
-			git.add().addFilepattern(INTERESTING_FILE).call();
-			RevCommit sideCommit = git.commit()
-					.setMessage("amend file in another branch").call();
-
-			checkoutBranch("refs/heads/master");
-			git.merge().setMessage("merge").include(sideCommit)
-					.setStrategy(MergeStrategy.RESOLVE).call();
-
-			Iterator<RevCommit> it = git.log().call().iterator();
-			RevCommit mergeCommit = it.next();
-
-			RevCommit filteredC1 = new FilteredRevCommit(c1);
-			RevCommit filteredSide = new FilteredRevCommit(sideCommit,
-					filteredC1);
-			RevCommit filteredMerge = new FilteredRevCommit(mergeCommit,
-					filteredSide, filteredC1);
-
-			revWalk.parseHeaders(filteredMerge);
-
-			try (BlameGenerator generator = new BlameGenerator(db,
-					INTERESTING_FILE)) {
-				generator.push(filteredMerge);
-				assertEquals(4, generator.getResultContents().size());
-
-				assertTrue(generator.next());
-				assertEquals(mergeCommit, generator.getSourceCommit());
-				assertEquals(2, generator.getRegionLength());
-				assertEquals(2, generator.getResultStart());
-				assertEquals(4, generator.getResultEnd());
-				assertEquals(2, generator.getSourceStart());
-				assertEquals(4, generator.getSourceEnd());
-				assertEquals(INTERESTING_FILE, generator.getSourcePath());
+				assertEquals(1, generator.getSourceEnd());
+				assertEquals("file.txt", generator.getSourcePath());
 
 				assertTrue(generator.next());
-				assertEquals(filteredC1, generator.getSourceCommit());
+				assertEquals(c1, generator.getSourceCommit());
 				assertEquals(2, generator.getRegionLength());
-				assertEquals(0, generator.getResultStart());
-				assertEquals(2, generator.getResultEnd());
-				assertEquals(0, generator.getSourceStart());
-				assertEquals(2, generator.getSourceEnd());
-				assertEquals(INTERESTING_FILE, generator.getSourcePath());
-
-				assertFalse(generator.next());
-			}
-		}
-	}
-
-	@Test
-	public void testMergeBlame() throws Exception {
-		try (Git git = new Git(db);
-				RevWalk revWalk = new RevWalk(git.getRepository())) {
-
-			/**
-			 *
-			 *
-			 * <pre>
-			 *  refs/heads/master
-			 *      A
-			 *     / \       		 refs/heads/side
-			 *    B   ---------------->  side
-			 *   /                        |
-			 *  merge <-------------------
-			 * </pre>
-			 */
-			writeTrashFile(INTERESTING_FILE, join("1", "2"));
-			git.add().addFilepattern(INTERESTING_FILE).call();
-			RevCommit c1 = git.commit().setMessage("create file").call();
-
-			createBranch(c1, "refs/heads/side");
-			checkoutBranch("refs/heads/side");
-			writeTrashFile(INTERESTING_FILE, join("1", "2", "3"));
-			git.add().addFilepattern(INTERESTING_FILE).call();
-			RevCommit sideCommit = git.commit().setMessage("amend file").call();
-
-			checkoutBranch("refs/heads/master");
-			writeTrashFile(INTERESTING_FILE, join("1", "2", "4"));
-			git.add().addFilepattern(INTERESTING_FILE).call();
-			RevCommit c2 = git.commit().setMessage("delete and amend file")
-					.call();
-
-			git.merge().setMessage("merge").include(sideCommit)
-					.setStrategy(MergeStrategy.RESOLVE).call();
-			writeTrashFile(INTERESTING_FILE, join("1", "2", "3", "4"));
-			git.add().addFilepattern(INTERESTING_FILE).call();
-			RevCommit mergeCommit = git.commit().setMessage("merge commit")
-					.call();
-
-			RevCommit filteredC1 = new FilteredRevCommit(c1);
-			RevCommit filteredSide = new FilteredRevCommit(sideCommit,
-					filteredC1);
-			RevCommit filteredC2 = new FilteredRevCommit(c2, filteredC1);
-
-			RevCommit filteredMerge = new FilteredRevCommit(mergeCommit,
-					filteredSide, filteredC2);
-
-			revWalk.parseHeaders(filteredMerge);
-
-			try (BlameGenerator generator = new BlameGenerator(db,
-					INTERESTING_FILE)) {
-				generator.push(filteredMerge);
-				assertEquals(4, generator.getResultContents().size());
-
-				assertTrue(generator.next());
-				assertEquals(filteredC2, generator.getSourceCommit());
-				assertEquals(1, generator.getRegionLength());
-				assertEquals(3, generator.getResultStart());
-				assertEquals(4, generator.getResultEnd());
-				assertEquals(2, generator.getSourceStart());
-				assertEquals(3, generator.getSourceEnd());
-				assertEquals(INTERESTING_FILE, generator.getSourcePath());
-
-				assertTrue(generator.next());
-				assertEquals(filteredSide, generator.getSourceCommit());
-				assertEquals(1, generator.getRegionLength());
-				assertEquals(2, generator.getResultStart());
+				assertEquals(1, generator.getResultStart());
 				assertEquals(3, generator.getResultEnd());
-				assertEquals(2, generator.getSourceStart());
-				assertEquals(3, generator.getSourceEnd());
-				assertEquals(INTERESTING_FILE, generator.getSourcePath());
-
-				assertTrue(generator.next());
-				assertEquals(filteredC1, generator.getSourceCommit());
-				assertEquals(2, generator.getRegionLength());
-				assertEquals(0, generator.getResultStart());
-				assertEquals(2, generator.getResultEnd());
 				assertEquals(0, generator.getSourceStart());
 				assertEquals(2, generator.getSourceEnd());
-				assertEquals(INTERESTING_FILE, generator.getSourcePath());
+				assertEquals("file.txt", generator.getSourcePath());
 
 				assertFalse(generator.next());
 			}
@@ -261,83 +64,6 @@ public class BlameGeneratorTest extends RepositoryTestCase {
 	}
 
 	@Test
-	public void testSingleBlame_compareWithWalk() throws Exception {
-		/**
-		 * <pre>
-		 * (ts) 	OTHER_FILE			INTERESTING_FILE
-		 * 1 		a
-		 * 2	 	a, b
-		 * 3							1, 2				c1 <--
-		 * 4	 	a, b, c										 |
-		 * 6							3, 1, 2				c2---
-		 * </pre>
-		 */
-		try (Git git = new Git(db);
-				RevWalk revWalk = new RevWalk(git.getRepository())) {
-			writeTrashFile(OTHER_FILE, join("a"));
-			git.add().addFilepattern(OTHER_FILE).call();
-			git.commit().setMessage("create file").call();
-
-			writeTrashFile(OTHER_FILE, join("a", "b"));
-			git.add().addFilepattern(OTHER_FILE).call();
-			git.commit().setMessage("amend file").call();
-
-			writeTrashFile(INTERESTING_FILE, join("1", "2"));
-			git.add().addFilepattern(INTERESTING_FILE).call();
-			RevCommit c1 = git.commit().setMessage("create file").call();
-
-			writeTrashFile(OTHER_FILE, join("a", "b", "c"));
-			git.add().addFilepattern(OTHER_FILE).call();
-			git.commit().setMessage("amend file").call();
-
-			writeTrashFile(INTERESTING_FILE, join("3", "1", "2"));
-			git.add().addFilepattern(INTERESTING_FILE).call();
-			RevCommit c2 = git.commit().setMessage("prepend").call();
-
-			RevCommit filteredC1 = new FilteredRevCommit(c1);
-			RevCommit filteredC2 = new FilteredRevCommit(c2, filteredC1);
-
-			revWalk.parseHeaders(filteredC2);
-
-			try (BlameGenerator g1 = new BlameGenerator(db, INTERESTING_FILE);
-					BlameGenerator g2 = new BlameGenerator(db,
-							INTERESTING_FILE)) {
-				g1.push(null, c2);
-				g2.push(null, filteredC2);
-
-				assertEquals(g1.getResultContents().size(),
-						g2.getResultContents().size()); // 3
-
-				assertTrue(g1.next());
-				assertTrue(g2.next());
-
-				assertEquals(g1.getSourceCommit(), g2.getSourceCommit()); // c2
-				assertEquals(INTERESTING_FILE, g1.getSourcePath());
-				assertEquals(g1.getRegionLength(), g2.getRegionLength()); // 1
-				assertEquals(g1.getResultStart(), g2.getResultStart()); // 0
-				assertEquals(g1.getResultEnd(), g2.getResultEnd()); // 1
-				assertEquals(g1.getSourceStart(), g2.getSourceStart()); // 0
-				assertEquals(g1.getSourceEnd(), g2.getSourceEnd()); // 1
-				assertEquals(g1.getSourcePath(), g2.getSourcePath()); // INTERESTING_FILE
-
-				assertTrue(g1.next());
-				assertTrue(g2.next());
-
-				assertEquals(g1.getSourceCommit(), g2.getSourceCommit()); // c1
-				assertEquals(g1.getRegionLength(), g2.getRegionLength()); // 2
-				assertEquals(g1.getResultStart(), g2.getResultStart()); // 1
-				assertEquals(g1.getResultEnd(), g2.getResultEnd()); // 3
-				assertEquals(g1.getSourceStart(), g2.getSourceStart()); // 0
-				assertEquals(g1.getSourceEnd(), g2.getSourceEnd()); // 2
-				assertEquals(g1.getSourcePath(), g2.getSourcePath()); // INTERESTING_FILE
-
-				assertFalse(g1.next());
-				assertFalse(g2.next());
-			}
-		}
-	}
-
-	@Test
 	public void testRenamedBoundLineDelete() throws Exception {
 		try (Git git = new Git(db)) {
 			final String FILENAME_1 = "subdir/file1.txt";
@@ -361,8 +87,7 @@ public class BlameGeneratorTest extends RepositoryTestCase {
 			git.add().addFilepattern(FILENAME_2).call();
 			RevCommit c2 = git.commit().setMessage("change file2").call();
 
-			try (BlameGenerator generator = new BlameGenerator(db,
-					FILENAME_2)) {
+			try (BlameGenerator generator = new BlameGenerator(db, FILENAME_2)) {
 				generator.push(null, db.resolve(Constants.HEAD));
 				assertEquals(3, generator.getResultContents().size());
 
@@ -388,8 +113,7 @@ public class BlameGeneratorTest extends RepositoryTestCase {
 			}
 
 			// and test again with other BlameGenerator API:
-			try (BlameGenerator generator = new BlameGenerator(db,
-					FILENAME_2)) {
+			try (BlameGenerator generator = new BlameGenerator(db, FILENAME_2)) {
 				generator.push(null, db.resolve(Constants.HEAD));
 				BlameResult result = generator.computeBlameResult();
 
@@ -412,22 +136,21 @@ public class BlameGeneratorTest extends RepositoryTestCase {
 		try (Git git = new Git(db)) {
 			String[] content1 = new String[] { "first", "second", "third" };
 
-			writeTrashFile(INTERESTING_FILE, join(content1));
-			git.add().addFilepattern(INTERESTING_FILE).call();
+			writeTrashFile("file.txt", join(content1));
+			git.add().addFilepattern("file.txt").call();
 			git.commit().setMessage("create file").call();
 
 			String[] content2 = new String[] { "" };
 
-			writeTrashFile(INTERESTING_FILE, join(content2));
-			git.add().addFilepattern(INTERESTING_FILE).call();
+			writeTrashFile("file.txt", join(content2));
+			git.add().addFilepattern("file.txt").call();
 			git.commit().setMessage("create file").call();
 
-			writeTrashFile(INTERESTING_FILE, join(content1));
-			git.add().addFilepattern(INTERESTING_FILE).call();
+			writeTrashFile("file.txt", join(content1));
+			git.add().addFilepattern("file.txt").call();
 			RevCommit c3 = git.commit().setMessage("create file").call();
 
-			try (BlameGenerator generator = new BlameGenerator(db,
-					INTERESTING_FILE)) {
+			try (BlameGenerator generator = new BlameGenerator(db, "file.txt")) {
 				generator.push(null, db.resolve(Constants.HEAD));
 				assertEquals(3, generator.getResultContents().size());
 
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SymlinkMergeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SymlinkMergeTest.java
new file mode 100644
index 0000000000..3cdc8da34e
--- /dev/null
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SymlinkMergeTest.java
@@ -0,0 +1,296 @@
+/*
+ * Copyright (C) 2022 Thomas Wolf <twolf@apache.org> and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Distribution License v. 1.0 which is available at
+ * https://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+package org.eclipse.jgit.merge;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.MergeResult;
+import org.eclipse.jgit.api.MergeResult.MergeStatus;
+import org.eclipse.jgit.api.ResetCommand.ResetType;
+import org.eclipse.jgit.junit.RepositoryTestCase;
+import org.eclipse.jgit.junit.TestRepository;
+import org.eclipse.jgit.lib.ConfigConstants;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.StoredConfig;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Tests for merges involving symlinks.
+ */
+@RunWith(Parameterized.class)
+public class SymlinkMergeTest extends RepositoryTestCase {
+
+	@Parameters(name = "target={0}, core.symlinks={1}")
+	public static Object[][] parameters() {
+		return new Object[][] {
+			{ Target.NONE, Boolean.TRUE },
+			{ Target.FILE, Boolean.TRUE },
+			{ Target.DIRECTORY, Boolean.TRUE },
+			{ Target.NONE, Boolean.FALSE },
+			{ Target.FILE, Boolean.FALSE },
+			{ Target.DIRECTORY, Boolean.FALSE },
+		};
+	}
+
+	public enum Target {
+		NONE, FILE, DIRECTORY
+	}
+
+	@Parameter(0)
+	public Target target;
+
+	@Parameter(1)
+	public boolean useSymLinks;
+
+	private void setTargets() throws IOException {
+		switch (target) {
+		case DIRECTORY:
+			assertTrue(new File(trash, "target").mkdir());
+			assertTrue(new File(trash, "target1").mkdir());
+			assertTrue(new File(trash, "target2").mkdir());
+			break;
+		case FILE:
+			writeTrashFile("target", "t");
+			writeTrashFile("target1", "t1");
+			writeTrashFile("target2", "t2");
+			break;
+		default:
+			break;
+		}
+	}
+
+	private void checkTargets() throws IOException {
+		File t = new File(trash, "target");
+		File t1 = new File(trash, "target1");
+		File t2 = new File(trash, "target2");
+		switch (target) {
+		case DIRECTORY:
+			assertTrue(t.isDirectory());
+			assertTrue(t1.isDirectory());
+			assertTrue(t2.isDirectory());
+			break;
+		case FILE:
+			checkFile(t, "t");
+			checkFile(t1, "t1");
+			checkFile(t2, "t2");
+			break;
+		default:
+			assertFalse(Files.exists(t.toPath(), LinkOption.NOFOLLOW_LINKS));
+			assertFalse(Files.exists(t1.toPath(), LinkOption.NOFOLLOW_LINKS));
+			assertFalse(Files.exists(t2.toPath(), LinkOption.NOFOLLOW_LINKS));
+			break;
+		}
+	}
+
+	private void assertSymLink(File link, String content) throws Exception {
+		if (useSymLinks) {
+			assertTrue(Files.isSymbolicLink(link.toPath()));
+			assertEquals(content, db.getFS().readSymLink(link));
+		} else {
+			assertFalse(Files.isSymbolicLink(link.toPath()));
+			assertTrue(link.isFile());
+			checkFile(link, content);
+		}
+	}
+
+	// Link/link conflict: C git records the conflict but leaves the link in the
+	// working tree unchanged.
+
+	@Test
+	public void mergeWithSymlinkConflict() throws Exception {
+		assumeTrue(db.getFS().supportsSymlinks() || !useSymLinks);
+		StoredConfig config = db.getConfig();
+		config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
+				ConfigConstants.CONFIG_KEY_SYMLINKS, useSymLinks);
+		config.save();
+		try (TestRepository<Repository> repo = new TestRepository<>(db)) {
+			db.incrementOpen();
+			// Create the links directly in the git repo, then use a hard reset
+			// to get them into the workspace. This enables us to run these
+			// tests also with core.symLinks = false.
+			RevCommit base = repo
+					.commit(repo.tree(repo.link("link", repo.blob("target"))));
+			RevCommit side = repo.commit(
+					repo.tree(repo.link("link", repo.blob("target1"))), base);
+			RevCommit head = repo.commit(
+					repo.tree(repo.link("link", repo.blob("target2"))), base);
+			try (Git git = new Git(db)) {
+				setTargets();
+				git.reset().setMode(ResetType.HARD).setRef(head.name()).call();
+				File link = new File(trash, "link");
+				assertSymLink(link, "target2");
+				MergeResult result = git.merge().include(side)
+						.setMessage("merged").call();
+				assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
+				// Link should be unmodified
+				assertSymLink(link, "target2");
+				checkTargets();
+				assertEquals("[link, mode:120000, stage:1, content:target]"
+						+ "[link, mode:120000, stage:2, content:target2]"
+						+ "[link, mode:120000, stage:3, content:target1]",
+						indexState(CONTENT));
+			}
+		}
+	}
+
+	// In file/link conflicts, C git never does a content merge. It records the
+	// stages in the index, and always puts the file into the workspace.
+
+	@Test
+	public void mergeWithFileSymlinkConflict() throws Exception {
+		assumeTrue(db.getFS().supportsSymlinks() || !useSymLinks);
+		StoredConfig config = db.getConfig();
+		config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
+				ConfigConstants.CONFIG_KEY_SYMLINKS, useSymLinks);
+		config.save();
+		try (TestRepository<Repository> repo = new TestRepository<>(db)) {
+			db.incrementOpen();
+			RevCommit base = repo.commit(repo.tree());
+			RevCommit side = repo.commit(
+					repo.tree(repo.link("link", repo.blob("target1"))), base);
+			RevCommit head = repo.commit(
+					repo.tree(repo.file("link", repo.blob("not a link"))),
+					base);
+			try (Git git = new Git(db)) {
+				setTargets();
+				git.reset().setMode(ResetType.HARD).setRef(head.name()).call();
+				File link = new File(trash, "link");
+				assertFalse(Files.isSymbolicLink(link.toPath()));
+				checkFile(link, "not a link");
+				MergeResult result = git.merge().include(side)
+						.setMessage("merged").call();
+				assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
+				// File should be unmodified
+				assertFalse(Files.isSymbolicLink(link.toPath()));
+				checkFile(link, "not a link");
+				checkTargets();
+				assertEquals("[link, mode:100644, stage:2, content:not a link]"
+						+ "[link, mode:120000, stage:3, content:target1]",
+						indexState(CONTENT));
+			}
+		}
+	}
+
+	@Test
+	public void mergeWithSymlinkFileConflict() throws Exception {
+		assumeTrue(db.getFS().supportsSymlinks() || !useSymLinks);
+		StoredConfig config = db.getConfig();
+		config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
+				ConfigConstants.CONFIG_KEY_SYMLINKS, useSymLinks);
+		config.save();
+		try (TestRepository<Repository> repo = new TestRepository<>(db)) {
+			db.incrementOpen();
+			RevCommit base = repo.commit(repo.tree());
+			RevCommit side = repo.commit(
+					repo.tree(repo.file("link", repo.blob("not a link"))),
+					base);
+			RevCommit head = repo.commit(
+					repo.tree(repo.link("link", repo.blob("target2"))), base);
+			try (Git git = new Git(db)) {
+				setTargets();
+				git.reset().setMode(ResetType.HARD).setRef(head.name()).call();
+				File link = new File(trash, "link");
+				assertSymLink(link, "target2");
+				MergeResult result = git.merge().include(side)
+						.setMessage("merged").call();
+				assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
+				// Should now be a file!
+				assertFalse(Files.isSymbolicLink(link.toPath()));
+				checkFile(link, "not a link");
+				checkTargets();
+				assertEquals("[link, mode:120000, stage:2, content:target2]"
+						+ "[link, mode:100644, stage:3, content:not a link]",
+						indexState(CONTENT));
+			}
+		}
+	}
+
+	// In Delete/modify conflicts with the non-deleted side a link, C git puts
+	// the link into the working tree.
+
+	@Test
+	public void mergeWithSymlinkDeleteModify() throws Exception {
+		assumeTrue(db.getFS().supportsSymlinks() || !useSymLinks);
+		StoredConfig config = db.getConfig();
+		config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
+				ConfigConstants.CONFIG_KEY_SYMLINKS, useSymLinks);
+		config.save();
+		try (TestRepository<Repository> repo = new TestRepository<>(db)) {
+			db.incrementOpen();
+			RevCommit base = repo
+					.commit(repo.tree(repo.link("link", repo.blob("target"))));
+			RevCommit side = repo.commit(
+					repo.tree(repo.link("link", repo.blob("target1"))), base);
+			RevCommit head = repo.commit(repo.tree(), base);
+			try (Git git = new Git(db)) {
+				setTargets();
+				git.reset().setMode(ResetType.HARD).setRef(head.name()).call();
+				File link = new File(trash, "link");
+				assertFalse(
+						Files.exists(link.toPath(), LinkOption.NOFOLLOW_LINKS));
+				MergeResult result = git.merge().include(side)
+						.setMessage("merged").call();
+				assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
+				// Link should have the content from side
+				assertSymLink(link, "target1");
+				checkTargets();
+				assertEquals("[link, mode:120000, stage:1, content:target]"
+						+ "[link, mode:120000, stage:3, content:target1]",
+						indexState(CONTENT));
+			}
+		}
+	}
+
+	@Test
+	public void mergeWithSymlinkModifyDelete() throws Exception {
+		assumeTrue(db.getFS().supportsSymlinks() || !useSymLinks);
+		StoredConfig config = db.getConfig();
+		config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
+				ConfigConstants.CONFIG_KEY_SYMLINKS, useSymLinks);
+		config.save();
+		try (TestRepository<Repository> repo = new TestRepository<>(db)) {
+			db.incrementOpen();
+			RevCommit base = repo
+					.commit(repo.tree(repo.link("link", repo.blob("target"))));
+			RevCommit side = repo.commit(repo.tree(), base);
+			RevCommit head = repo.commit(
+					repo.tree(repo.link("link", repo.blob("target2"))), base);
+			try (Git git = new Git(db)) {
+				setTargets();
+				git.reset().setMode(ResetType.HARD).setRef(head.name()).call();
+				File link = new File(trash, "link");
+				assertSymLink(link, "target2");
+				MergeResult result = git.merge().include(side)
+						.setMessage("merged").call();
+				assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
+				// Link should be unmodified
+				assertSymLink(link, "target2");
+				checkTargets();
+				assertEquals("[link, mode:120000, stage:1, content:target]"
+						+ "[link, mode:120000, stage:2, content:target2]",
+						indexState(CONTENT));
+			}
+		}
+	}
+}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/FilteredRevCommitTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/FilteredRevCommitTest.java
deleted file mode 100644
index 49ce47ef42..0000000000
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/FilteredRevCommitTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2022, Google LLC.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0 which is available at
- * https://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * @since 6.3
- */
-package org.eclipse.jgit.revwalk;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertSame;
-
-import java.util.Arrays;
-
-import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription;
-import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
-import org.eclipse.jgit.junit.TestRepository;
-import org.eclipse.jgit.lib.AnyObjectId;
-import org.eclipse.jgit.lib.ObjectLoader;
-import org.junit.Before;
-import org.junit.Test;
-
-public class FilteredRevCommitTest {
-	private TestRepository<InMemoryRepository> tr;
-
-	private RevWalk rw;
-
-	@Before
-	public void setUp() throws Exception {
-		tr = new TestRepository<>(
-				new InMemoryRepository(new DfsRepositoryDescription("test")));
-		rw = tr.getRevWalk();
-	}
-
-	@Test
-	public void testParseHeaders_noParent() throws Exception {
-		RevCommit root = tr.commit().add("todelete", "to be deleted").create();
-		RevCommit orig = tr.commit().parent(root).rm("todelete")
-				.add("foo", "foo contents").add("bar", "bar contents")
-				.add("dir/baz", "baz contents").create();
-		FilteredRevCommit filteredRevCommit = new FilteredRevCommit(orig);
-		filteredRevCommit.parseHeaders(rw);
-		tr.branch("master").update(filteredRevCommit);
-		assertEquals("foo contents", blobAsString(filteredRevCommit, "foo"));
-		assertEquals("bar contents", blobAsString(filteredRevCommit, "bar"));
-		assertEquals("baz contents",
-				blobAsString(filteredRevCommit, "dir/baz"));
-	}
-
-	@Test
-	public void testParents() throws Exception {
-		RevCommit commit1 = tr.commit().add("foo", "foo contents\n").create();
-		RevCommit commit2 = tr.commit().parent(commit1)
-				.message("original message").add("bar", "bar contents")
-				.create();
-		RevCommit commit3 = tr.commit().parent(commit2).message("commit3")
-				.add("foo", "foo contents\n new line\n").create();
-
-		FilteredRevCommit filteredCommitHead = new FilteredRevCommit(commit3,
-				commit1);
-
-		assertEquals(commit1, Arrays.stream(filteredCommitHead.getParents())
-				.findFirst().get());
-		assertEquals("commit3", filteredCommitHead.getFullMessage());
-		assertEquals("foo contents\n new line\n",
-				blobAsString(filteredCommitHead, "foo"));
-		assertEquals(filteredCommitHead.getTree(), commit3.getTree());
-
-	}
-
-	@Test
-	public void testFlag() throws Exception {
-		RevCommit root = tr.commit().add("todelete", "to be deleted").create();
-		RevCommit orig = tr.commit().parent(root).rm("todelete")
-				.add("foo", "foo contents").add("bar", "bar contents")
-				.add("dir/baz", "baz contents").create();
-
-		FilteredRevCommit filteredRevCommit = new FilteredRevCommit(orig, root);
-		assertEquals(RevObject.PARSED, orig.flags);
-		assertEquals(RevObject.PARSED, filteredRevCommit.flags);
-	}
-
-	@Test
-	public void testCommitState() throws Exception {
-		RevCommit root = tr.commit().add("todelete", "to be deleted").create();
-		RevCommit orig = tr.commit().parent(root).rm("todelete")
-				.add("foo", "foo contents").add("bar", "bar contents")
-				.add("dir/baz", "baz contents").create();
-
-		FilteredRevCommit filteredRevCommit = new FilteredRevCommit(orig, root);
-		assertEquals(filteredRevCommit.getParentCount(), 1);
-		assertSame(filteredRevCommit.getRawBuffer(), orig.getRawBuffer());
-		assertSame(filteredRevCommit.getTree(), orig.getTree());
-		assertEquals(filteredRevCommit.getFullMessage(), orig.getFullMessage());
-		assertEquals(filteredRevCommit.commitTime, orig.commitTime);
-		assertSame(filteredRevCommit.parents, RevCommit.NO_PARENTS);
-	}
-
-	@Test
-	public void testParseCommit_withParents_parsesRealParents()
-			throws Exception {
-		RevCommit commit1 = tr.commit().add("foo", "foo contents\n").create();
-		RevCommit commit2 = tr.commit().parent(commit1)
-				.message("original message").add("bar", "bar contents")
-				.create();
-		RevCommit commit3 = tr.commit().parent(commit2).message("commit3")
-				.add("foo", "foo contents\n new line\n").create();
-
-		FilteredRevCommit filteredCommitHead = new FilteredRevCommit(commit3,
-				commit1);
-
-		RevCommit parsedCommit = rw.parseCommit(filteredCommitHead.getId());
-		assertEquals(filteredCommitHead.getId(), commit3.getId());
-		// This is an intended behavior as revWalk#parseCommit doesn't parse
-		// through the overridden parents rather uses the real parents.
-		assertNotEquals(
-				Arrays.stream(parsedCommit.getParents()).findFirst().get(),
-				Arrays.stream(filteredCommitHead.getParents()).findFirst()
-						.get());
-	}
-
-	private String blobAsString(AnyObjectId treeish, String path)
-			throws Exception {
-		RevObject obj = tr.get(rw.parseTree(treeish), path);
-		assertSame(RevBlob.class, obj.getClass());
-		ObjectLoader loader = rw.getObjectReader().open(obj);
-		return new String(loader.getCachedBytes(), UTF_8);
-	}
-}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/FilteredRevWalkTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/FilteredRevWalkTest.java
deleted file mode 100644
index b1f8c0c0e9..0000000000
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/FilteredRevWalkTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2022, Google LLC.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0 which is available at
- * https://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-package org.eclipse.jgit.revwalk;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-
-import org.eclipse.jgit.internal.storage.file.FileRepository;
-import org.eclipse.jgit.junit.TestRepository;
-import org.junit.Before;
-import org.junit.Test;
-
-public class FilteredRevWalkTest extends RevWalkTestCase {
-	private TestRepository<FileRepository> repository;
-
-	@Override
-	@Before
-	public void setUp() throws Exception {
-		super.setUp();
-		repository = new TestRepository<>(db);
-	}
-
-	@Test
-	public void testWalk() throws Exception {
-		writeTrashFile("a.txt", "content");
-		repository.git().add().addFilepattern("a.txt").call();
-		RevCommit c1 = repository.git().commit().setMessage("first commit")
-				.call();
-
-		writeTrashFile("b.txt", "new file added");
-		repository.git().add().addFilepattern("b.txt").call();
-		repository.git().commit().setMessage("second commit").call();
-
-		writeTrashFile("a.txt", "content added");
-		repository.git().add().addFilepattern("a.txt").call();
-		RevCommit c3 = repository.git().commit().setMessage("third commit")
-				.call();
-
-		RevWalk revWalk = repository.getRevWalk();
-		FilteredRevCommit filteredRevCommit = new FilteredRevCommit(c3, c1);
-
-		revWalk.markStart(filteredRevCommit);
-		assertEquals(c3, revWalk.next());
-		assertEquals(c1, revWalk.next());
-	}
-
-	@Test
-	public void testParseBody() throws Exception {
-		writeTrashFile("a.txt", "content");
-		repository.git().add().addFilepattern("a.txt").call();
-		RevCommit c1 = repository.git().commit().setMessage("first commit")
-				.call();
-
-		writeTrashFile("b.txt", "new file added");
-		repository.git().add().addFilepattern("b.txt").call();
-		repository.git().commit().setMessage("second commit").call();
-
-		writeTrashFile("a.txt", "content added");
-		repository.git().add().addFilepattern("a.txt").call();
-		RevCommit c3 = repository.git().commit().setMessage("third commit")
-				.call();
-
-		FilteredRevCommit filteredRevCommit = new FilteredRevCommit(c3, c1);
-		filteredRevCommit.disposeBody();
-
-		RevWalk revWalk = repository.getRevWalk();
-
-		revWalk.parseBody(filteredRevCommit);
-		assertEquals(filteredRevCommit.getFullMessage(), c3.getFullMessage());
-		assertEquals(filteredRevCommit.getShortMessage(), c3.getShortMessage());
-		assertEquals(filteredRevCommit.commitTime, c3.commitTime);
-		assertSame(filteredRevCommit.getTree(), c3.getTree());
-		assertSame(filteredRevCommit.parents, RevCommit.NO_PARENTS);
-
-	}
-
-	/**
-	 * Test that the uninteresting flag is carried over correctly. Every commit
-	 * should have the uninteresting flag resulting in a RevWalk returning no
-	 * commit.
-	 *
-	 * @throws Exception
-	 */
-	@Test
-	public void testRevWalkCarryUninteresting() throws Exception {
-		writeTrashFile("a.txt", "content");
-		repository.git().add().addFilepattern("a.txt").call();
-		RevCommit c1 = repository.git().commit().setMessage("first commit")
-				.call();
-
-		writeTrashFile("b.txt", "new file added");
-		repository.git().add().addFilepattern("b.txt").call();
-		RevCommit c2 = repository.git().commit().setMessage("second commit")
-				.call();
-
-		writeTrashFile("a.txt", "content added");
-		repository.git().add().addFilepattern("a.txt").call();
-		RevCommit c3 = repository.git().commit().setMessage("third commit")
-				.call();
-
-		RevWalk revWalk = repository.getRevWalk();
-		FilteredRevCommit filteredCommit1 = new FilteredRevCommit(c1);
-		FilteredRevCommit filteredCommit2 = new FilteredRevCommit(c2,
-				filteredCommit1);
-		FilteredRevCommit filteredCommit3 = new FilteredRevCommit(c3,
-				filteredCommit2);
-
-		revWalk.markStart(filteredCommit2);
-		markUninteresting(filteredCommit3);
-		assertNull("Found an unexpected commit", rw.next());
-	}
-}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/FirstParentRevWalkTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/FirstParentRevWalkTest.java
index 146d16953c..c8256b89c0 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/FirstParentRevWalkTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/FirstParentRevWalkTest.java
@@ -12,7 +12,6 @@ package org.eclipse.jgit.revwalk;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.revwalk.filter.MessageRevFilter;
@@ -424,41 +423,9 @@ public class FirstParentRevWalkTest extends RevWalkTestCase {
 		rw.sort(RevSort.TOPO, true);
 		rw.setTreeFilter(PathFilterGroup.createFromStrings("0"));
 		markStart(d);
-
-		assertEquals(d, rw.next());
-		assertEquals(c, rw.next());
-		assertEquals(b, rw.next());
-		assertNull(rw.next());
-	}
-
-	@Test
-	public void testWithTopoSortAndTreeFilter_shouldUseFilteredRevCommits()
-			throws Exception {
-		RevCommit a = commit();
-		RevCommit b = commit(tree(file("0", blob("b"))), a);
-		RevCommit c = commit(tree(file("0", blob("c"))), b, a);
-		RevCommit d = commit(tree(file("0", blob("d"))), c);
-
-		rw.reset();
-		rw.setFirstParent(true);
-		rw.sort(RevSort.TOPO, true);
-		rw.setTreeFilter(PathFilterGroup.createFromStrings("0"));
-		markStart(d);
-
-		RevCommit x = rw.next();
-		assertTrue(x instanceof FilteredRevCommit);
-		assertEquals(1, x.getParentCount());
-		assertEquals(c, x.getParent(0));
-
-		RevCommit y = rw.next();
-		assertTrue(y instanceof FilteredRevCommit);
-		assertEquals(1, y.getParentCount());
-		assertEquals(b, y.getParent(0));
-
-		RevCommit z = rw.next();
-		assertTrue(z instanceof FilteredRevCommit);
-		assertEquals(0, z.getParentCount());
-
+		assertCommit(d, rw.next());
+		assertCommit(c, rw.next());
+		assertCommit(b, rw.next());
 		assertNull(rw.next());
 	}
 
@@ -474,8 +441,8 @@ public class FirstParentRevWalkTest extends RevWalkTestCase {
 		rw.sort(RevSort.TOPO, true);
 		rw.setTreeFilter(PathFilterGroup.createFromStrings("0"));
 		markStart(d);
-		assertEquals(d, rw.next());
-		assertEquals(c, rw.next());
+		assertCommit(d, rw.next());
+		assertCommit(c, rw.next());
 		assertNull(rw.next());
 	}
 
@@ -491,9 +458,9 @@ public class FirstParentRevWalkTest extends RevWalkTestCase {
 		rw.sort(RevSort.TOPO_KEEP_BRANCH_TOGETHER, true);
 		rw.setTreeFilter(PathFilterGroup.createFromStrings("0"));
 		markStart(d);
-		assertEquals(d, rw.next());
-		assertEquals(c, rw.next());
-		assertEquals(b, rw.next());
+		assertCommit(d, rw.next());
+		assertCommit(c, rw.next());
+		assertCommit(b, rw.next());
 		assertNull(rw.next());
 	}
 
@@ -509,8 +476,8 @@ public class FirstParentRevWalkTest extends RevWalkTestCase {
 		rw.sort(RevSort.TOPO_KEEP_BRANCH_TOGETHER, true);
 		rw.setTreeFilter(PathFilterGroup.createFromStrings("0"));
 		markStart(d);
-		assertEquals(d, rw.next());
-		assertEquals(c, rw.next());
+		assertCommit(d, rw.next());
+		assertCommit(c, rw.next());
 		assertNull(rw.next());
 	}
 }
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkFollowFilterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkFollowFilterTest.java
index 20478ef709..c62136e64d 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkFollowFilterTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkFollowFilterTest.java
@@ -9,7 +9,6 @@
  */
 package org.eclipse.jgit.revwalk;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import java.util.ArrayList;
@@ -56,7 +55,7 @@ public class RevWalkFollowFilterTest extends RevWalkTestCase {
 		final RevCommit a = commit(tree(file("0", blob("0"))));
 		follow("0");
 		markStart(a);
-		assertEquals(a, rw.next());
+		assertCommit(a, rw.next());
 		assertNull(rw.next());
 
 		assertNoRenames();
@@ -73,8 +72,8 @@ public class RevWalkFollowFilterTest extends RevWalkTestCase {
 
 		follow("b");
 		markStart(renameCommit);
-		assertEquals(renameCommit, rw.next());
-		assertEquals(a, rw.next());
+		assertCommit(renameCommit, rw.next());
+		assertCommit(a, rw.next());
 		assertNull(rw.next());
 
 		assertRenames("a->b");
@@ -102,10 +101,10 @@ public class RevWalkFollowFilterTest extends RevWalkTestCase {
 
 		follow("a");
 		markStart(renameCommit3);
-		assertEquals(renameCommit3, rw.next());
-		assertEquals(renameCommit2, rw.next());
-		assertEquals(renameCommit1, rw.next());
-		assertEquals(a, rw.next());
+		assertCommit(renameCommit3, rw.next());
+		assertCommit(renameCommit2, rw.next());
+		assertCommit(renameCommit1, rw.next());
+		assertCommit(a, rw.next());
 		assertNull(rw.next());
 
 		assertRenames("c->a", "b->c", "a->b");
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkPathFilter1Test.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkPathFilter1Test.java
index d933a6fc72..5cce11aa1f 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkPathFilter1Test.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkPathFilter1Test.java
@@ -11,7 +11,6 @@
 package org.eclipse.jgit.revwalk;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 import java.util.Collections;
@@ -24,8 +23,8 @@ import org.junit.Test;
 
 public class RevWalkPathFilter1Test extends RevWalkTestCase {
 	protected void filter(String path) {
-		rw.setTreeFilter(AndTreeFilter.create(
-				PathFilterGroup.createFromStrings(Collections.singleton(path)),
+		rw.setTreeFilter(AndTreeFilter.create(PathFilterGroup
+				.createFromStrings(Collections.singleton(path)),
 				TreeFilter.ANY_DIFF));
 	}
 
@@ -50,7 +49,7 @@ public class RevWalkPathFilter1Test extends RevWalkTestCase {
 		final RevCommit a = commit(tree(file("0", blob("0"))));
 		filter("0");
 		markStart(a);
-		assertEquals(a, rw.next());
+		assertCommit(a, rw.next());
 		assertNull(rw.next());
 	}
 
@@ -73,10 +72,10 @@ public class RevWalkPathFilter1Test extends RevWalkTestCase {
 		final RevCommit d = commit(tree(file("0", blob("d"))), c);
 		filter("0");
 		markStart(d);
-		assertEquals(d, rw.next());
-		assertEquals(c, rw.next());
-		assertEquals(b, rw.next());
-		assertEquals(a, rw.next());
+		assertCommit(d, rw.next());
+		assertCommit(c, rw.next());
+		assertCommit(b, rw.next());
+		assertCommit(a, rw.next());
 		assertNull(rw.next());
 	}
 
@@ -88,11 +87,11 @@ public class RevWalkPathFilter1Test extends RevWalkTestCase {
 		filter("d/f");
 		markStart(c);
 
-		assertEquals(c, rw.next());
+		assertCommit(c, rw.next());
 		assertEquals(1, c.getParentCount());
-		assertEquals(a, c.getParent(0)); // b was skipped
+		assertCommit(a, c.getParent(0)); // b was skipped
 
-		assertEquals(a, rw.next());
+		assertCommit(a, rw.next());
 		assertEquals(0, a.getParentCount());
 		assertNull(rw.next());
 	}
@@ -107,11 +106,11 @@ public class RevWalkPathFilter1Test extends RevWalkTestCase {
 		markStart(c);
 		rw.setRewriteParents(false);
 
-		assertEquals(c, rw.next());
+		assertCommit(c, rw.next());
 		assertEquals(1, c.getParentCount());
-		assertEquals(b, c.getParent(0));
+		assertCommit(b, c.getParent(0));
 
-		assertEquals(a, rw.next()); // b was skipped
+		assertCommit(a, rw.next()); // b was skipped
 		assertEquals(0, a.getParentCount());
 		assertNull(rw.next());
 	}
@@ -126,18 +125,18 @@ public class RevWalkPathFilter1Test extends RevWalkTestCase {
 		markStart(d);
 
 		// d was skipped
-		assertEquals(c, rw.next());
+		assertCommit(c, rw.next());
 		assertEquals(1, c.getParentCount());
-		assertEquals(a, c.getParent(0)); // b was skipped
+		assertCommit(a, c.getParent(0)); // b was skipped
 
-		assertEquals(a, rw.next());
+		assertCommit(a, rw.next());
 		assertEquals(0, a.getParentCount());
 		assertNull(rw.next());
 	}
 
 	@Test
 	public void testStringOfPearls_FilePath2_NoParentRewriting()
-			throws Exception {
+	throws Exception {
 		final RevCommit a = commit(tree(file("d/f", blob("a"))));
 		final RevCommit b = commit(tree(file("d/f", blob("a"))), a);
 		final RevCommit c = commit(tree(file("d/f", blob("b"))), b);
@@ -147,12 +146,12 @@ public class RevWalkPathFilter1Test extends RevWalkTestCase {
 		rw.setRewriteParents(false);
 
 		// d was skipped
-		assertEquals(c, rw.next());
+		assertCommit(c, rw.next());
 		assertEquals(1, c.getParentCount());
-		assertEquals(b, c.getParent(0));
+		assertCommit(b, c.getParent(0));
 
 		// b was skipped
-		assertEquals(a, rw.next());
+		assertCommit(a, rw.next());
 		assertEquals(0, a.getParentCount());
 		assertNull(rw.next());
 	}
@@ -167,11 +166,11 @@ public class RevWalkPathFilter1Test extends RevWalkTestCase {
 		markStart(d);
 
 		// d was skipped
-		assertEquals(c, rw.next());
+		assertCommit(c, rw.next());
 		assertEquals(1, c.getParentCount());
-		assertEquals(a, c.getParent(0)); // b was skipped
+		assertCommit(a, c.getParent(0)); // b was skipped
 
-		assertEquals(a, rw.next());
+		assertCommit(a, rw.next());
 		assertEquals(0, a.getParentCount());
 		assertNull(rw.next());
 	}
@@ -212,15 +211,15 @@ public class RevWalkPathFilter1Test extends RevWalkTestCase {
 		filter("d/f");
 		markStart(i);
 
-		assertEquals(i, rw.next());
+		assertCommit(i, rw.next());
 		assertEquals(1, i.getParentCount());
-		assertEquals(c, i.getParent(0)); // h..d was skipped
+		assertCommit(c, i.getParent(0)); // h..d was skipped
 
-		assertEquals(c, rw.next());
+		assertCommit(c, rw.next());
 		assertEquals(1, c.getParentCount());
-		assertEquals(a, c.getParent(0)); // b was skipped
+		assertCommit(a, c.getParent(0)); // b was skipped
 
-		assertEquals(a, rw.next());
+		assertCommit(a, rw.next());
 		assertEquals(0, a.getParentCount());
 		assertNull(rw.next());
 	}
@@ -274,49 +273,4 @@ public class RevWalkPathFilter1Test extends RevWalkTestCase {
 		assertCommit(b, rw.next());
 		assertCommit(a, rw.next());
 	}
-
-	@Test
-	public void testCommitHeaders_rewrittenParents() throws Exception {
-		final RevCommit a = commit(tree(file("d/f", blob("a"))));
-		final RevCommit b = commit(tree(file("d/f", blob("a"))), a);
-		final RevCommit c = commit(tree(file("d/f", blob("b"))), b);
-		filter("d/f");
-		markStart(c);
-
-		RevCommit cBar = rw.next();
-		assertNotNull(cBar.getShortMessage());
-		assertEquals(cBar.getCommitTime(), c.getCommitTime());
-
-		RevCommit aBar = rw.next();
-		assertNotNull(aBar.getShortMessage());
-		assertEquals(aBar.getCommitTime(), a.getCommitTime());
-
-		assertNull(rw.next());
-	}
-
-	@Test
-	public void testFlags_rewrittenParents() throws Exception {
-		final RevCommit a = commit(tree(file("d/f", blob("a"))));
-		final RevCommit b = commit(tree(file("d/f", blob("a"))), a);
-		final RevCommit c = commit(tree(file("d/f", blob("b"))), b);
-
-		final RevFlag flag1 = rw.newFlag("flag1");
-		final RevFlag flag2 = rw.newFlag("flag2");
-
-		a.add(flag1);
-		c.add(flag2);
-
-		filter("d/f");
-		markStart(c);
-
-		RevCommit cBar = rw.next();
-		assertEquals(cBar.flags & RevObject.PARSED, 1);
-		assertEquals(cBar.flags & flag2.mask, flag2.mask);
-
-		RevCommit aBar = rw.next();
-		assertEquals(aBar.flags & RevObject.PARSED, 1);
-		assertEquals(aBar.flags & flag1.mask, flag1.mask);
-
-		assertNull(rw.next());
-	}
 }
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index e8f443ec8f..3552ffbdbe 100644
--- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ui
 Bundle-SymbolicName: org.eclipse.jgit.ui
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.eclipse.jgit.awtui;version="6.3.0"
-Import-Package: org.eclipse.jgit.errors;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.lib;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.nls;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revplot;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.transport;version="[6.3.0,6.4.0)",
- org.eclipse.jgit.util;version="[6.3.0,6.4.0)"
+Export-Package: org.eclipse.jgit.awtui;version="6.3.1"
+Import-Package: org.eclipse.jgit.errors;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.lib;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.nls;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revplot;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.revwalk;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.transport;version="[6.3.1,6.4.0)",
+ org.eclipse.jgit.util;version="[6.3.1,6.4.0)"
diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
index 550397a901..147b1e435f 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-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.ui - Sources
 Bundle-SymbolicName: org.eclipse.jgit.ui.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index 4e57625759..fce6d4d52c 100644
--- a/org.eclipse.jgit.ui/pom.xml
+++ b/org.eclipse.jgit.ui/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ui</artifactId>
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index d1e612593c..307a8016e3 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit
 Bundle-SymbolicName: org.eclipse.jgit
-Bundle-Version: 6.3.0.qualifier
+Bundle-Version: 6.3.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Eclipse-ExtensibleAPI: true
-Export-Package: org.eclipse.jgit.annotations;version="6.3.0",
- org.eclipse.jgit.api;version="6.3.0";
+Export-Package: org.eclipse.jgit.annotations;version="6.3.1",
+ org.eclipse.jgit.api;version="6.3.1";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.notes,
    org.eclipse.jgit.dircache,
@@ -23,18 +23,18 @@ Export-Package: org.eclipse.jgit.annotations;version="6.3.0",
    org.eclipse.jgit.revwalk.filter,
    org.eclipse.jgit.blame,
    org.eclipse.jgit.merge",
- org.eclipse.jgit.api.errors;version="6.3.0";
+ org.eclipse.jgit.api.errors;version="6.3.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.errors",
- org.eclipse.jgit.attributes;version="6.3.0";
+ org.eclipse.jgit.attributes;version="6.3.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk",
- org.eclipse.jgit.blame;version="6.3.0";
+ org.eclipse.jgit.blame;version="6.3.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.diff",
- org.eclipse.jgit.diff;version="6.3.0";
+ org.eclipse.jgit.diff;version="6.3.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.attributes,
    org.eclipse.jgit.revwalk,
@@ -42,51 +42,51 @@ Export-Package: org.eclipse.jgit.annotations;version="6.3.0",
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.util",
- org.eclipse.jgit.dircache;version="6.3.0";
+ org.eclipse.jgit.dircache;version="6.3.1";
   uses:="org.eclipse.jgit.events,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.attributes,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.util",
- org.eclipse.jgit.errors;version="6.3.0";
+ org.eclipse.jgit.errors;version="6.3.1";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.dircache,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.internal.storage.pack",
- org.eclipse.jgit.events;version="6.3.0";
+ org.eclipse.jgit.events;version="6.3.1";
   uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.fnmatch;version="6.3.0",
- org.eclipse.jgit.gitrepo;version="6.3.0";
+ org.eclipse.jgit.fnmatch;version="6.3.1",
+ org.eclipse.jgit.gitrepo;version="6.3.1";
   uses:="org.xml.sax.helpers,
    org.eclipse.jgit.api,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.xml.sax",
- org.eclipse.jgit.gitrepo.internal;version="6.3.0";x-internal:=true,
- org.eclipse.jgit.hooks;version="6.3.0";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.ignore;version="6.3.0",
- org.eclipse.jgit.ignore.internal;version="6.3.0";
+ org.eclipse.jgit.gitrepo.internal;version="6.3.1";x-internal:=true,
+ org.eclipse.jgit.hooks;version="6.3.1";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.ignore;version="6.3.1",
+ org.eclipse.jgit.ignore.internal;version="6.3.1";
   x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal;version="6.3.0";
+ org.eclipse.jgit.internal;version="6.3.1";
   x-friends:="org.eclipse.jgit.test,
    org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.diff;version="6.3.0";
+ org.eclipse.jgit.internal.diff;version="6.3.1";
   x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.diffmergetool;version="6.3.0";
+ org.eclipse.jgit.internal.diffmergetool;version="6.3.1";
   x-friends:="org.eclipse.jgit.test,
    org.eclipse.jgit.pgm.test,
    org.eclipse.jgit.pgm,
    org.eclipse.egit.ui",
- org.eclipse.jgit.internal.fsck;version="6.3.0";
+ org.eclipse.jgit.internal.fsck;version="6.3.1";
   x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.revwalk;version="6.3.0";
+ org.eclipse.jgit.internal.revwalk;version="6.3.1";
   x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.storage.dfs;version="6.3.0";
+ org.eclipse.jgit.internal.storage.dfs;version="6.3.1";
   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="6.3.0";
+ org.eclipse.jgit.internal.storage.file;version="6.3.1";
   x-friends:="org.eclipse.jgit.test,
    org.eclipse.jgit.junit,
    org.eclipse.jgit.junit.http,
@@ -95,32 +95,32 @@ Export-Package: org.eclipse.jgit.annotations;version="6.3.0",
    org.eclipse.jgit.pgm,
    org.eclipse.jgit.pgm.test,
    org.eclipse.jgit.ssh.apache",
- org.eclipse.jgit.internal.storage.io;version="6.3.0";
+ org.eclipse.jgit.internal.storage.io;version="6.3.1";
   x-friends:="org.eclipse.jgit.junit,
    org.eclipse.jgit.test,
    org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.pack;version="6.3.0";
+ org.eclipse.jgit.internal.storage.pack;version="6.3.1";
   x-friends:="org.eclipse.jgit.junit,
    org.eclipse.jgit.test,
    org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.reftable;version="6.3.0";
+ org.eclipse.jgit.internal.storage.reftable;version="6.3.1";
   x-friends:="org.eclipse.jgit.http.test,
    org.eclipse.jgit.junit,
    org.eclipse.jgit.test,
    org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.submodule;version="6.3.0";x-internal:=true,
- org.eclipse.jgit.internal.transport.connectivity;version="6.3.0";
+ org.eclipse.jgit.internal.submodule;version="6.3.1";x-internal:=true,
+ org.eclipse.jgit.internal.transport.connectivity;version="6.3.1";
   x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.http;version="6.3.0";
+ org.eclipse.jgit.internal.transport.http;version="6.3.1";
   x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.parser;version="6.3.0";
+ org.eclipse.jgit.internal.transport.parser;version="6.3.1";
   x-friends:="org.eclipse.jgit.http.server,
    org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.ssh;version="6.3.0";
+ org.eclipse.jgit.internal.transport.ssh;version="6.3.1";
   x-friends:="org.eclipse.jgit.ssh.apache,
    org.eclipse.jgit.ssh.jsch,
    org.eclipse.jgit.test",
- org.eclipse.jgit.lib;version="6.3.0";
+ org.eclipse.jgit.lib;version="6.3.1";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.util.sha1,
    org.eclipse.jgit.dircache,
@@ -134,12 +134,12 @@ Export-Package: org.eclipse.jgit.annotations;version="6.3.0",
    org.eclipse.jgit.util,
    org.eclipse.jgit.submodule,
    org.eclipse.jgit.util.time",
- org.eclipse.jgit.lib.internal;version="6.3.0";
+ org.eclipse.jgit.lib.internal;version="6.3.1";
   x-friends:="org.eclipse.jgit.test,
    org.eclipse.jgit.pgm,
    org.eclipse.egit.ui",
- org.eclipse.jgit.logging;version="6.3.0",
- org.eclipse.jgit.merge;version="6.3.0";
+ org.eclipse.jgit.logging;version="6.3.1",
+ org.eclipse.jgit.merge;version="6.3.1";
   uses:="org.eclipse.jgit.dircache,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
@@ -148,40 +148,40 @@ Export-Package: org.eclipse.jgit.annotations;version="6.3.0",
    org.eclipse.jgit.util,
    org.eclipse.jgit.api,
    org.eclipse.jgit.attributes",
- org.eclipse.jgit.nls;version="6.3.0",
- org.eclipse.jgit.notes;version="6.3.0";
+ org.eclipse.jgit.nls;version="6.3.1",
+ org.eclipse.jgit.notes;version="6.3.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.merge",
- org.eclipse.jgit.patch;version="6.3.0";
+ org.eclipse.jgit.patch;version="6.3.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.diff",
- org.eclipse.jgit.revplot;version="6.3.0";
+ org.eclipse.jgit.revplot;version="6.3.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk",
- org.eclipse.jgit.revwalk;version="6.3.0";
+ org.eclipse.jgit.revwalk;version="6.3.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.diff,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.revwalk.filter,
    org.eclipse.jgit.treewalk",
- org.eclipse.jgit.revwalk.filter;version="6.3.0";
+ org.eclipse.jgit.revwalk.filter;version="6.3.1";
   uses:="org.eclipse.jgit.revwalk,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.util",
- org.eclipse.jgit.storage.file;version="6.3.0";
+ org.eclipse.jgit.storage.file;version="6.3.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.util",
- org.eclipse.jgit.storage.pack;version="6.3.0";
+ org.eclipse.jgit.storage.pack;version="6.3.1";
   uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="6.3.0";
+ org.eclipse.jgit.submodule;version="6.3.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.diff,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.util",
- org.eclipse.jgit.transport;version="6.3.0";
+ org.eclipse.jgit.transport;version="6.3.1";
   uses:="javax.crypto,
    org.eclipse.jgit.util.io,
    org.eclipse.jgit.lib,
@@ -194,21 +194,21 @@ Export-Package: org.eclipse.jgit.annotations;version="6.3.0",
    org.eclipse.jgit.transport.resolver,
    org.eclipse.jgit.storage.pack,
    org.eclipse.jgit.errors",
- org.eclipse.jgit.transport.http;version="6.3.0";
+ org.eclipse.jgit.transport.http;version="6.3.1";
   uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="6.3.0";
+ org.eclipse.jgit.transport.resolver;version="6.3.1";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.lib",
- org.eclipse.jgit.treewalk;version="6.3.0";
+ org.eclipse.jgit.treewalk;version="6.3.1";
   uses:="org.eclipse.jgit.dircache,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.attributes,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.util",
- org.eclipse.jgit.treewalk.filter;version="6.3.0";
+ org.eclipse.jgit.treewalk.filter;version="6.3.1";
   uses:="org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util;version="6.3.0";
+ org.eclipse.jgit.util;version="6.3.1";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.hooks,
    org.eclipse.jgit.revwalk,
@@ -221,12 +221,12 @@ Export-Package: org.eclipse.jgit.annotations;version="6.3.0",
    org.eclipse.jgit.treewalk,
    javax.net.ssl,
    org.eclipse.jgit.util.time",
- org.eclipse.jgit.util.io;version="6.3.0";
+ org.eclipse.jgit.util.io;version="6.3.1";
   uses:="org.eclipse.jgit.attributes,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util.sha1;version="6.3.0",
- org.eclipse.jgit.util.time;version="6.3.0"
+ org.eclipse.jgit.util.sha1;version="6.3.1",
+ org.eclipse.jgit.util.time;version="6.3.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
  javax.crypto,
diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index 97f57d8738..43e88e531c 100644
--- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit - Sources
 Bundle-SymbolicName: org.eclipse.jgit.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.3.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="6.3.0.qualifier";roots="."
+Bundle-Version: 6.3.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="6.3.1.qualifier";roots="."
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index b57ea15560..7e6bc0a4f4 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit</artifactId>
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java
index 93ddfc6607..77967df2e5 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java
@@ -129,7 +129,6 @@ public class BlameGenerator implements AutoCloseable {
 
 	/** Blame is currently assigned to this source. */
 	private Candidate outCandidate;
-
 	private Region outRegion;
 
 	/**
@@ -404,35 +403,6 @@ public class BlameGenerator implements AutoCloseable {
 	 * revision (if the index is interesting), and finally the working tree copy
 	 * (if the working tree is interesting).
 	 *
-	 * @param blameCommit
-	 *            ordered commits to use instead of RevWalk.
-	 * @return {@code this}
-	 * @throws java.io.IOException
-	 *             the repository cannot be read.
-	 * @since 6.3
-	 */
-	public BlameGenerator push(RevCommit blameCommit) throws IOException {
-		if (!find(blameCommit, resultPath)) {
-			return this;
-		}
-
-		Candidate c = new Candidate(getRepository(), blameCommit, resultPath);
-		c.sourceBlob = idBuf.toObjectId();
-		c.loadText(reader);
-		c.regionList = new Region(0, 0, c.sourceText.size());
-		remaining = c.sourceText.size();
-		push(c);
-		return this;
-	}
-
-	/**
-	 * Push a candidate object onto the generator's traversal stack.
-	 * <p>
-	 * Candidates should be pushed in history order from oldest-to-newest.
-	 * Applications should push the starting commit first, then the index
-	 * revision (if the index is interesting), and finally the working tree copy
-	 * (if the working tree is interesting).
-	 *
 	 * @param description
 	 *            description of the blob revision, such as "Working Tree".
 	 * @param id
@@ -458,7 +428,16 @@ public class BlameGenerator implements AutoCloseable {
 		}
 
 		RevCommit commit = revPool.parseCommit(id);
-		return push(commit);
+		if (!find(commit, resultPath))
+			return this;
+
+		Candidate c = new Candidate(getRepository(), commit, resultPath);
+		c.sourceBlob = idBuf.toObjectId();
+		c.loadText(reader);
+		c.regionList = new Region(0, 0, c.sourceText.size());
+		remaining = c.sourceText.size();
+		push(c);
+		return this;
 	}
 
 	/**
@@ -626,7 +605,7 @@ public class BlameGenerator implements AutoCloseable {
 				// Do not generate a tip of a reverse. The region
 				// survives and should not appear to be deleted.
 
-			} else /* if (pCnt == 0) */ {
+			} else /* if (pCnt == 0) */{
 				// Root commit, with at least one surviving region.
 				// Assign the remaining blame here.
 				return result(n);
@@ -867,8 +846,8 @@ public class BlameGenerator implements AutoCloseable {
 				editList = new EditList(0);
 			} else {
 				p.loadText(reader);
-				editList = diffAlgorithm.diff(textComparator, p.sourceText,
-						n.sourceText);
+				editList = diffAlgorithm.diff(textComparator,
+						p.sourceText, n.sourceText);
 			}
 
 			if (editList.isEmpty()) {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index 23f8e4a5d5..8b9b569c38 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2010-2012, Matthias Sohn <matthias.sohn@sap.com>
  * Copyright (C) 2012, Research In Motion Limited
  * Copyright (C) 2017, Obeo (mathieu.cartaud@obeo.fr)
- * Copyright (C) 2018, 2022 Thomas Wolf <thomas.wolf@paranor.ch> and others
+ * Copyright (C) 2018, 2022 Thomas Wolf <twolf@apache.org> and others
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0 which is available at
@@ -321,6 +321,25 @@ public class ResolveMerger extends ThreeWayMerger {
 	}
 
 	/**
+	 * Adds the conflict stages for the current path of {@link #tw} to the index
+	 * builder and returns the "theirs" stage; if present.
+	 *
+	 * @param base
+	 *            of the conflict
+	 * @param ours
+	 *            of the conflict
+	 * @param theirs
+	 *            of the conflict
+	 * @return the {@link DirCacheEntry} for the "theirs" stage, or {@code null}
+	 */
+	private DirCacheEntry addConflict(CanonicalTreeParser base,
+			CanonicalTreeParser ours, CanonicalTreeParser theirs) {
+		add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0);
+		add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0);
+		return add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0);
+	}
+
+	/**
 	 * adds a entry to the index builder which is a copy of the specified
 	 * DirCacheEntry
 	 *
@@ -501,9 +520,7 @@ public class ResolveMerger extends ThreeWayMerger {
 				// length.
 				// This path can be skipped on ignoreConflicts, so the caller
 				// could use virtual commit.
-				add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0);
-				add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0);
-				add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0);
+				addConflict(base, ours, theirs);
 				unmergedPaths.add(tw.getPathString());
 				mergeResults.put(tw.getPathString(),
 						new MergeResult<>(Collections.emptyList()));
@@ -608,9 +625,7 @@ public class ResolveMerger extends ThreeWayMerger {
 				add(tw.getRawPath(), ours, DirCacheEntry.STAGE_0, EPOCH, 0);
 				return true;
 			} else if (gitLinkMerging) {
-				add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0);
-				add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0);
-				add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0);
+				addConflict(base, ours, theirs);
 				MergeResult<SubmoduleConflict> result = createGitLinksMergeResult(
 						base, ours, theirs);
 				result.setContainsConflicts(true);
@@ -631,9 +646,7 @@ public class ResolveMerger extends ThreeWayMerger {
 					default:
 						break;
 				}
-				add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0);
-				add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0);
-				add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0);
+				addConflict(base, ours, theirs);
 
 				// attribute merge issues are conflicts but not failures
 				unmergedPaths.add(tw.getPathString());
@@ -646,30 +659,61 @@ public class ResolveMerger extends ThreeWayMerger {
 			}
 
 			MergeResult<RawText> result = null;
-			try {
-				result = contentMerge(base, ours, theirs, attributes,
-						getContentMergeStrategy());
-			} catch (BinaryBlobException e) {
+			boolean hasSymlink = FileMode.SYMLINK.equals(modeO)
+					|| FileMode.SYMLINK.equals(modeT);
+			if (!hasSymlink) {
+				try {
+					result = contentMerge(base, ours, theirs, attributes,
+							getContentMergeStrategy());
+				} catch (BinaryBlobException e) {
+					// result == null
+				}
+			}
+			if (result == null) {
 				switch (getContentMergeStrategy()) {
-					case OURS:
-						keep(ourDce);
-						return true;
-					case THEIRS:
-						DirCacheEntry theirEntry = add(tw.getRawPath(), theirs,
-								DirCacheEntry.STAGE_0, EPOCH, 0);
-						addToCheckout(tw.getPathString(), theirEntry, attributes);
-						return true;
-					default:
-						result = new MergeResult<>(Collections.emptyList());
-						result.setContainsConflicts(true);
-						break;
+				case OURS:
+					keep(ourDce);
+					return true;
+				case THEIRS:
+					DirCacheEntry e = add(tw.getRawPath(), theirs,
+							DirCacheEntry.STAGE_0, EPOCH, 0);
+					if (e != null) {
+						addToCheckout(tw.getPathString(), e, attributes);
+					}
+					return true;
+				default:
+					result = new MergeResult<>(Collections.emptyList());
+					result.setContainsConflicts(true);
+					break;
 				}
 			}
 			if (ignoreConflicts) {
 				result.setContainsConflicts(false);
 			}
-			updateIndex(base, ours, theirs, result, attributes[T_OURS]);
 			String currentPath = tw.getPathString();
+			if (hasSymlink) {
+				if (ignoreConflicts) {
+					if (((modeT & FileMode.TYPE_MASK) == FileMode.TYPE_FILE)) {
+						DirCacheEntry e = add(tw.getRawPath(), theirs,
+								DirCacheEntry.STAGE_0, EPOCH, 0);
+						addToCheckout(currentPath, e, attributes);
+					} else {
+						keep(ourDce);
+					}
+				} else {
+					// Record the conflict
+					DirCacheEntry e = addConflict(base, ours, theirs);
+					mergeResults.put(currentPath, result);
+					// If theirs is a file, check it out. In link/file
+					// conflicts, C git prefers the file.
+					if (((modeT & FileMode.TYPE_MASK) == FileMode.TYPE_FILE)
+							&& e != null) {
+						addToCheckout(currentPath, e, attributes);
+					}
+				}
+			} else {
+				updateIndex(base, ours, theirs, result, attributes[T_OURS]);
+			}
 			if (result.containsConflicts() && !ignoreConflicts) {
 				unmergedPaths.add(currentPath);
 			}
@@ -683,40 +727,58 @@ public class ResolveMerger extends ThreeWayMerger {
 				if (gitLinkMerging && ignoreConflicts) {
 					add(tw.getRawPath(), ours, DirCacheEntry.STAGE_0, EPOCH, 0);
 				} else if (gitLinkMerging) {
-					add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0);
-					add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0);
-					add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0);
+					addConflict(base, ours, theirs);
 					MergeResult<SubmoduleConflict> result = createGitLinksMergeResult(
 							base, ours, theirs);
 					result.setContainsConflicts(true);
 					mergeResults.put(tw.getPathString(), result);
 					unmergedPaths.add(tw.getPathString());
 				} else {
+					boolean isSymLink = ((modeO | modeT)
+							& FileMode.TYPE_MASK) == FileMode.TYPE_SYMLINK;
 					// Content merge strategy does not apply to delete-modify
 					// conflicts!
 					MergeResult<RawText> result;
-					try {
-						result = contentMerge(base, ours, theirs, attributes,
-								ContentMergeStrategy.CONFLICT);
-					} catch (BinaryBlobException e) {
+					if (isSymLink) {
+						// No need to do a content merge
 						result = new MergeResult<>(Collections.emptyList());
 						result.setContainsConflicts(true);
+					} else {
+						try {
+							result = contentMerge(base, ours, theirs,
+									attributes, ContentMergeStrategy.CONFLICT);
+						} catch (BinaryBlobException e) {
+							result = new MergeResult<>(Collections.emptyList());
+							result.setContainsConflicts(true);
+						}
 					}
 					if (ignoreConflicts) {
-						// In case a conflict is detected the working tree file
-						// is again filled with new content (containing conflict
-						// markers). But also stage 0 of the index is filled
-						// with that content.
 						result.setContainsConflicts(false);
-						updateIndex(base, ours, theirs, result,
-								attributes[T_OURS]);
+						if (isSymLink) {
+							if (modeO != 0) {
+								keep(ourDce);
+							} else {
+								// Check out theirs
+								if (isWorktreeDirty(work, ourDce)) {
+									return false;
+								}
+								DirCacheEntry e = add(tw.getRawPath(), theirs,
+										DirCacheEntry.STAGE_0, EPOCH, 0);
+								if (e != null) {
+									addToCheckout(tw.getPathString(), e,
+											attributes);
+								}
+							}
+						} else {
+							// In case a conflict is detected the working tree
+							// file is again filled with new content (containing
+							// conflict markers). But also stage 0 of the index
+							// is filled with that content.
+							updateIndex(base, ours, theirs, result,
+									attributes[T_OURS]);
+						}
 					} else {
-						add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH,
-								0);
-						add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH,
-								0);
-						DirCacheEntry e = add(tw.getRawPath(), theirs,
-								DirCacheEntry.STAGE_3, EPOCH, 0);
+						DirCacheEntry e = addConflict(base, ours, theirs);
 
 						// OURS was deleted checkout THEIRS
 						if (modeO == 0) {
@@ -862,25 +924,25 @@ public class ResolveMerger extends ThreeWayMerger {
 				// A conflict occurred, the file will contain conflict markers
 				// the index will be populated with the three stages and the
 				// workdir (if used) contains the halfway merged content.
-				add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0);
-				add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0);
-				add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0);
+				addConflict(base, ours, theirs);
 				mergeResults.put(tw.getPathString(), result);
 				return;
 			}
 
 			// No conflict occurred, the file will contain fully merged content.
 			// The index will be populated with the new merged version.
-			Instant lastModified =
-					mergedFile == null ? null : nonNullRepo().getFS().lastModifiedInstant(mergedFile);
+			Instant lastModified = mergedFile == null ? null
+					: nonNullRepo().getFS().lastModifiedInstant(mergedFile);
 			// Set the mode for the new content. Fall back to REGULAR_FILE if
 			// we can't merge modes of OURS and THEIRS.
 			int newMode = mergeFileModes(tw.getRawMode(0), tw.getRawMode(1),
 					tw.getRawMode(2));
 			FileMode mode = newMode == FileMode.MISSING.getBits()
 					? FileMode.REGULAR_FILE : FileMode.fromBits(newMode);
-			workTreeUpdater.insertToIndex(rawMerged.openInputStream(), tw.getPathString().getBytes(UTF_8), mode,
-					DirCacheEntry.STAGE_0, lastModified, (int) rawMerged.length(),
+			workTreeUpdater.insertToIndex(rawMerged.openInputStream(),
+					tw.getPathString().getBytes(UTF_8), mode,
+					DirCacheEntry.STAGE_0, lastModified,
+					(int) rawMerged.length(),
 					attributes.get(Constants.ATTR_MERGE));
 		} finally {
 			if (rawMerged != null) {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/FilteredRevCommit.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/FilteredRevCommit.java
deleted file mode 100644
index 16beac3903..0000000000
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/FilteredRevCommit.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2022, Google LLC.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0 which is available at
- * https://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-package org.eclipse.jgit.revwalk;
-
-/**
- * A filtered commit reference that overrides its parent in the DAG.
- *
- * @since 6.3
- */
-public class FilteredRevCommit extends RevCommit {
-	private RevCommit[] overriddenParents;
-
-	/**
-	 * Create a new commit reference wrapping an underlying commit reference.
-	 *
-	 * @param commit
-	 *            commit that is being wrapped
-	 */
-	public FilteredRevCommit(RevCommit commit) {
-		this(commit, NO_PARENTS);
-	}
-
-	/**
-	 * Create a new commit reference wrapping an underlying commit reference.
-	 *
-	 * @param commit
-	 *            commit that is being wrapped
-	 * @param parents
-	 *            overridden parents for the commit
-	 */
-	public FilteredRevCommit(RevCommit commit, RevCommit... parents) {
-		super(commit);
-		this.overriddenParents = parents;
-		this.parents = NO_PARENTS;
-	}
-
-	/**
-	 * Update parents on the commit
-	 *
-	 * @param overriddenParents
-	 *            parents to be overwritten
-	 */
-	public void setParents(RevCommit... overriddenParents) {
-		this.overriddenParents = overriddenParents;
-	}
-
-	/**
-	 * Get the number of parent commits listed in this commit.
-	 *
-	 * @return number of parents; always a positive value but can be 0 if it has
-	 *         no parents.
-	 */
-	@Override
-	public int getParentCount() {
-		return overriddenParents.length;
-	}
-
-	/**
-	 * Get the nth parent from this commit's parent list.
-	 *
-	 * @param nth
-	 *            parent index to obtain. Must be in the range 0 through
-	 *            {@link #getParentCount()}-1.
-	 * @return the specified parent.
-	 * @throws java.lang.ArrayIndexOutOfBoundsException
-	 *             an invalid parent index was specified.
-	 */
-	@Override
-	public RevCommit getParent(int nth) {
-		return overriddenParents[nth];
-	}
-
-	/**
-	 * Obtain an array of all parents (<b>NOTE - THIS IS NOT A COPY</b>).
-	 *
-	 * <p>
-	 * This method is exposed only to provide very fast, efficient access to
-	 * this commit's parent list. Applications relying on this list should be
-	 * very careful to ensure they do not modify its contents during their use
-	 * of it.
-	 *
-	 * @return the array of parents.
-	 */
-	@Override
-	public RevCommit[] getParents() {
-		return overriddenParents;
-	}
-}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java
index a7c21e3f13..6b644cef90 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java
@@ -114,7 +114,7 @@ public class RevCommit extends RevObject {
 	 *
 	 * @since 6.3
 	 */
-	RevCommit[] parents;
+	protected RevCommit[] parents;
 
 	int commitTime; // An int here for performance, overflows in 2038
 
@@ -132,22 +132,6 @@ public class RevCommit extends RevObject {
 		super(id);
 	}
 
-	/**
-	 * Create a new commit reference.
-	 *
-	 * @param orig
-	 *            commit to be copied from.
-	 */
-	RevCommit(RevCommit orig) {
-		super(orig.getId());
-		this.buffer = orig.buffer;
-		this.commitTime = orig.commitTime;
-		this.flags = orig.flags;
-		this.parents = orig.parents;
-		this.tree = orig.tree;
-		this.inDegree = orig.inDegree;
-	}
-
 	@Override
 	void parseHeaders(RevWalk walk) throws MissingObjectException,
 			IncorrectObjectTypeException, IOException {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteGenerator.java
index 9ec331b697..2c88bb872e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteGenerator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteGenerator.java
@@ -11,8 +11,6 @@
 package org.eclipse.jgit.revwalk;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.errors.MissingObjectException;
@@ -40,13 +38,10 @@ class RewriteGenerator extends Generator {
 
 	private final FIFORevQueue pending;
 
-	private final Map<RevCommit, FilteredRevCommit> transformedCommits;
-
 	RewriteGenerator(Generator s) {
 		super(s.firstParent);
 		source = s;
 		pending = new FIFORevQueue(s.firstParent);
-		transformedCommits = new HashMap<>();
 	}
 
 	@Override
@@ -63,10 +58,10 @@ class RewriteGenerator extends Generator {
 	@Override
 	RevCommit next() throws MissingObjectException,
 			IncorrectObjectTypeException, IOException {
-		FilteredRevCommit c = (FilteredRevCommit) pending.next();
+		RevCommit c = pending.next();
 
 		if (c == null) {
-			c = transform(source.next());
+			c = source.next();
 			if (c == null) {
 				// We are done: Both the source generator and our internal list
 				// are completely exhausted.
@@ -84,9 +79,9 @@ class RewriteGenerator extends Generator {
 			final RevCommit newp = rewrite(oldp);
 			if (firstParent) {
 				if (newp == null) {
-					c.setParents(RevCommit.NO_PARENTS);
+					c.parents = RevCommit.NO_PARENTS;
 				} else {
-					c.setParents(newp);
+					c.parents = new RevCommit[] { newp };
 				}
 				return c;
 			}
@@ -96,7 +91,7 @@ class RewriteGenerator extends Generator {
 			}
 		}
 		if (rewrote) {
-			c.setParents(cleanup(pList));
+			c.parents = cleanup(pList);
 		}
 		return c;
 	}
@@ -116,7 +111,7 @@ class RewriteGenerator extends Generator {
 		for (RevCommit parent : c.getParents()) {
 			while ((parent.flags & RevWalk.TREE_REV_FILTER_APPLIED) == 0) {
 
-				FilteredRevCommit n = transform(source.next());
+				RevCommit n = source.next();
 
 				if (n != null) {
 					pending.add(n);
@@ -135,8 +130,6 @@ class RewriteGenerator extends Generator {
 			IncorrectObjectTypeException, IOException {
 		for (;;) {
 
-			p = transform(p);
-
 			if (p.getParentCount() > 1) {
 				// This parent is a merge, so keep it.
 				//
@@ -165,25 +158,9 @@ class RewriteGenerator extends Generator {
 			}
 
 			applyFilterToParents(p.getParent(0));
-			p = transform(p.getParent(0));
-
-		}
-	}
+			p = p.getParent(0);
 
-	private FilteredRevCommit transform(RevCommit c) {
-		if (c == null) {
-			return null;
 		}
-
-		if (c instanceof FilteredRevCommit) {
-			return (FilteredRevCommit) c;
-		}
-
-		if (!transformedCommits.containsKey(c)) {
-			transformedCommits.put(c, new FilteredRevCommit(c, c.getParents()));
-		}
-
-		return transformedCommits.get(c);
 	}
 
 	private RevCommit[] cleanup(RevCommit[] oldList) {
diff --git a/pom.xml b/pom.xml
index 14d8a63752..5693c10699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <groupId>org.eclipse.jgit</groupId>
   <artifactId>org.eclipse.jgit-parent</artifactId>
   <packaging>pom</packaging>
-  <version>6.3.0-SNAPSHOT</version>
+  <version>6.3.1-SNAPSHOT</version>
 
   <name>JGit - Parent</name>
   <url>${jgit-url}</url>