Merge branch 'maint'

* maint:
  fsck: reduce stack footprint
  make sure packs to be replaced are closed beforehand

diff --cc builtin-fsck.c
Simple merge

diff --cc builtin-pack-objects.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc sha1_file.c
Simple merge