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

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