diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:25 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 23:44:18 (GMT) |
commit | d1c02d93b3374e031f87f9032c5dc6ef9bfbe0af (patch) | |
tree | ae0f375e60e3660a1e4ce647538e5499e7b14c3b /t/t3408-rebase-multi-line.sh | |
parent | ba766eebee07c2c3f9ad2c4dad26e71200f96f93 (diff) | |
download | git-d1c02d93b3374e031f87f9032c5dc6ef9bfbe0af.zip git-d1c02d93b3374e031f87f9032c5dc6ef9bfbe0af.tar.gz git-d1c02d93b3374e031f87f9032c5dc6ef9bfbe0af.tar.bz2 |
t34*: adjust the references to the default branch name "main"
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>
Diffstat (limited to 't/t3408-rebase-multi-line.sh')
-rwxr-xr-x | t/t3408-rebase-multi-line.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh index 6dd56c4..ab0960e 100755 --- a/t/t3408-rebase-multi-line.sh +++ b/t/t3408-rebase-multi-line.sh @@ -2,7 +2,7 @@ test_description='rebasing a commit with multi-line first paragraph.' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -49,7 +49,7 @@ But otherwise with a sane description." side2 && test_expect_success rebase ' git checkout side && - git rebase master && + git rebase main && git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect && test_cmp expect actual |