From: Sverre Rabbelier <srabbelier@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>, Jeff King <peff@peff.net>,
Git List <git@vger.kernel.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Ramkumar
Cc: Sverre Rabbelier <srabbelier@gmail.com>
Subject: [PATCH v3 02/23] t5800: factor out some ref tests
Date: Sat, 16 Jul 2011 15:03:22 +0200 [thread overview]
Message-ID: <1310821424-4750-3-git-send-email-srabbelier@gmail.com> (raw)
In-Reply-To: <1310821424-4750-1-git-send-email-srabbelier@gmail.com>
From: Jeff King <peff@peff.net>
These are a little hard to read, and I'm about to add more
just like them. Plus the failure output is nicer if we use
test_cmp than a comparison with "test".
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
---
Unchanged
t/t5800-remote-helpers.sh | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh
index 1fb6380..3a37ad0 100755
--- a/t/t5800-remote-helpers.sh
+++ b/t/t5800-remote-helpers.sh
@@ -17,6 +17,12 @@ then
test_set_prereq PYTHON_24
fi
+compare_refs() {
+ git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
+ git --git-dir="$3/.git" rev-parse --verify $4 >actual &&
+ test_cmp expect actual
+}
+
test_expect_success PYTHON_24 'setup repository' '
git init --bare server/.git &&
git clone server public &&
@@ -59,8 +65,7 @@ test_expect_success PYTHON_24 'pushing to local repo' '
echo content >>file &&
git commit -a -m three &&
git push) &&
- HEAD=$(git --git-dir=localclone/.git rev-parse --verify HEAD) &&
- test $HEAD = $(git --git-dir=server/.git rev-parse --verify HEAD)
+ compare_refs localclone HEAD server HEAD
'
test_expect_success PYTHON_24 'synch with changes from localclone' '
@@ -73,8 +78,7 @@ test_expect_success PYTHON_24 'pushing remote local repo' '
echo content >>file &&
git commit -a -m four &&
git push) &&
- HEAD=$(git --git-dir=clone/.git rev-parse --verify HEAD) &&
- test $HEAD = $(git --git-dir=server/.git rev-parse --verify HEAD)
+ compare_refs clone HEAD server HEAD
'
test_done
--
1.7.5.1.292.g728120
next prev parent reply other threads:[~2011-07-16 13:04 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-16 13:03 [PATCH v3 00/23] remote-helper improvements Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 01/23] transport-helper: fix minor leak in push_refs_with_export Sverre Rabbelier
2011-07-16 13:03 ` Sverre Rabbelier [this message]
2011-07-16 13:03 ` [PATCH v3 03/23] t5800: use skip_all instead of prereq Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 04/23] t5800: document some non-functional parts of remote helpers Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 05/23] git-remote-testgit: import non-HEAD refs Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 06/23] transport-helper: don't feed bogus refs to export push Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 07/23] git_remote_helpers: push all refs during a non-local export Sverre Rabbelier
2011-07-17 23:36 ` Junio C Hamano
2011-07-23 11:27 ` Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 08/23] remote-helpers: export GIT_DIR variable to helpers Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 09/23] remote-curl: accept empty line as terminator Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 10/23] git-remote-testgit: only push for non-local repositories Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 11/23] git-remote-testgit: fix error handling Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 12/23] fast-import: introduce 'done' command Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 13/23] fast-export: support done feature Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 14/23] transport-helper: factor out push_update_refs_status Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 15/23] transport-helper: check status code of finish_command Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 16/23] transport-helper: use the new done feature where possible Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 17/23] transport-helper: update ref status after push with export Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 18/23] transport-helper: change import semantics Sverre Rabbelier
2011-07-18 11:13 ` Dmitry Ivankov
2011-07-16 13:03 ` [PATCH v3 19/23] transport-helper: Use capname for refspec capability too Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 20/23] transport-helper: implement marks location as capability Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 21/23] transport-helper: die early on encountering deleted refs Sverre Rabbelier
2011-07-16 13:03 ` [RFD/PATCH v3 22/23] t5800: document inability to push new branch with old content Sverre Rabbelier
2011-07-16 13:03 ` [RDD/PATCH v3 23/23] t5800: point out that deleting branches does not work Sverre Rabbelier
2011-07-18 3:28 ` [PATCH v3 00/23] remote-helper improvements Jeff King
2011-07-23 11:28 ` Sverre Rabbelier
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=1310821424-4750-3-git-send-email-srabbelier@gmail.com \
--to=srabbelier@gmail.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/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).