git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tay Ray Chuan <rctay89@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Cc: "Clemens Buchacher" <drizzd@aon.at>,
	"Mike Hommey" <mh@glandium.org>,
	"Shawn O. Pearce" <spearce@spearce.org>
Subject: [PATCH 1/7] t5541-http-push: check that ref is unchanged for non-ff test
Date: Sun, 21 Feb 2010 11:08:22 +0800	[thread overview]
Message-ID: <1266721708-1060-2-git-send-email-rctay89@gmail.com> (raw)
In-Reply-To: <1266721708-1060-1-git-send-email-rctay89@gmail.com>

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
---
 t/t5541-http-push.sh |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 53f54a2..ff947f3 100755
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -89,15 +89,17 @@ test_expect_success 'used receive-pack service' '
 '
 
 test_expect_success 'non-fast-forward push fails' '
+	cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
+	HEAD=$(git rev-parse --verify HEAD) &&
+
 	cd "$ROOT_PATH"/test_repo_clone &&
 	git checkout master &&
 	echo "changed" > path2 &&
 	git commit -a -m path2 --amend &&
 
-	HEAD=$(git rev-parse --verify HEAD) &&
 	!(git push -v origin >output 2>&1) &&
 	(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
-	 test $HEAD != $(git rev-parse --verify HEAD))
+	 test $HEAD = $(git rev-parse --verify HEAD))
 '
 
 test_expect_success 'non-fast-forward push show ref status' '
-- 
1.7.0.26.gbfa16

  reply	other threads:[~2010-02-21  3:09 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-21  3:08 [PATCH 0/7] http: minor improvements Tay Ray Chuan
2010-02-21  3:08 ` Tay Ray Chuan [this message]
2010-02-21  3:08 ` [PATCH 2/7] t554[01]-http-push: refactor, add non-ff tests Tay Ray Chuan
2010-02-21  3:08 ` [PATCH 3/7] http-push: remove useless condition Tay Ray Chuan
2010-02-21 10:40   ` Clemens Buchacher
2010-02-21 15:23     ` Tay Ray Chuan
2010-02-21  3:08 ` [PATCH 4/7] http-walker: cleanup more thoroughly Tay Ray Chuan
2010-02-21  3:08 ` [PATCH 5/7] http: init and cleanup separately from http-walker Tay Ray Chuan
2010-02-21 10:38   ` Clemens Buchacher
2010-02-21 10:57     ` Clemens Buchacher
2010-02-21 15:23       ` Tay Ray Chuan
2010-02-21  3:08 ` [PATCH 6/7] remote-curl: use http_fetch_ref() instead of walker wrapper Tay Ray Chuan
2010-02-21  3:08 ` [PATCH 7/7] remote-curl: init walker only when needed Tay Ray Chuan

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=1266721708-1060-2-git-send-email-rctay89@gmail.com \
    --to=rctay89@gmail.com \
    --cc=drizzd@aon.at \
    --cc=git@vger.kernel.org \
    --cc=mh@glandium.org \
    --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).