Merge branch 'ps/ref-tests-update-even-more'

[thirdparty/git.git] / t / t1400-update-ref.sh

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 3aeb103d34687a4ba4bbf47edde459b28569c0fe..6ebc3ef9453b71dbc7d90a052834af482dfd48ec 100755 (executable)
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -497,51 +497,51 @@ test_expect_success 'given old value for missing pseudoref, do not create' '
 
 test_expect_success 'create pseudoref' '
        git update-ref PSEUDOREF $A &&
-       test $A = $(git rev-parse PSEUDOREF)
+       test $A = $(git show-ref -s --verify PSEUDOREF)
 '
 
 test_expect_success 'overwrite pseudoref with no old value given' '
        git update-ref PSEUDOREF $B &&
-       test $B = $(git rev-parse PSEUDOREF)
+       test $B = $(git show-ref -s --verify PSEUDOREF)
 '
 
 test_expect_success 'overwrite pseudoref with correct old value' '
        git update-ref PSEUDOREF $C $B &&
-       test $C = $(git rev-parse PSEUDOREF)
+       test $C = $(git show-ref -s --verify PSEUDOREF)
 '
 
 test_expect_success 'do not overwrite pseudoref with wrong old value' '
        test_must_fail git update-ref PSEUDOREF $D $E 2>err &&
-       test $C = $(git rev-parse PSEUDOREF) &&
+       test $C = $(git show-ref -s --verify PSEUDOREF) &&
        test_grep "cannot lock ref.*expected" err
 '
 
 test_expect_success 'delete pseudoref' '
        git update-ref -d PSEUDOREF &&
-       test_must_fail git rev-parse PSEUDOREF
+       test_must_fail git show-ref -s --verify PSEUDOREF
 '
 
 test_expect_success 'do not delete pseudoref with wrong old value' '
        git update-ref PSEUDOREF $A &&
        test_must_fail git update-ref -d PSEUDOREF $B 2>err &&
-       test $A = $(git rev-parse PSEUDOREF) &&
+       test $A = $(git show-ref -s --verify PSEUDOREF) &&
        test_grep "cannot lock ref.*expected" err
 '
 
 test_expect_success 'delete pseudoref with correct old value' '
        git update-ref -d PSEUDOREF $A &&
-       test_must_fail git rev-parse PSEUDOREF
+       test_must_fail git show-ref -s --verify PSEUDOREF
 '
 
 test_expect_success 'create pseudoref with old OID zero' '
        git update-ref PSEUDOREF $A $Z &&
-       test $A = $(git rev-parse PSEUDOREF)
+       test $A = $(git show-ref -s --verify PSEUDOREF)
 '
 
 test_expect_success 'do not overwrite pseudoref with old OID zero' '
        test_when_finished git update-ref -d PSEUDOREF &&
        test_must_fail git update-ref PSEUDOREF $B $Z 2>err &&
-       test $A = $(git rev-parse PSEUDOREF) &&
+       test $A = $(git show-ref -s --verify PSEUDOREF) &&
        test_grep "already exists" err
 '