mirror of
https://github.com/git/git.git
synced 2024-11-07 17:53:12 +01:00
afa53fe5d1
As0232852b, but for the push tests instead: this avoids a start_httpd in the middle of the file, which fails under GIT_TEST_HTTPD=false. Note that we have to munge the test in a few ways while moving it: 1. We drop the `test -z "$GIT_TEST_HTTPD"` check; this is too simplistic since83d842d, and we should let lib-httpd.sh handle it. 2. We have to port over some of the old setup from t5538. 3. In the final test, we no longer expect the extra commit "1" built on top of "4". This was a side effect from an earlier test in t5538 which was not ported over. Signed-off-by: Nick Alcock <nick.alcock@oracle.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
100 lines
1.9 KiB
Bash
Executable file
100 lines
1.9 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='push from/to a shallow clone over http'
|
|
|
|
. ./test-lib.sh
|
|
|
|
if test -n "$NO_CURL"; then
|
|
say 'skipping test, git built without http support'
|
|
test_done
|
|
fi
|
|
|
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
|
start_httpd
|
|
|
|
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 to shallow repo via http' '
|
|
git clone --bare --no-local shallow "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
|
(
|
|
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
|
git config http.receivepack true
|
|
) &&
|
|
(
|
|
cd full &&
|
|
commit 9 &&
|
|
git push $HTTPD_URL/smart/repo.git +master:refs/remotes/top/master
|
|
) &&
|
|
(
|
|
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
|
git fsck &&
|
|
git log --format=%s top/master >actual &&
|
|
cat <<EOF >expect &&
|
|
9
|
|
4
|
|
3
|
|
EOF
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'push from shallow repo via http' '
|
|
mv "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" shallow-upstream.git &&
|
|
git clone --bare --no-local full "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
|
(
|
|
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
|
git config http.receivepack true
|
|
) &&
|
|
commit 10 &&
|
|
git push $HTTPD_URL/smart/repo.git +master:refs/remotes/top/master &&
|
|
(
|
|
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
|
git fsck &&
|
|
git log --format=%s top/master >actual &&
|
|
cat <<EOF >expect &&
|
|
10
|
|
4
|
|
3
|
|
2
|
|
1
|
|
EOF
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
stop_httpd
|
|
test_done
|