diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 23:44:18 (GMT) |
| commit | 966b4be2765a9bd80febfd4660a1fa9e6408d143 (patch) | |
| tree | 9fd8b1a1ddffac53a9e9f8209475f8f8f26b9554 /t/t5402-post-merge-hook.sh | |
| parent | 4b071211e6168ba16ea10bc1ad9e6bdfa26ad5b6 (diff) | |
| download | git-966b4be2765a9bd80febfd4660a1fa9e6408d143.zip git-966b4be2765a9bd80febfd4660a1fa9e6408d143.tar.gz git-966b4be2765a9bd80febfd4660a1fa9e6408d143.tar.bz2 | |
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/t5402-post-merge-hook.sh')
| -rwxr-xr-x | t/t5402-post-merge-hook.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5402-post-merge-hook.sh b/t/t5402-post-merge-hook.sh index 27fc6ec..3e5e19c 100755 --- a/t/t5402-post-merge-hook.sh +++ b/t/t5402-post-merge-hook.sh @@ -4,7 +4,7 @@ # test_description='Test the post-merge hook.' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -18,7 +18,7 @@ test_expect_success setup ' git update-index a && tree1=$(git write-tree) && commit1=$(echo modify | git commit-tree $tree1 -p $commit0) && - git update-ref refs/heads/master $commit0 && + git update-ref refs/heads/main $commit0 && git clone ./. clone1 && GIT_DIR=clone1/.git git update-index --add a && git clone ./. clone2 && |