mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t34*: adjust the references to the default branch name "main"

Browse Source 
Carefully excluding t3404, which sees independent development elsewhere
at the time of writing, we use `main` as the default branch name in
t34*. This trick was performed via

	$ (cd t &&
	   sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
		-e 's/Master/Main/g' -- t34*.sh &&
	   git checkout HEAD -- t34\*)

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>
This commit is contained in:
Johannes Schindelin
2020-11-18 23:44:25 +00:00
committed by Junio C Hamano
parent ba766eebee
commit d1c02d93b3
23 changed files with 253 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
t/t3431-rebase-fork-point.sh
View File

@ -5,16 +5,16 @@
test_description='git rebase --fork-point 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
# A---B---D---E (master)
# A---B---D---E (main)
# \
# C*---F---G (side)
#
# C was formerly part of master but master was rewound to remove C
# C was formerly part of main but main was rewound to remove C
#
test_expect_success setup '
test_commit A &&
@ -33,7 +33,7 @@ test_rebase () {
expected="$1" &&
shift &&
test_expect_success "git rebase $*" "
git checkout master &&
git checkout main &&
git reset --hard E &&
git checkout side &&
git reset --hard G &&
@ -51,26 +51,26 @@ test_rebase 'G F C E D B A' --no-fork-point
test_rebase 'G F C D B A' --no-fork-point --onto D
test_rebase 'G F C B A' --no-fork-point --keep-base
test_rebase 'G F E D B A' --fork-point refs/heads/master
test_rebase 'G F E D B A' --fork-point master
test_rebase 'G F E D B A' --fork-point refs/heads/main
test_rebase 'G F E D B A' --fork-point main
test_rebase 'G F D B A' --fork-point --onto D refs/heads/master
test_rebase 'G F D B A' --fork-point --onto D master
test_rebase 'G F D B A' --fork-point --onto D refs/heads/main
test_rebase 'G F D B A' --fork-point --onto D main
test_rebase 'G F B A' --fork-point --keep-base refs/heads/master
test_rebase 'G F B A' --fork-point --keep-base master
test_rebase 'G F B A' --fork-point --keep-base refs/heads/main
test_rebase 'G F B A' --fork-point --keep-base main
test_rebase 'G F C E D B A' refs/heads/master
test_rebase 'G F C E D B A' master
test_rebase 'G F C E D B A' refs/heads/main
test_rebase 'G F C E D B A' main
test_rebase 'G F C D B A' --onto D refs/heads/master
test_rebase 'G F C D B A' --onto D master
test_rebase 'G F C D B A' --onto D refs/heads/main
test_rebase 'G F C D B A' --onto D main
test_rebase 'G F C B A' --keep-base refs/heads/master
test_rebase 'G F C B A' --keep-base master
test_rebase 'G F C B A' --keep-base refs/heads/main
test_rebase 'G F C B A' --keep-base main
test_expect_success 'git rebase --fork-point with ambigous refname' '
git checkout master &&
git checkout main &&
git checkout -b one &&
git checkout side &&
git tag one &&