summaryrefslogtreecommitdiff
path: root/t/t6004-rev-list-path-optim.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2020-11-18 23:44:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-11-19 23:44:18 (GMT)
commit1550bb6ed0055895fe90a8b1eda95408ddf0d813 (patch)
tree3c87d38eb2cf6d37edb2f6762773ad70fba5fea5 /t/t6004-rev-list-path-optim.sh
parent95cf2c01875fd66421d3551e9e86db435523575d (diff)
downloadgit-1550bb6ed0055895fe90a8b1eda95408ddf0d813.zip
git-1550bb6ed0055895fe90a8b1eda95408ddf0d813.tar.gz
git-1550bb6ed0055895fe90a8b1eda95408ddf0d813.tar.bz2
t6[0-3]*: adjust the references to the default branch name "main"
Carefully excluding t6300, which sees independent development elsewhere at the time of writing, we use `main` as the default branch name in t6[0-3]*. This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t6[0-3]*.sh && git checkout HEAD -- t6300\*) 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/t6004-rev-list-path-optim.sh')
-rwxr-xr-xt/t6004-rev-list-path-optim.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t6004-rev-list-path-optim.sh b/t/t6004-rev-list-path-optim.sh
index ff78819..cd4f420 100755
--- a/t/t6004-rev-list-path-optim.sh
+++ b/t/t6004-rev-list-path-optim.sh
@@ -4,7 +4,7 @@ test_description='git rev-list trivial path optimization test
d/z1
b0 b1
- o------------------------*----o master
+ o------------------------*----o main
/ /
o---------o----o----o----o side
a0 c0 c1 a1 c2
@@ -13,7 +13,7 @@ test_description='git rev-list trivial path optimization test
'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@@ -58,18 +58,18 @@ test_expect_success 'further setup' '
git add c &&
test_tick &&
git commit -m "Side makes yet another irrelevant commit" &&
- git checkout master &&
+ git checkout main &&
echo Another >b &&
echo Munged >d/z &&
git add b d/z &&
test_tick &&
- git commit -m "Master touches b" &&
- git tag master_b0 &&
+ git commit -m "Main touches b" &&
+ git tag main_b0 &&
git merge side &&
echo Touched >b &&
git add b &&
test_tick &&
- git commit -m "Master touches b again"
+ git commit -m "Main touches b again"
'
test_expect_success 'path optimization 2' '
@@ -79,13 +79,13 @@ test_expect_success 'path optimization 2' '
'
test_expect_success 'pathspec with leading path' '
- git rev-parse master^ master_b0 side_c0 initial >expected &&
+ git rev-parse main^ main_b0 side_c0 initial >expected &&
git rev-list HEAD -- d >actual &&
test_cmp expected actual
'
test_expect_success 'pathspec with glob (1)' '
- git rev-parse master^ master_b0 side_c0 initial >expected &&
+ git rev-parse main^ main_b0 side_c0 initial >expected &&
git rev-list HEAD -- "d/*" >actual &&
test_cmp expected actual
'