Merge branch 'maint'

* maint:
  pack-objects doesn't create random pack names
  link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure

diff --cc Documentation/git-pack-objects.txt
Simple merge

diff --cc sha1_file.c
Simple merge