Merge branch 'js/import-tars-hardlinks' into maint
commit5e09f1dd30dea9647ee58556b90caefdd8533869
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:54 +0000 (8 21:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:54 +0000 (8 21:35 -0700)
tree1f9b05d6249c6cbb88a34a04b8f45a4839937fa3
parentc343e4919edc41a2c8992548654db56c77b3e607
parent04e0869876f726d5af9ac901911781d440e6aed2
Merge branch 'js/import-tars-hardlinks' into maint

"import-tars" fast-import script (in contrib/) used to ignore a
hardlink target and replaced it with an empty file, which has been
corrected to record the same blob as the other file the hardlink is
shared with.

* js/import-tars-hardlinks:
  import-tars: support hard links