diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-19 00:44:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-20 00:44:18 +0100 |
| commit | 5902f5f4608c1857fc04dcae2a0ce6beea31c8f8 (patch) | |
| tree | 9a56000f293ef84871a419a00bb7a3abdcda6706 /t/t6436-merge-overwrite.sh | |
| parent | t64*: preemptively adjust alignment to prepare for `master` -> `main` (diff) | |
| download | git-5902f5f4608c1857fc04dcae2a0ce6beea31c8f8.tar.xz git-5902f5f4608c1857fc04dcae2a0ce6beea31c8f8.zip | |
t6[4-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' -- t6[4-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/t6436-merge-overwrite.sh')
| -rwxr-xr-x | t/t6436-merge-overwrite.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6436-merge-overwrite.sh b/t/t6436-merge-overwrite.sh index 7d5691c1b4..362ae37a12 100755 --- a/t/t6436-merge-overwrite.sh +++ b/t/t6436-merge-overwrite.sh @@ -4,7 +4,7 @@ test_description='git-merge Do not overwrite changes.' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -196,7 +196,7 @@ test_expect_success 'set up unborn branch and content' ' ' test_expect_success 'will not clobber WT/index when merging into unborn' ' - git merge master && + git merge main && grep foo tracked-file && git show :tracked-file >expect && grep foo expect && |