author | Junio C Hamano <gitster@pobox.com> | |
Mon, 21 Nov 2011 23:04:11 +0000 (15:04 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 21 Nov 2011 23:04:11 +0000 (15:04 -0800) | ||
commit | 7b51c33b376d22195dba1c4e067180164fd35dbf | |
tree | efaf7471d6ab92f207ac819d1e90ead43a86d4f2 | tree | snapshot |
parent | bd5bce7cbc55fa52277cc8a39f673c3e2dc60670 | commit | diff |
parent | ee27ca4a781844ddbf556ec64daae24d748a7c5a | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |
t/t5000-tar-tree.sh | diff1 | | diff2 | | blob | history |