Merge branch 'maint'

* maint:
  builtin-prune.c: prune temporary packs in <object_dir>/pack directory
  Do not perform cross-directory renames when creating packs

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

diff --cc fast-import.c
Simple merge