Merge "UploadPack: Tag non-commits SATISIFIED earlier"
This commit is contained in:
commit
8949ea4789
|
@ -499,6 +499,9 @@ private ObjectId processHaveLines(List<ObjectId> peerHas, ObjectId last)
|
|||
wantAll.add(obj);
|
||||
}
|
||||
|
||||
if (!(obj instanceof RevCommit))
|
||||
obj.add(SATISFIED);
|
||||
|
||||
if (obj instanceof RevTag) {
|
||||
RevObject target = walk.peel(obj);
|
||||
if (target instanceof RevCommit) {
|
||||
|
@ -601,11 +604,6 @@ private boolean wantSatisfied(final RevObject want) throws IOException {
|
|||
if (want.has(SATISFIED))
|
||||
return true;
|
||||
|
||||
if (!(want instanceof RevCommit)) {
|
||||
want.add(SATISFIED);
|
||||
return true;
|
||||
}
|
||||
|
||||
walk.resetRetain(SAVE);
|
||||
walk.markStart((RevCommit) want);
|
||||
for (;;) {
|
||||
|
|
Loading…
Reference in New Issue