Merge branch 'rs/empty-archive' into maint
commit250ee16c14c8b37b437fbfc7345313d7db32b95d
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:36:54 +0000 (3 15:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:36:54 +0000 (3 15:36 -0700)
tree282b6cfa7b92e184a20e29817b4547added44f78
parent15afe9596c101d00085830c54fdc4c4ad0b7193e
parent56ee96572a7ec5a6b1a59ccdbbf204af16903d17
Merge branch 'rs/empty-archive' into maint

* rs/empty-archive:
  t5004: resurrect original empty tar archive test
  t5004: avoid using tar for checking emptiness of archive

Conflicts:
t/t5004-archive-corner-cases.sh
t/t5004-archive-corner-cases.sh