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
This commit is contained in:
Junio C Hamano
2011-11-21 15:04:11 -08:00
2 changed files with 22 additions and 4 deletions

View File

@ -242,6 +242,14 @@ test_expect_success \
'git archive --list outside of a git repo' \
'GIT_DIR=some/non-existing/directory git archive --list'
test_expect_success 'clients cannot access unreachable commits' '
test_commit unreachable &&
sha1=`git rev-parse HEAD` &&
git reset --hard HEAD^ &&
git archive $sha1 >remote.tar &&
test_must_fail git archive --remote=. $sha1 >remote.tar
'
test_expect_success 'git-archive --prefix=olde-' '
git archive --prefix=olde- >h.tar HEAD &&
(