Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  Make repack less likely to corrupt repository
  fast-export: ensure we traverse commits in topological order
  Clear the delta base cache if a pack is rebuilt

diff --cc builtin-fast-export.c
Simple merge

diff --cc sha1_file.c
Simple merge