Skip to content

Commit e3fe714

Browse files
committed
Merge branch 'jc/maint-t7406-rev-parse-max-count-huh'
Test clean-up, with no behaviour change. * jc/maint-t7406-rev-parse-max-count-huh: t7406: fix misleading "rev-parse --max-count=1 HEAD"
2 parents 3b75314 + ad6a599 commit e3fe714

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

t/t7406-submodule-update.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ test_expect_success 'submodule update continues after checkout error' '
367367
git submodule init &&
368368
git commit -am "new_submodule" &&
369369
(cd submodule2 &&
370-
git rev-parse --max-count=1 HEAD > ../expect
370+
git rev-parse --verify HEAD >../expect
371371
) &&
372372
(cd submodule &&
373373
test_commit "update_submodule" file
@@ -384,7 +384,7 @@ test_expect_success 'submodule update continues after checkout error' '
384384
git checkout HEAD^ &&
385385
test_must_fail git submodule update &&
386386
(cd submodule2 &&
387-
git rev-parse --max-count=1 HEAD > ../actual
387+
git rev-parse --verify HEAD >../actual
388388
) &&
389389
test_cmp expect actual
390390
)
@@ -413,7 +413,7 @@ test_expect_success 'submodule update continues after recursive checkout error'
413413
test_commit "update_submodule_again_again" file
414414
) &&
415415
(cd submodule2 &&
416-
git rev-parse --max-count=1 HEAD > ../expect &&
416+
git rev-parse --verify HEAD >../expect &&
417417
test_commit "update_submodule2_again" file
418418
) &&
419419
git add submodule &&
@@ -428,7 +428,7 @@ test_expect_success 'submodule update continues after recursive checkout error'
428428
) &&
429429
test_must_fail git submodule update --recursive &&
430430
(cd submodule2 &&
431-
git rev-parse --max-count=1 HEAD > ../actual
431+
git rev-parse --verify HEAD >../actual
432432
) &&
433433
test_cmp expect actual
434434
)
@@ -460,12 +460,12 @@ test_expect_success 'submodule update exit immediately in case of merge conflict
460460
) &&
461461
git checkout HEAD^ &&
462462
(cd submodule2 &&
463-
git rev-parse --max-count=1 HEAD > ../expect
463+
git rev-parse --verify HEAD >../expect
464464
) &&
465465
git config submodule.submodule.update merge &&
466466
test_must_fail git submodule update &&
467467
(cd submodule2 &&
468-
git rev-parse --max-count=1 HEAD > ../actual
468+
git rev-parse --verify HEAD >../actual
469469
) &&
470470
test_cmp expect actual
471471
)
@@ -495,12 +495,12 @@ test_expect_success 'submodule update exit immediately after recursive rebase er
495495
) &&
496496
git checkout HEAD^ &&
497497
(cd submodule2 &&
498-
git rev-parse --max-count=1 HEAD > ../expect
498+
git rev-parse --verify HEAD >../expect
499499
) &&
500500
git config submodule.submodule.update rebase &&
501501
test_must_fail git submodule update &&
502502
(cd submodule2 &&
503-
git rev-parse --max-count=1 HEAD > ../actual
503+
git rev-parse --verify HEAD >../actual
504504
) &&
505505
test_cmp expect actual
506506
)

0 commit comments

Comments
 (0)