diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:29 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 15:44:18 -0800 |
commit | 966b4be2765a9bd80febfd4660a1fa9e6408d143 (patch) | |
tree | 9fd8b1a1ddffac53a9e9f8209475f8f8f26b9554 /t/t5304-prune.sh | |
parent | 4b071211e6168ba16ea10bc1ad9e6bdfa26ad5b6 (diff) | |
download | git-966b4be2765a9bd80febfd4660a1fa9e6408d143.tar.gz |
t5[0-4]*: adjust the references to the default branch name "main"
Carefully excluding t5310, which is developed independently of the
current patch series at the time of writing, we now use `main` as
default branch in t5[0-4]*. This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
-e 's/Master/Main/g' -- t5[0-4]*.sh &&
git checkout HEAD -- t5310\*)
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/t5304-prune.sh')
-rwxr-xr-x | t/t5304-prune.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index bd5f71e396..b447ce56a9 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -4,7 +4,7 @@ # test_description='prune' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -122,7 +122,7 @@ test_expect_success 'prune: do not prune detached HEAD with no reflog' ' test_expect_success 'prune: prune former HEAD after checking out branch' ' head_oid=$(git rev-parse HEAD) && - git checkout --quiet master && + git checkout --quiet main && git prune -v >prune_actual && grep "$head_oid" prune_actual |