From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Philip Oakley <philipoakley@iee.orcg>,
Thomas Rast <trast@inf.ethz.ch>
Subject: [PATCH 3/5] t6050-replace: test that objects are of the same type
Date: Sun, 25 Aug 2013 15:06:06 +0200 [thread overview]
Message-ID: <20130825130609.4681.58306.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20130825125940.4681.70226.chriscool@tuxfamily.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
t/t6050-replace.sh | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index decdc33..8f631ac 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -263,4 +263,17 @@ test_expect_success 'not just commits' '
test_cmp file.replaced file
'
+test_expect_success 'replaced and replacement objects must be of the same type' '
+ test_must_fail git replace mytag $HASH1 2>err &&
+ grep "Object ref '\''mytag'\'' is of type '\''tag'\''" err &&
+ grep "replace ref '\''$HASH1'\'' is of type '\''commit'\''" err &&
+ test_must_fail git replace HEAD^{tree} HEAD~1 2>err &&
+ grep "Object ref '\''HEAD^{tree}'\'' is of type '\''tree'\''" err &&
+ grep "replace ref '\''HEAD~1'\'' is of type '\''commit'\''" err &&
+ BLOB=$(git rev-parse :file) &&
+ test_must_fail git replace HEAD^ $BLOB 2>err &&
+ grep "Object ref '\''HEAD^'\'' is of type '\''commit'\''" err &&
+ grep "replace ref '\''$BLOB'\'' is of type '\''blob'\''" err
+'
+
test_done
--
1.8.4.rc1.24.g13dc82a
next prev parent reply other threads:[~2013-08-25 13:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-25 13:06 [PATCH 0/5] Check replacement object type and minor updates Christian Couder
2013-08-25 13:06 ` [PATCH 1/5] replace: forbid replacing an object with one of a different type Christian Couder
2013-08-25 18:35 ` Johannes Sixt
2013-08-25 19:44 ` Christian Couder
2013-08-25 20:18 ` Johannes Sixt
2013-08-26 7:19 ` Christian Couder
2013-08-25 13:06 ` [PATCH 2/5] Documentation/replace: state that objects must be of the same type Christian Couder
2013-08-25 13:06 ` Christian Couder [this message]
2013-08-25 20:06 ` [PATCH 3/5] t6050-replace: test that objects are " Johannes Sixt
2013-08-25 13:06 ` [PATCH 4/5] t6050-replace: add test to clean up all the replace refs Christian Couder
2013-08-25 13:06 ` [PATCH 5/5] Documentation/replace: add Creating Replacement Objects section 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=20130825130609.4681.58306.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=philipoakley@iee.orcg \
--cc=trast@inf.ethz.ch \
/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).