Merge branch 'np/diff-in-corrupt-repository' into next

* np/diff-in-corrupt-repository:
  diff: don't presume empty file when corresponding object is missing

diff --cc diff.c
Simple merge