diff options
| author | Chris Aniszczyk <caniszczyk@gmail.com> | 2011-02-13 16:23:35 -0500 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2011-02-13 16:23:35 -0500 |
| commit | 8949ea47897fcff30de204cb10957b68d5d21345 (patch) | |
| tree | 3300178c473e33f703acd0ed1f65273b721fa7ef /org.eclipse.jgit | |
| parent | d90b6aaa446f5d190a3cd6ecdf6f663ce5440e0e (diff) | |
| parent | 0fe7eeba04b097828a68ea6558b04aebf27fd858 (diff) | |
| download | jgit-8949ea47897fcff30de204cb10957b68d5d21345.tar.gz jgit-8949ea47897fcff30de204cb10957b68d5d21345.zip | |
Merge "UploadPack: Tag non-commits SATISIFIED earlier"
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java | 8 |
1 files changed, 3 insertions, 5 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 86ec653561..63fa503b1e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -499,6 +499,9 @@ public class UploadPack { 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 @@ public class UploadPack { if (want.has(SATISFIED)) return true; - if (!(want instanceof RevCommit)) { - want.add(SATISFIED); - return true; - } - walk.resetRetain(SAVE); walk.markStart((RevCommit) want); for (;;) { |