diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2010-08-24 17:20:50 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2010-08-24 17:37:07 -0700 |
| commit | 1c3f3fdbd237f1f344c8ea081a47c698f47a0de6 (patch) | |
| tree | d13e83bae08f605b8a51e580021dd19a664a1944 /org.eclipse.jgit.test | |
| parent | a5c18fcfc7929f91c6aa4a4314d28d0f924aad46 (diff) | |
| download | jgit-1c3f3fdbd237f1f344c8ea081a47c698f47a0de6.tar.gz jgit-1c3f3fdbd237f1f344c8ea081a47c698f47a0de6.zip | |
Fix ObjectDirectory abbreviation resolution to notice new packs
If we can't resolve an abbreviation, it might be because there is
a new pack file we haven't picked up yet. Try scanning the packs
again and recheck each pack if there were differences from the last
scan we did.
Because of this, we don't have to open a pack during the test where
we generate a pack on the fly. We'll miss on the first loop during
which the PackList is the NO_PACKS magic initialization constant,
and pick up the newly created index during this retry logic.
Change-Id: I7b97efb29a695ee60c90818be380f7ea23ad13a3
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/AbbreviationTest.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/AbbreviationTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/AbbreviationTest.java index 5e8f72b5ba..96e36a2a6b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/AbbreviationTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/AbbreviationTest.java @@ -173,7 +173,6 @@ public class AbbreviationTest extends LocalDiskRepositoryTestCase { dst.close(); } new FileOutputStream(packFile).close(); - db.openPack(packFile, idxFile); assertEquals(id.abbreviate(20), reader.abbreviate(id, 2)); |