diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-29 16:26:27 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-29 16:26:27 -0400 |
| commit | fecb9b63b21326836341bcf773d7c4c2d345c11e (patch) | |
| tree | a934b81debba960bd8446bf25abe57ebf4a7ed6b /Annex/AutoMerge.hs | |
| parent | bc22a44b2d8ea4edd4e830604acde9de8deb204b (diff) | |
fix inode cache consistency bug when a merge unlocks a present file
Since the file was present and locked, its annex object was not in the
inode cache. So, despite not needing to update the annex object when the
clean filter is run on the content by git merge, it does need to record the
inode cache of the annex object. Otherwise, the annex object will be
assumed to be bad, since its inode is not cached.
Diffstat (limited to 'Annex/AutoMerge.hs')
0 files changed, 0 insertions, 0 deletions