mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
![Johannes Schindelin](/assets/img/avatar_default.png)
Carefully excluding t5526, which sees independent development elsewhere at the time of writing, we use `main` as the default branch name in t55[23]*. 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' -- \ t55[23]*.sh && git checkout HEAD -- t5526\*) Note that t5533 contains a variation of the name `master` (`naster`) that we rename here, too. This commit allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for that range of tests. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
127 lines
2.4 KiB
Bash
Executable file
127 lines
2.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='push from/to a shallow clone'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
commit() {
|
|
echo "$1" >tracked &&
|
|
git add tracked &&
|
|
git commit -m "$1"
|
|
}
|
|
|
|
test_expect_success 'setup' '
|
|
git config --global transfer.fsckObjects true &&
|
|
commit 1 &&
|
|
commit 2 &&
|
|
commit 3 &&
|
|
commit 4 &&
|
|
git clone . full &&
|
|
(
|
|
git init full-abc &&
|
|
cd full-abc &&
|
|
commit a &&
|
|
commit b &&
|
|
commit c
|
|
) &&
|
|
git clone --no-local --depth=2 .git shallow &&
|
|
git --git-dir=shallow/.git log --format=%s >actual &&
|
|
cat <<EOF >expect &&
|
|
4
|
|
3
|
|
EOF
|
|
test_cmp expect actual &&
|
|
git clone --no-local --depth=2 full-abc/.git shallow2 &&
|
|
git --git-dir=shallow2/.git log --format=%s >actual &&
|
|
cat <<EOF >expect &&
|
|
c
|
|
b
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'push from shallow clone' '
|
|
(
|
|
cd shallow &&
|
|
commit 5 &&
|
|
git push ../.git +main:refs/remotes/shallow/main
|
|
) &&
|
|
git log --format=%s shallow/main >actual &&
|
|
git fsck &&
|
|
cat <<EOF >expect &&
|
|
5
|
|
4
|
|
3
|
|
2
|
|
1
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'push from shallow clone, with grafted roots' '
|
|
(
|
|
cd shallow2 &&
|
|
test_must_fail git push ../.git +main:refs/remotes/shallow2/main 2>err &&
|
|
grep "shallow2/main.*shallow update not allowed" err
|
|
) &&
|
|
test_must_fail git rev-parse shallow2/main &&
|
|
git fsck
|
|
'
|
|
|
|
test_expect_success 'add new shallow root with receive.updateshallow on' '
|
|
test_config receive.shallowupdate true &&
|
|
(
|
|
cd shallow2 &&
|
|
git push ../.git +main:refs/remotes/shallow2/main
|
|
) &&
|
|
git log --format=%s shallow2/main >actual &&
|
|
git fsck &&
|
|
cat <<EOF >expect &&
|
|
c
|
|
b
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'push from shallow to shallow' '
|
|
(
|
|
cd shallow &&
|
|
git --git-dir=../shallow2/.git config receive.shallowupdate true &&
|
|
git push ../shallow2/.git +main:refs/remotes/shallow/main &&
|
|
git --git-dir=../shallow2/.git config receive.shallowupdate false
|
|
) &&
|
|
(
|
|
cd shallow2 &&
|
|
git log --format=%s shallow/main >actual &&
|
|
git fsck &&
|
|
cat <<EOF >expect &&
|
|
5
|
|
4
|
|
3
|
|
EOF
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'push from full to shallow' '
|
|
! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) &&
|
|
commit 1 &&
|
|
git push shallow2/.git +main:refs/remotes/top/main &&
|
|
(
|
|
cd shallow2 &&
|
|
git log --format=%s top/main >actual &&
|
|
git fsck &&
|
|
cat <<EOF >expect &&
|
|
1
|
|
4
|
|
3
|
|
EOF
|
|
test_cmp expect actual &&
|
|
git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null
|
|
)
|
|
'
|
|
test_done
|