Skip to content

Commit 3224b0f

Browse files
dschogitster
authored andcommitted
t1400: prepare for main being default branch name
In addition to the trivial search-and-replace, there are three non-trivial adjustments necessary. Mark the respective test cases with the transitional prereq and make those non-trivial adjustments early, to make this change easier to review. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 66713e8 commit 3224b0f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

t/t1400-update-ref.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -585,10 +585,10 @@ test_expect_success 'stdin fails on unbalanced quotes' '
585585
grep "fatal: badly quoted argument: \\\"master" err
586586
'
587587

588-
test_expect_success 'stdin fails on invalid escape' '
589-
echo "create $a \"ma\zter\"" >stdin &&
588+
test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin fails on invalid escape' '
589+
echo "create $a \"ma\zn\"" >stdin &&
590590
test_must_fail git update-ref --stdin <stdin 2>err &&
591-
grep "fatal: badly quoted argument: \\\"ma\\\\zter\\\"" err
591+
grep "fatal: badly quoted argument: \\\"ma\\\\zn\\\"" err
592592
'
593593

594594
test_expect_success 'stdin fails on junk after quoted argument' '
@@ -704,9 +704,9 @@ test_expect_success 'stdin succeeds with quoted argument' '
704704
test_cmp expect actual
705705
'
706706

707-
test_expect_success 'stdin succeeds with escaped character' '
707+
test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin succeeds with escaped character' '
708708
git update-ref -d $a &&
709-
echo "create $a \"ma\\163ter\"" >stdin &&
709+
echo "create $a \"ma\\151n\"" >stdin &&
710710
git update-ref --stdin <stdin &&
711711
git rev-parse $m >expect &&
712712
git rev-parse $a >actual &&

0 commit comments

Comments
 (0)