Merge branch 'fixes'

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 19a8f122c75bc14e3bf421a5aeee0f2bd3ff7e83..59ce77b6b42eceaf953e955b79723753deb10033 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -18,12 +18,12 @@ test_expect_success setup '
        do
            sleep 1 &&
            commit=$(echo "Commit #$i" | git-commit-tree $tree -p $parent) &&
-           parent=$commit || exit
+           parent=$commit || return 1
        done &&
        echo "$commit" >.git/HEAD &&
-       git clone -l ./. victim &&
+       git-clone -l ./. victim &&
        cd victim &&
-       git log &&
+       git-log &&
        cd .. &&
        echo $zero >.git/HEAD &&
        parent=$zero &&
@@ -31,11 +31,11 @@ test_expect_success setup '
        do
            sleep 1 &&
            commit=$(echo "Rebase #$i" | git-commit-tree $tree -p $parent) &&
-           parent=$commit || exit
+           parent=$commit || return 1
        done &&
        echo "$commit" >.git/HEAD &&
        echo Rebase &&
-       git log'
+       git-log'
 
 test_expect_success \
         'pushing rewound head should not barf but require --force' ' 
@@ -52,3 +52,5 @@ test_expect_success \
        git-send-pack --force ./victim/.git/ master &&
        cmp victim/.git/refs/heads/master .git/refs/heads/master
 '
+
+test_done