diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-19 00:44:27 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-20 00:44:18 +0100 |
| commit | 8f37854b187a4539dd37752b2631849c94bd627b (patch) | |
| tree | b57147cbdc2774ace04b7ea1f648900a6d59b08f /t/t4121-apply-diffs.sh | |
| parent | t3[5-9]*: adjust the references to the default branch name "main" (diff) | |
| download | git-8f37854b187a4539dd37752b2631849c94bd627b.tar.xz git-8f37854b187a4539dd37752b2631849c94bd627b.zip | |
t4*: adjust the references to the default branch name "main"
Carefully excluding t4013 and t4015, which see independent development
elsewhere at the time of writing, we use `main` as the default branch
name in t4*. This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
-e 's/Master/Main/g' -- t4*.sh t4211/*.export &&
git checkout HEAD -- t4013\*)
This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main`
for those tests.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4121-apply-diffs.sh')
| -rwxr-xr-x | t/t4121-apply-diffs.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4121-apply-diffs.sh b/t/t4121-apply-diffs.sh index 60deb3bf78..b45454aaf4 100755 --- a/t/t4121-apply-diffs.sh +++ b/t/t4121-apply-diffs.sh @@ -1,7 +1,7 @@ #!/bin/sh test_description='git apply for contextually independent diffs' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -26,7 +26,7 @@ test_expect_success 'setup' \ git commit -a -q -m 2 && echo 9 >>file && git commit -a -q -m 3 && - git checkout master' + git checkout main' test_expect_success \ 'check if contextually independent diffs for the same file apply' \ |