diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-10-23 14:00:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-23 08:57:43 -0700 |
| commit | 3224b0f0bb7bc90c0156e73c58f1d2e770f0ad7c (patch) | |
| tree | ebb229aa8dc2f3b74ecb43a3e4cac69603ca711a | |
| parent | 66713e84e713066f4984efdd1444a7567c4d9bde (diff) | |
| download | git-3224b0f0bb7bc90c0156e73c58f1d2e770f0ad7c.tar.gz | |
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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t1400-update-ref.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index 770e7be363..4c01e08551 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -585,10 +585,10 @@ test_expect_success 'stdin fails on unbalanced quotes' ' grep "fatal: badly quoted argument: \\\"master" err ' -test_expect_success 'stdin fails on invalid escape' ' - echo "create $a \"ma\zter\"" >stdin && +test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin fails on invalid escape' ' + echo "create $a \"ma\zn\"" >stdin && test_must_fail git update-ref --stdin <stdin 2>err && - grep "fatal: badly quoted argument: \\\"ma\\\\zter\\\"" err + grep "fatal: badly quoted argument: \\\"ma\\\\zn\\\"" err ' test_expect_success 'stdin fails on junk after quoted argument' ' @@ -704,9 +704,9 @@ test_expect_success 'stdin succeeds with quoted argument' ' test_cmp expect actual ' -test_expect_success 'stdin succeeds with escaped character' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin succeeds with escaped character' ' git update-ref -d $a && - echo "create $a \"ma\\163ter\"" >stdin && + echo "create $a \"ma\\151n\"" >stdin && git update-ref --stdin <stdin && git rev-parse $m >expect && git rev-parse $a >actual && |