Browse Source

Merge "UploadPack: Tag non-commits SATISIFIED earlier"

stable-0.12
Chris Aniszczyk 14 years ago committed by Code Review
parent
commit
8949ea4789
  1. 8
      org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java

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

@ -499,6 +499,9 @@ public class UploadPack {
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 @@ public class UploadPack {
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 (;;) {

Loading…
Cancel
Save