Merge branch 'jc/lstat'

* jc/lstat:
diff-files: mark an index entry we know is up-to-date as such
write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE

diff --cc diff-lib.c
Simple merge