-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'na/no-http-test-in-the-middle' into maint
The mode to run tests with HTTP server tests disabled was broken. * na/no-http-test-in-the-middle: t5538: move http push tests out to t5542
- Loading branch information
Showing
2 changed files
with
100 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| #!/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 |