diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2010-10-17 23:10:47 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2010-10-17 23:10:47 -0700 |
| commit | e51e06946f4ca70b6f3286593cc1406037b628a9 (patch) | |
| tree | 2457680d6575ea3ddf134175758363e3ca2c8d6e /org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java | |
| parent | f5e5b98c3a993873bfbdd19ef28d14f8ccca4b0c (diff) | |
| download | jgit-e51e06946f4ca70b6f3286593cc1406037b628a9.tar.gz jgit-e51e06946f4ca70b6f3286593cc1406037b628a9.zip | |
Update CachedObjectDirectory when inserting objects
If an ObjectInserter is created from a CachedObjectDirectory, we need
to ensure the cache is updated whenever a new loose object is actually
added to the loose objects directory, otherwise a future read from an
ObjectReader on the CachedObjectDirectory might not be able to open
the newly created object.
We mostly had the infrastructure in place to implement this due to the
injection of unpacked large deltas, but we didn't have a way to pass
the ObjectId from ObjectDirectoryInserter to CachedObjectDirectory,
because the inserter was using the underlying ObjectDirectory and not
the CachedObjectDirectory. Redirecting to CachedObjectDirectory
ensures the cache is updated.
Change-Id: I1f7bdfacc7ad77ebdb885f655e549cc570652225
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java')
0 files changed, 0 insertions, 0 deletions