diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 15:44:18 -0800 |
| commit | cbc75a12f056c9e6eef30b92db2dc0ce99e97dbe (patch) | |
| tree | 71ea1a1a5a1999a8e9c80b9e65a8d3f2c0cfbce1 /t/t3502-cherry-pick-merge.sh | |
| parent | d1c02d93b3374e031f87f9032c5dc6ef9bfbe0af (diff) | |
| download | git-cbc75a12f056c9e6eef30b92db2dc0ce99e97dbe.tar.gz | |
t3[5-9]*: adjust the references to the default branch name "main"
This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
-e 's/Master/Main/g' -- t3[5-9]*.sh)
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/t3502-cherry-pick-merge.sh')
| -rwxr-xr-x | t/t3502-cherry-pick-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh index 774ad9ce14..5495eacfec 100755 --- a/t/t3502-cherry-pick-merge.sh +++ b/t/t3502-cherry-pick-merge.sh @@ -8,7 +8,7 @@ test_description='cherry picking and reverting a merge ' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -28,7 +28,7 @@ test_expect_success setup ' echo new line >B && git commit -m "add line to B" B && git tag b && - git checkout master && + git checkout main && git merge side && git tag c |