test_description='git p4 tests for p4 branches'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-git-p4.sh
test_expect_success 'start p4d' '
(
cd "$git" &&
git log --oneline --graph --decorate --all &&
- git rev-list master -- >wc &&
+ git rev-list main -- >wc &&
test_line_count = 4 wc
)
'
(
cd "$git" &&
git log --oneline --graph --decorate --all &&
- git rev-list master -- >wc &&
+ git rev-list main -- >wc &&
test_line_count = 2 wc
)
'
(
cd "$git" &&
git log --oneline --graph --decorate --all &&
- git rev-list master -- >wc &&
+ git rev-list main -- >wc &&
test_line_count = 2 wc
)
'
(
cd "$git" &&
git log --oneline --graph --decorate --all &&
- git rev-list master -- >wc &&
+ git rev-list main -- >wc &&
test_line_count = 8 wc
)
'
git log --oneline --graph --decorate --all &&
# 4 main commits
- git rev-list master -- >wc &&
+ git rev-list main -- >wc &&
test_line_count = 4 wc &&
# 3 main, 1 integrate, 1 on branch2
git log --oneline --graph --decorate --all &&
# 4 main commits
- git rev-list master -- >wc &&
+ git rev-list main -- >wc &&
test_line_count = 4 wc &&
# 3 main, 1 integrate, 1 on branch2
(
cd "$git" &&
git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
- git checkout -b master p4/usecs/b1 &&
+ git checkout -b main p4/usecs/b1 &&
test_path_is_file b1-file1 &&
test_path_is_missing b2-file2 &&
test_path_is_missing b1 &&
(
cd "$git" &&
git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
- git checkout -b master p4/usecs/b3 &&
+ git checkout -b main p4/usecs/b3 &&
test_path_is_file b1-file1 &&
test_path_is_file b3-file3_2 &&
test_path_is_missing b3-file3_1