Use git-tag in git-cvsimport

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 2a55d5ae3206d056f87310d85e5ee5436437ae23..477b267599512fee5a5a3cf86687c3708ff967b8 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -55,13 +55,13 @@ test_expect_success setup '
 
 test_expect_success 'pack the source repository' '
        git repack -a -d &&
-       git prune --grace=off
+       git prune
 '
 
 test_expect_success 'pack the destination repository' '
        cd victim &&
        git repack -a -d &&
-       git prune --grace=off &&
+       git prune &&
        cd ..
 '
 
@@ -106,11 +106,11 @@ export HOME ;# this way we force the victim/.git/config to be used.
 test_expect_success \
         'pushing with --force should be denied with denyNonFastforwards' '
        cd victim &&
-       git-repo-config receive.denyNonFastforwards true &&
+       git-config receive.denyNonFastforwards true &&
        cd .. &&
-       git-update-ref refs/heads/master master^ &&
-       git-send-pack --force ./victim/.git/ master &&
-       ! diff -u .git/refs/heads/master victim/.git/refs/heads/master
+       git-update-ref refs/heads/master master^ || return 1
+       git-send-pack --force ./victim/.git/ master && return 1
+       ! git diff .git/refs/heads/master victim/.git/refs/heads/master
 '
 
 test_done