diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-19 00:44:21 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-20 00:44:18 +0100 |
| commit | 06d531486e9078c88c324ad6f87376cfa897f058 (patch) | |
| tree | c3ed8ffad4583e9bd1e717c782dc8b20784f2d91 /t/t1411-reflog-show.sh | |
| parent | t0060: preemptively adjust alignment (diff) | |
| download | git-06d531486e9078c88c324ad6f87376cfa897f058.tar.xz git-06d531486e9078c88c324ad6f87376cfa897f058.zip | |
t[01]*: adjust the references to the default branch name "main"
Carefully excluding t1309, which sees independent development elsewhere
at the time of writing, we transition above-mentioned tests 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' -e 's/naster/nain/g' -- t[01]*.sh &&
git checkout HEAD -- t1309\*)
Note that t5533 contains a variation of the name `master` (`naster`)
that we rename here, too.
This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main`
for those tests.
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1411-reflog-show.sh')
| -rwxr-xr-x | t/t1411-reflog-show.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh index f6fecff671..0bb319b944 100755 --- a/t/t1411-reflog-show.sh +++ b/t/t1411-reflog-show.sh @@ -1,7 +1,7 @@ #!/bin/sh test_description='Test reflog display routines' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -170,7 +170,7 @@ test_expect_success 'git log -g -p shows diffs vs. parents' ' ' test_expect_success 'reflog exists works' ' - git reflog exists refs/heads/master && + git reflog exists refs/heads/main && ! git reflog exists refs/heads/nonexistent ' |