diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:27 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-11-19 15:44:18 -0800 |
| commit | 8f37854b187a4539dd37752b2631849c94bd627b (patch) | |
| tree | b57147cbdc2774ace04b7ea1f648900a6d59b08f /t/t4056-diff-order.sh | |
| parent | t3[5-9]*: adjust the references to the default branch name "main" (diff) | |
| download | tgif-8f37854b187a4539dd37752b2631849c94bd627b.tar.xz | |
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/t4056-diff-order.sh')
| -rwxr-xr-x | t/t4056-diff-order.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh index 723eee4e8e..63ea7144bb 100755 --- a/t/t4056-diff-order.sh +++ b/t/t4056-diff-order.sh @@ -2,7 +2,7 @@ test_description='diff order' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -109,7 +109,7 @@ done test_expect_success 'setup for testing combine-diff order' ' git checkout -b tmp HEAD~ && create_files 3 && - git checkout master && + git checkout main && git merge --no-commit -s ours tmp && create_files 5 ' |