diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2022-01-18 18:07:59 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2022-01-18 18:07:59 +0100 |
| commit | de1abd323763dc88c46dbbfaca6e23b640a4ce5e (patch) | |
| tree | 6b76fa743c7ef538d7d1ab70e908181a7d95c4cd /org.eclipse.jgit/src | |
| parent | 1e932c2e5289e965dea0314b230b6d3d94ea3bdb (diff) | |
| parent | 2cc0009737182822a82731f523c0f6ded7601ddb (diff) | |
| download | jgit-de1abd323763dc88c46dbbfaca6e23b640a4ce5e.tar.gz jgit-de1abd323763dc88c46dbbfaca6e23b640a4ce5e.zip | |
Merge branch 'stable-5.13' into stable-6.0
* stable-5.13:
UploadPack v2 protocol: Stop negotiation for orphan refs
Change-Id: I6a9ed8338ffbf5363e48d640a2c4209e4e503549
Diffstat (limited to 'org.eclipse.jgit/src')
| -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) |