diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:36 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-11-19 15:44:18 -0800 |
| commit | 1550bb6ed0055895fe90a8b1eda95408ddf0d813 (patch) | |
| tree | 3c87d38eb2cf6d37edb2f6762773ad70fba5fea5 /t/t6001-rev-list-graft.sh | |
| parent | t5[6-9]*: adjust the references to the default branch name "main" (diff) | |
| download | tgif-1550bb6ed0055895fe90a8b1eda95408ddf0d813.tar.xz | |
t6[0-3]*: adjust the references to the default branch name "main"
Carefully excluding t6300, which sees independent development elsewhere
at the time of writing, we use `main` as the default branch name in
t6[0-3]*. This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
-e 's/Master/Main/g' -- t6[0-3]*.sh &&
git checkout HEAD -- t6300\*)
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/t6001-rev-list-graft.sh')
| -rwxr-xr-x | t/t6001-rev-list-graft.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh index 67c384f1e8..90d93f77fa 100755 --- a/t/t6001-rev-list-graft.sh +++ b/t/t6001-rev-list-graft.sh @@ -2,7 +2,7 @@ test_description='Revision traversal vs grafts and path limiter' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -23,7 +23,7 @@ test_expect_success setup ' git commit -a -m "Third in one history." && A2=$(git rev-parse --verify HEAD) && - rm -f .git/refs/heads/master .git/index && + rm -f .git/refs/heads/main .git/index && echo >fileA fileA again && echo >subdir/fileB fileB again && |