t5701: modernize style

This test is pretty old and did not follow some of our more
modern best practices. In particular:

  1. It chdir'd all over the place, leaving later tests to
     deal with the fallout. Do our chdirs in subshells
     instead.

  2. It did not use test_must_fail.

  3. It did not use test_line_count.

  4. It checked for the non-existence of a ref by looking in the
     .git/refs directory (since we pack refs during clone
     these days, this will always be succeed, making the
     test useless).

     Note that one call to "-e .git/refs/..." remains,
     because it is checking for the existence of a symbolic
     ref, not a ref itself.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2012-05-25 23:42:53 -04:00 committed by Junio C Hamano
parent a8f4933895
commit f27e7654de

View File

@ -3,7 +3,10 @@
test_description='test local clone' test_description='test local clone'
. ./test-lib.sh . ./test-lib.sh
D=`pwd` repo_is_hardlinked() {
find "$1/objects" -type f -links 1 >output &&
test_line_count = 0 output
}
test_expect_success 'preparing origin repository' ' test_expect_success 'preparing origin repository' '
: >file && git add . && git commit -m1 && : >file && git add . && git commit -m1 &&
@ -19,105 +22,72 @@ test_expect_success 'preparing origin repository' '
' '
test_expect_success 'local clone without .git suffix' ' test_expect_success 'local clone without .git suffix' '
cd "$D" &&
git clone -l -s a b && git clone -l -s a b &&
cd b && (cd b &&
test "$(GIT_CONFIG=.git/config git config --bool core.bare)" = false && test "$(GIT_CONFIG=.git/config git config --bool core.bare)" = false &&
git fetch git fetch)
' '
test_expect_success 'local clone with .git suffix' ' test_expect_success 'local clone with .git suffix' '
cd "$D" &&
git clone -l -s a.git c && git clone -l -s a.git c &&
cd c && (cd c && git fetch)
git fetch
' '
test_expect_success 'local clone from x' ' test_expect_success 'local clone from x' '
cd "$D" &&
git clone -l -s x y && git clone -l -s x y &&
cd y && (cd y && git fetch)
git fetch
' '
test_expect_success 'local clone from x.git that does not exist' ' test_expect_success 'local clone from x.git that does not exist' '
cd "$D" && test_must_fail git clone -l -s x.git z
if git clone -l -s x.git z
then
echo "Oops, should have failed"
false
else
echo happy
fi
' '
test_expect_success 'With -no-hardlinks, local will make a copy' ' test_expect_success 'With -no-hardlinks, local will make a copy' '
cd "$D" &&
git clone --bare --no-hardlinks x w && git clone --bare --no-hardlinks x w &&
cd w && ! repo_is_hardlinked w
linked=$(find objects -type f ! -links 1 | wc -l) &&
test 0 = $linked
' '
test_expect_success 'Even without -l, local will make a hardlink' ' test_expect_success 'Even without -l, local will make a hardlink' '
cd "$D" &&
rm -fr w && rm -fr w &&
git clone -l --bare x w && git clone -l --bare x w &&
cd w && repo_is_hardlinked w
copied=$(find objects -type f -links 1 | wc -l) &&
test 0 = $copied
' '
test_expect_success 'local clone of repo with nonexistent ref in HEAD' ' test_expect_success 'local clone of repo with nonexistent ref in HEAD' '
cd "$D" &&
echo "ref: refs/heads/nonexistent" > a.git/HEAD && echo "ref: refs/heads/nonexistent" > a.git/HEAD &&
git clone a d && git clone a d &&
cd d && (cd d &&
git fetch && git fetch &&
test ! -e .git/refs/remotes/origin/HEAD' test ! -e .git/refs/remotes/origin/HEAD)
'
test_expect_success 'bundle clone without .bundle suffix' ' test_expect_success 'bundle clone without .bundle suffix' '
cd "$D" &&
git clone dir/b3 && git clone dir/b3 &&
cd b3 && (cd b3 && git fetch)
git fetch
' '
test_expect_success 'bundle clone with .bundle suffix' ' test_expect_success 'bundle clone with .bundle suffix' '
cd "$D" &&
git clone b1.bundle && git clone b1.bundle &&
cd b1 && (cd b1 && git fetch)
git fetch
' '
test_expect_success 'bundle clone from b4' ' test_expect_success 'bundle clone from b4' '
cd "$D" &&
git clone b4 bdl && git clone b4 bdl &&
cd bdl && (cd bdl && git fetch)
git fetch
' '
test_expect_success 'bundle clone from b4.bundle that does not exist' ' test_expect_success 'bundle clone from b4.bundle that does not exist' '
cd "$D" && test_must_fail git clone b4.bundle bb
if git clone b4.bundle bb
then
echo "Oops, should have failed"
false
else
echo happy
fi
' '
test_expect_success 'bundle clone with nonexistent HEAD' ' test_expect_success 'bundle clone with nonexistent HEAD' '
cd "$D" &&
git clone b2.bundle b2 && git clone b2.bundle b2 &&
cd b2 && (cd b2 &&
git fetch && git fetch &&
test ! -e .git/refs/heads/master test_must_fail git rev-parse --verify refs/heads/master)
' '
test_expect_success 'clone empty repository' ' test_expect_success 'clone empty repository' '
cd "$D" &&
mkdir empty && mkdir empty &&
(cd empty && (cd empty &&
git init && git init &&
@ -135,7 +105,6 @@ test_expect_success 'clone empty repository' '
' '
test_expect_success 'clone empty repository, and then push should not segfault.' ' test_expect_success 'clone empty repository, and then push should not segfault.' '
cd "$D" &&
rm -fr empty/ empty-clone/ && rm -fr empty/ empty-clone/ &&
mkdir empty && mkdir empty &&
(cd empty && git init) && (cd empty && git init) &&
@ -145,13 +114,11 @@ test_expect_success 'clone empty repository, and then push should not segfault.'
' '
test_expect_success 'cloning non-existent directory fails' ' test_expect_success 'cloning non-existent directory fails' '
cd "$D" &&
rm -rf does-not-exist && rm -rf does-not-exist &&
test_must_fail git clone does-not-exist test_must_fail git clone does-not-exist
' '
test_expect_success 'cloning non-git directory fails' ' test_expect_success 'cloning non-git directory fails' '
cd "$D" &&
rm -rf not-a-git-repo not-a-git-repo-clone && rm -rf not-a-git-repo not-a-git-repo-clone &&
mkdir not-a-git-repo && mkdir not-a-git-repo &&
test_must_fail git clone not-a-git-repo not-a-git-repo-clone test_must_fail git clone not-a-git-repo not-a-git-repo-clone