motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-5.13' into stable-6.0 

* stable-5.13:
  UploadPack v2 protocol: Stop negotiation for orphan refs

Change-Id: I6a9ed8338ffbf5363e48d640a2c4209e4e503549
This commit is contained in:
Matthias Sohn 2022-01-18 18:07:59 +01:00
parent 1e932c2e52 2cc0009737
commit de1abd3237
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java
View File

@ -1106,6 +1106,61 @@ public void testV2FetchWithWaitForDoneOnlyDoesNegotiationAndNothingToAck()
assertTrue(PacketLineIn.isEnd(pckIn.readString()));
}
@Test
public void testV2FetchServerStopsNegotiationForRefWithoutParents()
throws Exception {
RevCommit fooCommit = remote.commit().message("x").create();
RevCommit barCommit = remote.commit().message("y").create();
remote.update("refs/changes/01/1/1", fooCommit);
remote.update("refs/changes/02/2/1", barCommit);
ByteArrayInputStream recvStream = uploadPackV2("command=fetch\n",
PacketLineIn.delimiter(),
"want " + fooCommit.toObjectId().getName() + "\n",
"have " + barCommit.toObjectId().getName() + "\n",
PacketLineIn.end());
PacketLineIn pckIn = new PacketLineIn(recvStream);
assertThat(pckIn.readString(), is("acknowledgments"));
assertThat(pckIn.readString(),
is("ACK " + barCommit.toObjectId().getName()));
assertThat(pckIn.readString(), is("ready"));
assertTrue(PacketLineIn.isDelimiter(pckIn.readString()));
assertThat(pckIn.readString(), is("packfile"));
parsePack(recvStream);
assertTrue(client.getObjectDatabase().has(fooCommit.toObjectId()));
}
@Test
public void testV2FetchServerDoesNotStopNegotiationWhenOneRefWithoutParentAndOtherWithParents()
throws Exception {
RevCommit fooCommit = remote.commit().message("x").create();
RevCommit barParent = remote.commit().message("y").create();
RevCommit barChild = remote.commit().message("y").parent(barParent)
.create();
RevCommit fooBarParent = remote.commit().message("z").create();
RevCommit fooBarChild = remote.commit().message("y")
.parent(fooBarParent)
.create();
remote.update("refs/changes/01/1/1", fooCommit);
remote.update("refs/changes/02/2/1", barChild);
remote.update("refs/changes/03/3/1", fooBarChild);
ByteArrayInputStream recvStream = uploadPackV2("command=fetch\n",
PacketLineIn.delimiter(),
"want " + fooCommit.toObjectId().getName() + "\n",
"want " + barChild.toObjectId().getName() + "\n",
"want " + fooBarChild.toObjectId().getName() + "\n",
"have " + fooBarParent.toObjectId().getName() + "\n",
PacketLineIn.end());
PacketLineIn pckIn = new PacketLineIn(recvStream);
assertThat(pckIn.readString(), is("acknowledgments"));
assertThat(pckIn.readString(),
is("ACK " + fooBarParent.toObjectId().getName()));
assertTrue(PacketLineIn.isEnd(pckIn.readString()));
}
@Test
public void testV2FetchThinPack() throws Exception {
String commonInBlob = "abcdefghijklmnopqrstuvwxyz";

5
org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
View File

@ -2175,6 +2175,11 @@ private boolean wantSatisfied(RevObject want) throws IOException {
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)