Merge pull request #6208 from jorio/fix-stale-filesize-crash diff_file: fix crash if size of diffed file changes in workdir