From: Clemens Buchacher <drizzd@aon.at>
To: spearce@spearce.org
Cc: Mark Lodato <lodatom@gmail.com>,
git@vger.kernel.org, Clemens Buchacher <drizzd@aon.at>
Subject: [PATCH 1/3] update http tests according to remote-curl capabilities
Date: Sun, 25 Oct 2009 13:06:18 +0100 [thread overview]
Message-ID: <1256472380-924-2-git-send-email-drizzd@aon.at> (raw)
In-Reply-To: <1256472380-924-1-git-send-email-drizzd@aon.at>
o Pushing packed refs is now fixed.
o The transport helper fails if refs are already up-to-date. Add a
test for that.
o The transport helper will notice if refs are already up-to-date. We
therefore need to update server info in the unpacked-refs test.
o The transport helper will purge deleted branches automatically.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
---
t/t5540-http-push.sh | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh
index f4a2cf6..09edd23 100755
--- a/t/t5540-http-push.sh
+++ b/t/t5540-http-push.sh
@@ -36,6 +36,7 @@ test_expect_success 'setup remote repository' '
cd test_repo.git &&
git --bare update-server-info &&
mv hooks/post-update.sample hooks/post-update &&
+ ORIG_HEAD=$(git rev-parse --verify HEAD) &&
cd - &&
mv test_repo.git "$HTTPD_DOCUMENT_ROOT_PATH"
'
@@ -45,7 +46,7 @@ test_expect_success 'clone remote repository' '
git clone $HTTPD_URL/test_repo.git test_repo_clone
'
-test_expect_failure 'push to remote repository with packed refs' '
+test_expect_success 'push to remote repository with packed refs' '
cd "$ROOT_PATH"/test_repo_clone &&
: >path2 &&
git add path2 &&
@@ -57,11 +58,15 @@ test_expect_failure 'push to remote repository with packed refs' '
test $HEAD = $(git rev-parse --verify HEAD))
'
-test_expect_success ' push to remote repository with unpacked refs' '
+test_expect_failure 'push already up-to-date' '
+ git push
+'
+
+test_expect_success 'push to remote repository with unpacked refs' '
(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
rm packed-refs &&
- git update-ref refs/heads/master \
- 0c973ae9bd51902a28466f3850b543fa66a6aaf4) &&
+ git update-ref refs/heads/master $ORIG_HEAD &&
+ git --bare update-server-info) &&
git push &&
(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
test $HEAD = $(git rev-parse --verify HEAD))
@@ -113,7 +118,6 @@ test_expect_success 'create and delete remote branch' '
git push origin dev &&
git fetch &&
git push origin :dev &&
- git branch -d -r origin/dev &&
git fetch &&
test_must_fail git show-ref --verify refs/remotes/origin/dev
'
--
1.6.5.35.ge41a3
next prev parent reply other threads:[~2009-10-25 12:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-25 12:06 Smart HTTP tests Clemens Buchacher
2009-10-25 12:06 ` Clemens Buchacher [this message]
2009-10-25 12:06 ` [PATCH 2/3] remote-helpers: return successfully if everything up-to-date Clemens Buchacher
2009-10-25 12:06 ` [PATCH 3/3] add smart HTTP tests Clemens Buchacher
2009-10-28 0:17 ` Shawn O. Pearce
2009-10-28 17:52 ` [PATCH] t5540: test both smart and dumb protocols Clemens Buchacher
2009-10-28 0:11 ` [PATCH 2/3] remote-helpers: return successfully if everything up-to-date Shawn O. Pearce
2009-10-28 7:18 ` Junio C Hamano
2009-10-28 0:10 ` [PATCH 1/3] update http tests according to remote-curl capabilities Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1256472380-924-2-git-send-email-drizzd@aon.at \
--to=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=lodatom@gmail.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).