Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Nov 2011 23:04:11 +0000 (15:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Nov 2011 23:04:11 +0000 (15:04 -0800)
commit7b51c33b376d22195dba1c4e067180164fd35dbf
treeefaf7471d6ab92f207ac819d1e90ead43a86d4f2
parentbd5bce7cbc55fa52277cc8a39f673c3e2dc60670
parentee27ca4a781844ddbf556ec64daae24d748a7c5a
Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive

* jk/maint-1.6.2-upload-archive:
  archive: don't let remote clients get unreachable commits

Conflicts:
archive.c
archive.h
builtin-archive.c
builtin/upload-archive.c
t/t5000-tar-tree.sh
archive.c
t/t5000-tar-tree.sh