diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 23:44:18 (GMT) |
| commit | cbc75a12f056c9e6eef30b92db2dc0ce99e97dbe (patch) | |
| tree | 71ea1a1a5a1999a8e9c80b9e65a8d3f2c0cfbce1 /t/t3701-add-interactive.sh | |
| parent | d1c02d93b3374e031f87f9032c5dc6ef9bfbe0af (diff) | |
| download | git-cbc75a12f056c9e6eef30b92db2dc0ce99e97dbe.zip git-cbc75a12f056c9e6eef30b92db2dc0ce99e97dbe.tar.gz git-cbc75a12f056c9e6eef30b92db2dc0ce99e97dbe.tar.bz2 | |
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/t3701-add-interactive.sh')
| -rwxr-xr-x | t/t3701-add-interactive.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 9be7527..8c7f23c 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -1,7 +1,7 @@ #!/bin/sh test_description='add -i basic tests' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -552,8 +552,8 @@ test_expect_success 'patch mode ignores unmerged entries' ' test_commit non-conflict && git checkout -b side && test_commit side conflict.t && - git checkout master && - test_commit master conflict.t && + git checkout main && + test_commit main conflict.t && test_must_fail git merge side && echo changed >non-conflict.t && echo y | git add -p >output && |