t1400: use show-ref to check pseudorefs
Now that "git show-ref --verify" accepts pseudorefs use that in preference to "git rev-parse" when checking pseudorefs as we do when checking branches etc. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Feb 7, 2024 at 16:44 UTC
1af410d455c5cddae1cdea3e5333ffd6ab616045
1 file changed
+9
-9
t/t1400-update-ref.sh
+9
-9
@@ -524,51 +524,51 @@ test_expect_success 'given old value for missing pseudoref, do not create' '
524
525
test_expect_success 'create pseudoref' '
526
git update-ref PSEUDOREF $A &&
527
- test $A = $(git rev-parse PSEUDOREF)
527
+ test $A = $(git show-ref -s --verify PSEUDOREF)
528
'
529
530
test_expect_success 'overwrite pseudoref with no old value given' '
531
git update-ref PSEUDOREF $B &&
532
- test $B = $(git rev-parse PSEUDOREF)
532
+ test $B = $(git show-ref -s --verify PSEUDOREF)
533
'
534
535
test_expect_success 'overwrite pseudoref with correct old value' '
536
git update-ref PSEUDOREF $C $B &&
537
- test $C = $(git rev-parse PSEUDOREF)
537
+ test $C = $(git show-ref -s --verify PSEUDOREF)
538
'
539
540
test_expect_success 'do not overwrite pseudoref with wrong old value' '
541
test_must_fail git update-ref PSEUDOREF $D $E 2>err &&
542
- test $C = $(git rev-parse PSEUDOREF) &&
542
+ test $C = $(git show-ref -s --verify PSEUDOREF) &&
543
test_grep "cannot lock ref.*expected" err
544
'
545
546
test_expect_success 'delete pseudoref' '
547
git update-ref -d PSEUDOREF &&
548
- test_must_fail git rev-parse PSEUDOREF
548
+ test_must_fail git show-ref -s --verify PSEUDOREF
549
'
550
551
test_expect_success 'do not delete pseudoref with wrong old value' '
552
git update-ref PSEUDOREF $A &&
553
test_must_fail git update-ref -d PSEUDOREF $B 2>err &&
554
- test $A = $(git rev-parse PSEUDOREF) &&
554
+ test $A = $(git show-ref -s --verify PSEUDOREF) &&
555
test_grep "cannot lock ref.*expected" err
556
'
557
558
test_expect_success 'delete pseudoref with correct old value' '
559
git update-ref -d PSEUDOREF $A &&
560
- test_must_fail git rev-parse PSEUDOREF
560
+ test_must_fail git show-ref -s --verify PSEUDOREF
561
'
562
563
test_expect_success 'create pseudoref with old OID zero' '
564
git update-ref PSEUDOREF $A $Z &&
565
- test $A = $(git rev-parse PSEUDOREF)
565
+ test $A = $(git show-ref -s --verify PSEUDOREF)
566
'
567
568
test_expect_success 'do not overwrite pseudoref with old OID zero' '
569
test_when_finished git update-ref -d PSEUDOREF &&
570
test_must_fail git update-ref PSEUDOREF $B $Z 2>err &&
571
- test $A = $(git rev-parse PSEUDOREF) &&
571
+ test $A = $(git show-ref -s --verify PSEUDOREF) &&
572
test_grep "already exists" err
573
'
574