diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2022-01-18 18:09:03 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2022-01-18 18:09:03 +0100 |
| commit | d017a655dfbdac2393ec645c6864e190cf55516c (patch) | |
| tree | 78ac24871d7ff3ce5ea999c8276e301950ee7080 /org.eclipse.jgit/src/org/eclipse/jgit | |
| parent | d30447e2699d217fe70b52c4fa74674445e48f64 (diff) | |
| parent | de1abd323763dc88c46dbbfaca6e23b640a4ce5e (diff) | |
| download | jgit-d017a655dfbdac2393ec645c6864e190cf55516c.tar.gz jgit-d017a655dfbdac2393ec645c6864e190cf55516c.zip | |
Merge branch 'stable-6.0'
* stable-6.0:
UploadPack v2 protocol: Stop negotiation for orphan refs
Complete update to servlet api 4.0.0
Change-Id: I55ab6e8fd4a76e4313e37b12f9fc5d5e4b84a681
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index 6da6c13342..0a7eb17f05 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -2175,6 +2175,11 @@ public class UploadPack { if (want.has(SATISFIED)) return true; + if (((RevCommit) want).getParentCount() == 0) { + want.add(SATISFIED); + return true; + } + walk.resetRetain(SAVE); walk.markStart((RevCommit) want); if (oldestTime != 0) |