Merge branch 'maint-2.1' into maint

* maint-2.1:
  is_hfs_dotgit: loosen over-eager match of \u{..47}

diff --cc t/t1450-fsck.sh
Simple merge

diff --cc utf8.c
Simple merge