Skip to content

Commit 97cf8d5

Browse files
dschogitster
authored andcommitted
t5703: adjust a test case for the upcoming default branch name
We want to rename the default branch name used by `git init` in the near future, using `main` as the new name. In preparation for that, we adjust a test case that wants to rename the default branch to a different name that however has the same length. We use `none` as that name because it matches the length of `main`. As this test case cannot possibly pass until the default branch name is _actually_ changed, we temporarily guard it behind a special-purpose prereq, until the test suite is fully converted to use that new default branch name. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 392ab3d commit 97cf8d5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

t/t5703-upload-pack-ref-in-want.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,14 +383,14 @@ test_expect_success 'server is initially behind - ref in want' '
383383
test_cmp expected actual
384384
'
385385

386-
test_expect_success 'server loses a ref - ref in want' '
386+
test_expect_success PREPARE_FOR_MAIN_BRANCH 'server loses a ref - ref in want' '
387387
git -C "$REPO" config uploadpack.allowRefInWant true &&
388388
rm -rf local &&
389389
cp -r "$LOCAL_PRISTINE" local &&
390-
echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
390+
echo "s/main/rain/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
391391
test_must_fail git -C local fetch 2>err &&
392392
393-
test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
393+
test_i18ngrep "fatal: remote error: unknown ref refs/heads/rain" err
394394
'
395395

396396
# DO NOT add non-httpd-specific tests here, because the last part of this

0 commit comments

Comments
 (0)