diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-19 02:44:38 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-20 02:44:18 +0300 |
| commit | 5902f5f4608c1857fc04dcae2a0ce6beea31c8f8 (patch) | |
| tree | 9a56000f293ef84871a419a00bb7a3abdcda6706 /t/t6413-merge-crlf.sh | |
| parent | 1f53df54eba378eee544b47f7c9e7f5fc32873e1 (diff) | |
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/t6413-merge-crlf.sh')
| -rwxr-xr-x | t/t6413-merge-crlf.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6413-merge-crlf.sh b/t/t6413-merge-crlf.sh index 3bd8e3e899..affea255fe 100755 --- a/t/t6413-merge-crlf.sh +++ b/t/t6413-merge-crlf.sh @@ -8,7 +8,7 @@ test_description='merge conflict in crlf repo ' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -27,7 +27,7 @@ test_expect_success setup ' echo line from b | append_cr >file && git commit -m "add line from b" file && git tag b && - git checkout master + git checkout main ' test_expect_success 'Check "ours" is CRLF' ' |