2009-10-31 00:47:47 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='test smart pushing over http via http-backend'
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
if test -n "$NO_CURL"; then
|
2010-06-24 17:44:48 +00:00
|
|
|
skip_all='skipping test, git built without http support'
|
2009-10-31 00:47:47 +00:00
|
|
|
test_done
|
|
|
|
fi
|
|
|
|
|
|
|
|
ROOT_PATH="$PWD"
|
|
|
|
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5541'}
|
|
|
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
2012-01-08 21:06:21 +00:00
|
|
|
. "$TEST_DIRECTORY"/lib-terminal.sh
|
2009-10-31 00:47:47 +00:00
|
|
|
start_httpd
|
|
|
|
|
|
|
|
test_expect_success 'setup remote repository' '
|
|
|
|
cd "$ROOT_PATH" &&
|
|
|
|
mkdir test_repo &&
|
|
|
|
cd test_repo &&
|
|
|
|
git init &&
|
|
|
|
: >path1 &&
|
|
|
|
git add path1 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m initial &&
|
|
|
|
cd - &&
|
|
|
|
git clone --bare test_repo test_repo.git &&
|
|
|
|
cd test_repo.git &&
|
|
|
|
git config http.receivepack true &&
|
|
|
|
ORIG_HEAD=$(git rev-parse --verify HEAD) &&
|
|
|
|
cd - &&
|
|
|
|
mv test_repo.git "$HTTPD_DOCUMENT_ROOT_PATH"
|
|
|
|
'
|
|
|
|
|
2010-04-08 02:15:16 +00:00
|
|
|
cat >exp <<EOF
|
|
|
|
GET /smart/test_repo.git/info/refs?service=git-upload-pack HTTP/1.1 200
|
|
|
|
POST /smart/test_repo.git/git-upload-pack HTTP/1.1 200
|
|
|
|
EOF
|
2010-04-08 02:15:18 +00:00
|
|
|
test_expect_success 'no empty path components' '
|
2010-04-08 02:15:16 +00:00
|
|
|
# In the URL, add a trailing slash, and see if git appends yet another
|
|
|
|
# slash.
|
2009-10-31 00:47:47 +00:00
|
|
|
cd "$ROOT_PATH" &&
|
2010-04-08 02:15:16 +00:00
|
|
|
git clone $HTTPD_URL/smart/test_repo.git/ test_repo_clone &&
|
|
|
|
|
|
|
|
sed -e "
|
|
|
|
s/^.* \"//
|
|
|
|
s/\"//
|
|
|
|
s/ [1-9][0-9]*\$//
|
|
|
|
s/^GET /GET /
|
|
|
|
" >act <"$HTTPD_ROOT_PATH"/access.log &&
|
|
|
|
|
|
|
|
# Clear the log, so that it does not affect the "used receive-pack
|
|
|
|
# service" test which reads the log too.
|
|
|
|
#
|
|
|
|
# We do this before the actual comparison to ensure the log is cleared.
|
|
|
|
echo > "$HTTPD_ROOT_PATH"/access.log &&
|
|
|
|
|
|
|
|
test_cmp exp act
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'clone remote repository' '
|
|
|
|
rm -rf test_repo_clone &&
|
2009-10-31 00:47:47 +00:00
|
|
|
git clone $HTTPD_URL/smart/test_repo.git test_repo_clone
|
|
|
|
'
|
|
|
|
|
2011-05-04 17:19:50 +00:00
|
|
|
test_expect_success 'push to remote repository (standard)' '
|
2009-10-31 00:47:47 +00:00
|
|
|
cd "$ROOT_PATH"/test_repo_clone &&
|
|
|
|
: >path2 &&
|
|
|
|
git add path2 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m path2 &&
|
|
|
|
HEAD=$(git rev-parse --verify HEAD) &&
|
2011-05-04 17:19:50 +00:00
|
|
|
GIT_CURL_VERBOSE=1 git push -v -v 2>err &&
|
|
|
|
! grep "Expect: 100-continue" err &&
|
|
|
|
grep "POST git-receive-pack ([0-9]* bytes)" err &&
|
2009-10-31 00:47:47 +00:00
|
|
|
(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
|
|
|
|
test $HEAD = $(git rev-parse --verify HEAD))
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push already up-to-date' '
|
|
|
|
git push
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'create and delete remote branch' '
|
|
|
|
cd "$ROOT_PATH"/test_repo_clone &&
|
|
|
|
git checkout -b dev &&
|
|
|
|
: >path3 &&
|
|
|
|
git add path3 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m dev &&
|
|
|
|
git push origin dev &&
|
|
|
|
git push origin :dev &&
|
|
|
|
test_must_fail git show-ref --verify refs/remotes/origin/dev
|
|
|
|
'
|
|
|
|
|
remote-curl: Fix push status report when all branches fail
The protocol between transport-helper.c and remote-curl requires
remote-curl to always print a blank line after the push command
has run. If the blank line is ommitted, transport-helper kills its
container process (the git push the user started) with exit(128)
and no message indicating a problem, assuming the helper already
printed reasonable error text to the console.
However if the remote rejects all branches with "ng" commands in the
report-status reply, send-pack terminates with non-zero status, and
in turn remote-curl exited with non-zero status before outputting
the blank line after the helper status printed by send-pack. No
error messages reach the user.
This caused users to see the following from git push over HTTP
when the remote side's update hook rejected the branch:
$ git push http://... master
Counting objects: 4, done.
Delta compression using up to 6 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 301 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
$
Always print a blank line after the send-pack process terminates,
ensuring the helper status report (if it was output) will be
correctly parsed by the calling transport-helper.c. This ensures
the helper doesn't abort before the status report can be shown to
the user.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-01-20 03:12:09 +00:00
|
|
|
cat >"$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update" <<EOF
|
|
|
|
#!/bin/sh
|
|
|
|
exit 1
|
|
|
|
EOF
|
|
|
|
chmod a+x "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"
|
|
|
|
|
|
|
|
cat >exp <<EOF
|
|
|
|
remote: error: hook declined to update refs/heads/dev2
|
|
|
|
To http://127.0.0.1:$LIB_HTTPD_PORT/smart/test_repo.git
|
|
|
|
! [remote rejected] dev2 -> dev2 (hook declined)
|
2012-02-13 20:17:14 +00:00
|
|
|
error: failed to push some refs to 'http://127.0.0.1:$LIB_HTTPD_PORT/smart/test_repo.git'
|
remote-curl: Fix push status report when all branches fail
The protocol between transport-helper.c and remote-curl requires
remote-curl to always print a blank line after the push command
has run. If the blank line is ommitted, transport-helper kills its
container process (the git push the user started) with exit(128)
and no message indicating a problem, assuming the helper already
printed reasonable error text to the console.
However if the remote rejects all branches with "ng" commands in the
report-status reply, send-pack terminates with non-zero status, and
in turn remote-curl exited with non-zero status before outputting
the blank line after the helper status printed by send-pack. No
error messages reach the user.
This caused users to see the following from git push over HTTP
when the remote side's update hook rejected the branch:
$ git push http://... master
Counting objects: 4, done.
Delta compression using up to 6 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 301 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
$
Always print a blank line after the send-pack process terminates,
ensuring the helper status report (if it was output) will be
correctly parsed by the calling transport-helper.c. This ensures
the helper doesn't abort before the status report can be shown to
the user.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-01-20 03:12:09 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'rejected update prints status' '
|
|
|
|
cd "$ROOT_PATH"/test_repo_clone &&
|
|
|
|
git checkout -b dev2 &&
|
|
|
|
: >path4 &&
|
|
|
|
git add path4 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m dev2 &&
|
|
|
|
test_must_fail git push origin dev2 2>act &&
|
|
|
|
sed -e "/^remote: /s/ *$//" <act >cmp &&
|
|
|
|
test_cmp exp cmp
|
|
|
|
'
|
|
|
|
rm -f "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"
|
|
|
|
|
2009-10-31 00:47:47 +00:00
|
|
|
cat >exp <<EOF
|
2010-04-08 02:15:16 +00:00
|
|
|
|
2009-10-31 00:47:47 +00:00
|
|
|
GET /smart/test_repo.git/info/refs?service=git-upload-pack HTTP/1.1 200
|
|
|
|
POST /smart/test_repo.git/git-upload-pack HTTP/1.1 200
|
|
|
|
GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200
|
|
|
|
POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200
|
|
|
|
GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200
|
|
|
|
GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200
|
|
|
|
POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200
|
|
|
|
GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200
|
|
|
|
POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200
|
remote-curl: Fix push status report when all branches fail
The protocol between transport-helper.c and remote-curl requires
remote-curl to always print a blank line after the push command
has run. If the blank line is ommitted, transport-helper kills its
container process (the git push the user started) with exit(128)
and no message indicating a problem, assuming the helper already
printed reasonable error text to the console.
However if the remote rejects all branches with "ng" commands in the
report-status reply, send-pack terminates with non-zero status, and
in turn remote-curl exited with non-zero status before outputting
the blank line after the helper status printed by send-pack. No
error messages reach the user.
This caused users to see the following from git push over HTTP
when the remote side's update hook rejected the branch:
$ git push http://... master
Counting objects: 4, done.
Delta compression using up to 6 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 301 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
$
Always print a blank line after the send-pack process terminates,
ensuring the helper status report (if it was output) will be
correctly parsed by the calling transport-helper.c. This ensures
the helper doesn't abort before the status report can be shown to
the user.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-01-20 03:12:09 +00:00
|
|
|
GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200
|
|
|
|
POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200
|
2009-10-31 00:47:47 +00:00
|
|
|
EOF
|
|
|
|
test_expect_success 'used receive-pack service' '
|
|
|
|
sed -e "
|
|
|
|
s/^.* \"//
|
|
|
|
s/\"//
|
|
|
|
s/ [1-9][0-9]*\$//
|
|
|
|
s/^GET /GET /
|
|
|
|
" >act <"$HTTPD_ROOT_PATH"/access.log &&
|
|
|
|
test_cmp exp act
|
|
|
|
'
|
|
|
|
|
2010-03-02 10:49:26 +00:00
|
|
|
test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
|
|
|
|
"$ROOT_PATH"/test_repo_clone master
|
2010-01-08 02:12:40 +00:00
|
|
|
|
2010-01-08 02:12:44 +00:00
|
|
|
test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' '
|
2010-01-08 02:12:41 +00:00
|
|
|
# create a dissimilarly-named remote ref so that git is unable to match the
|
|
|
|
# two refs (viz. local, remote) unless an explicit refspec is provided.
|
|
|
|
git push origin master:retsam
|
|
|
|
|
|
|
|
echo "change changed" > path2 &&
|
|
|
|
git commit -a -m path2 --amend &&
|
|
|
|
|
|
|
|
# push master too; this ensures there is at least one '"'push'"' command to
|
|
|
|
# the remote helper and triggers interaction with the helper.
|
2011-02-22 23:42:12 +00:00
|
|
|
test_must_fail git push -v origin +master master:retsam >output 2>&1'
|
2010-01-08 02:12:41 +00:00
|
|
|
|
2011-02-22 23:42:12 +00:00
|
|
|
test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: remote output' '
|
2010-01-08 02:12:41 +00:00
|
|
|
grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *master -> master (forced update)$" output &&
|
2011-02-22 23:42:12 +00:00
|
|
|
grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output
|
|
|
|
'
|
2010-01-08 02:12:41 +00:00
|
|
|
|
2011-04-12 23:33:39 +00:00
|
|
|
test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
|
|
|
|
test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" \
|
2010-01-25 07:42:23 +00:00
|
|
|
output
|
2010-01-08 02:12:41 +00:00
|
|
|
'
|
|
|
|
|
2011-05-04 17:19:50 +00:00
|
|
|
test_expect_success 'push (chunked)' '
|
|
|
|
git checkout master &&
|
|
|
|
test_commit commit path3 &&
|
|
|
|
HEAD=$(git rev-parse --verify HEAD) &&
|
|
|
|
git config http.postbuffer 4 &&
|
|
|
|
test_when_finished "git config --unset http.postbuffer" &&
|
|
|
|
git push -v -v origin $BRANCH 2>err &&
|
|
|
|
grep "POST git-receive-pack (chunked)" err &&
|
|
|
|
(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
|
|
|
|
test $HEAD = $(git rev-parse --verify HEAD))
|
|
|
|
'
|
|
|
|
|
remote-curl: don't pass back fake refs
When receive-pack advertises its list of refs, it generally hides the
capabilities information after a NUL at the end of the first ref.
However, when we have an empty repository, there are no refs, and
therefore receive-pack writes a fake ref "capabilities^{}" with the
capabilities afterwards.
On the client side, git reads the result with get_remote_heads(). We pick
the capabilities from the end of the line, and then call check_ref() to
make sure the ref name is valid. We see that it isn't, and don't bother
adding it to our list of refs.
However, the call to check_ref() is enabled by passing the REF_NORMAL flag
to get_remote_heads. For the regular git transport, we pass REF_NORMAL in
get_refs_via_connect() if we are doing a push (since only receive-pack
uses this fake ref). But in remote-curl, we never use this flag, and we
accept the fake ref as a real one, passing it back from the helper to the
parent git-push.
Most of the time this bug goes unnoticed, as the fake ref won't match our
refspecs. However, if "--mirror" is used, then we see it as remote cruft
to be pruned, and try to pass along a deletion refspec for it. Of course
this refspec has bogus syntax (because of the ^{}), and the helper
complains, aborting the push.
Let's have remote-curl mirror what the builtin get_refs_via_connect() does
(at least for the case of using git protocol; we can leave the dumb
info/refs reader as it is).
This also fixes pushing with --mirror to a smart-http remote that uses
alternates. The fake ".have" refs the server gives to avoid unnecessary
network transfer has a similar bad interactions with the machinery.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-17 10:45:39 +00:00
|
|
|
test_expect_success 'push --all can push to empty repo' '
|
|
|
|
d=$HTTPD_DOCUMENT_ROOT_PATH/empty-all.git &&
|
|
|
|
git init --bare "$d" &&
|
|
|
|
git --git-dir="$d" config http.receivepack true &&
|
|
|
|
git push --all "$HTTPD_URL"/smart/empty-all.git
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push --mirror can push to empty repo' '
|
|
|
|
d=$HTTPD_DOCUMENT_ROOT_PATH/empty-mirror.git &&
|
|
|
|
git init --bare "$d" &&
|
|
|
|
git --git-dir="$d" config http.receivepack true &&
|
|
|
|
git push --mirror "$HTTPD_URL"/smart/empty-mirror.git
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push --all to repo with alternates' '
|
|
|
|
s=$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git &&
|
|
|
|
d=$HTTPD_DOCUMENT_ROOT_PATH/alternates-all.git &&
|
|
|
|
git clone --bare --shared "$s" "$d" &&
|
|
|
|
git --git-dir="$d" config http.receivepack true &&
|
|
|
|
git --git-dir="$d" repack -adl &&
|
|
|
|
git push --all "$HTTPD_URL"/smart/alternates-all.git
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push --mirror to repo with alternates' '
|
|
|
|
s=$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git &&
|
|
|
|
d=$HTTPD_DOCUMENT_ROOT_PATH/alternates-mirror.git &&
|
|
|
|
git clone --bare --shared "$s" "$d" &&
|
|
|
|
git --git-dir="$d" config http.receivepack true &&
|
|
|
|
git --git-dir="$d" repack -adl &&
|
|
|
|
git push --mirror "$HTTPD_URL"/smart/alternates-mirror.git
|
|
|
|
'
|
|
|
|
|
2012-01-08 21:06:20 +00:00
|
|
|
test_expect_success TTY 'quiet push' '
|
|
|
|
cd "$ROOT_PATH"/test_repo_clone &&
|
|
|
|
test_commit quiet &&
|
|
|
|
test_terminal git push --quiet --no-progress 2>&1 | tee output &&
|
|
|
|
test_cmp /dev/null output
|
|
|
|
'
|
|
|
|
|
2009-10-31 00:47:47 +00:00
|
|
|
stop_httpd
|
|
|
|
test_done
|