From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Nov 2011 23:04:11 +0000 (-0800)
Subject: Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive
X-Git-Tag: v1.7.8.1~5^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7b51c33b376d22195dba1c4e067180164fd35dbf?hp=7b51c33b376d22195dba1c4e067180164fd35dbf

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
---