From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Joey Hess <joey@kitenet.net>,
Eric Sunshine <sunshine@sunshineco.com>,
Karsten Blees <karsten.blees@gmail.com>
Subject: [PATCH v4 08/10] t6050: add tests for listing with --format
Date: Sat, 28 Dec 2013 12:00:13 +0100 [thread overview]
Message-ID: <20131228110016.2272.66623.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20131228105505.2272.58873.chriscool@tuxfamily.org>
This patch adds tests for "git replace -l --format=<fmt>".
'short', 'medium' and 'long' are the only allowed values
for <fmt>.
'short' is the same as with no --format option.
Tests for 'medium' and 'long' are the most needed.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
t/t6050-replace.sh | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index bb785ec..9d05101 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -281,6 +281,43 @@ test_expect_success 'git cat-file --batch works on replace objects' '
echo $PARA3 | git cat-file --batch
'
+test_expect_success 'test --format bogus' '
+ test_must_fail git replace --format bogus >/dev/null 2>&1
+'
+
+test_expect_success 'test --format short' '
+ git replace --format=short >actual &&
+ git replace >expected &&
+ test_cmp expected actual
+'
+
+test_expect_success 'test --format medium' '
+ H1=$(git --no-replace-objects rev-parse HEAD~1) &&
+ HT=$(git --no-replace-objects rev-parse HEAD^{tree}) &&
+ MYTAG=$(git --no-replace-objects rev-parse mytag) &&
+ {
+ echo "$H1 -> $BLOB" &&
+ echo "$BLOB -> $REPLACED" &&
+ echo "$HT -> $H1" &&
+ echo "$PARA3 -> $S" &&
+ echo "$MYTAG -> $HASH1"
+ } | sort >expected &&
+ git replace -l --format medium | sort > actual &&
+ test_cmp expected actual
+'
+
+test_expect_failure 'test --format long' '
+ {
+ echo "$H1 (commit) -> $BLOB (blob)" &&
+ echo "$BLOB (blob) -> $REPLACED (blob)" &&
+ echo "$HT (tree) -> $H1 (commit)" &&
+ echo "$PARA3 (commit) -> $S (commit)" &&
+ echo "$MYTAG (tag) -> $HASH1 (commit)"
+ } | sort >expected &&
+ git replace --format=long | sort > actual &&
+ test_cmp expected actual
+'
+
test_expect_success 'replace ref cleanup' '
test -n "$(git replace)" &&
git replace -d $(git replace) &&
--
1.8.4.1.616.g07f5c81
next prev parent reply other threads:[~2013-12-28 11:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-28 11:00 [PATCH v4 00/10] teach replace objects to sha1_object_info_extended() Christian Couder
2013-12-28 11:00 ` [PATCH v4 01/10] Rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT Christian Couder
2013-12-28 11:00 ` [PATCH v4 02/10] replace_object: don't check read_replace_refs twice Christian Couder
2013-12-28 11:00 ` [PATCH v4 03/10] Introduce lookup_replace_object_extended() to pass flags Christian Couder
2013-12-28 11:00 ` [PATCH v4 04/10] Add an "unsigned flags" parameter to sha1_object_info_extended() Christian Couder
2013-12-28 11:00 ` [PATCH v4 05/10] t6050: show that git cat-file --batch fails with replace objects Christian Couder
2013-12-28 11:00 ` [PATCH v4 06/10] sha1_file: perform object replacement in sha1_object_info_extended() Christian Couder
2013-12-28 11:00 ` [PATCH v4 07/10] builtin/replace: teach listing using short, medium or long formats Christian Couder
2013-12-28 11:00 ` Christian Couder [this message]
2013-12-28 11:00 ` [PATCH v4 09/10] builtin/replace: unset read_replace_refs Christian Couder
2013-12-28 11:00 ` [PATCH v4 10/10] Documentation/git-replace: describe --format option Christian Couder
2013-12-30 20:32 ` [PATCH v4 00/10] teach replace objects to sha1_object_info_extended() Junio C Hamano
2013-12-31 6:23 ` Christian Couder
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=20131228110016.2272.66623.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=joey@kitenet.net \
--cc=karsten.blees@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/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).