motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "UploadPack: Tag non-commits SATISIFIED earlier"

This commit is contained in:
Chris Aniszczyk 2011-02-13 16:23:35 -05:00 committed by Code Review
parent d90b6aaa44 0fe7eeba04
commit 8949ea4789
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -499,6 +499,9 @@ private ObjectId processHaveLines(List<ObjectId> peerHas, ObjectId last)
wantAll.add(obj); wantAll.add(obj);
} }
if (!(obj instanceof RevCommit))
obj.add(SATISFIED);
if (obj instanceof RevTag) { if (obj instanceof RevTag) {
RevObject target = walk.peel(obj); RevObject target = walk.peel(obj);
if (target instanceof RevCommit) { if (target instanceof RevCommit) {
@ -601,11 +604,6 @@ private boolean wantSatisfied(final RevObject want) throws IOException {
if (want.has(SATISFIED)) if (want.has(SATISFIED))
return true; return true;
if (!(want instanceof RevCommit)) {
want.add(SATISFIED);
return true;
}
walk.resetRetain(SAVE); walk.resetRetain(SAVE);
walk.markStart((RevCommit) want); walk.markStart((RevCommit) want);
for (;;) { for (;;) {