From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Philip Oakley <philipoakley@iee.org>,
Thomas Rast <trast@inf.ethz.ch>, Johannes Sixt <j6t@kdbg.org>,
Eric Sunshine <sunshine@sunshineco.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH v5 3/7] t6050-replace: test that objects are of the same type
Date: Fri, 06 Sep 2013 07:10:55 +0200 [thread overview]
Message-ID: <20130906051100.6657.75496.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20130906050702.6657.25651.chriscool@tuxfamily.org>
and that the -f option bypasses the type check
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..09bad98 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 &&
+ test_must_fail git replace HEAD^{tree} HEAD~1 &&
+ BLOB=$(git rev-parse :file) &&
+ test_must_fail git replace HEAD^ $BLOB
+'
+
+test_expect_success '-f option bypasses the type check' '
+ git replace -f mytag $HASH1 &&
+ git replace -f HEAD^{tree} HEAD~1 &&
+ git replace -f HEAD^ $BLOB
+'
+
test_done
--
1.8.4.rc1.28.ge2684af
next prev parent reply other threads:[~2013-09-06 5:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-06 5:10 [PATCH v5 0/7] Check replacement object type and minor updates Christian Couder
2013-09-06 5:10 ` [PATCH v5 1/7] replace: forbid replacing an object with one of a different type Christian Couder
2013-09-06 20:29 ` Junio C Hamano
2013-09-06 21:34 ` Junio C Hamano
2013-09-06 5:10 ` [PATCH v5 2/7] Documentation/replace: state that objects must be of the same type Christian Couder
2013-09-06 5:10 ` Christian Couder [this message]
2013-09-06 5:10 ` [PATCH v5 4/7] t6050-replace: add test to clean up all the replace refs Christian Couder
2013-09-06 5:10 ` [PATCH v5 5/7] Documentation/replace: add Creating Replacement Objects section Christian Couder
2013-09-06 5:10 ` [PATCH v5 6/7] replace: allow long option names Christian Couder
2013-09-06 5:10 ` [PATCH v5 7/7] t6050-replace: use some " 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=20130906051100.6657.75496.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jrnieder@gmail.com \
--cc=philipoakley@iee.org \
--cc=sunshine@sunshineco.com \
--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).