From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Michael Haggerty <mhagger@alum.mit.edu>,
Jakub Narebski <jnareb@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v7 7/9] replace: add test for --graft with signed commit
Date: Sat, 19 Jul 2014 17:01:13 +0200 [thread overview]
Message-ID: <20140719150116.9564.96311.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140719145951.9564.61331.chriscool@tuxfamily.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
t/t6050-replace.sh | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index f854dae..cebab63 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -7,6 +7,7 @@ test_description='Tests replace refs functionality'
exec </dev/null
. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-gpg.sh"
add_and_commit_file ()
{
@@ -394,4 +395,27 @@ test_expect_success '--graft with and without already replaced object' '
git replace -d $HASH5
'
+test_expect_success GPG 'set up a signed commit' '
+ echo "line 17" >>hello &&
+ echo "line 18" >>hello &&
+ git add hello &&
+ test_tick &&
+ git commit --quiet -S -m "hello: 2 more lines in a signed commit" &&
+ HASH8=$(git rev-parse --verify HEAD) &&
+ git verify-commit $HASH8
+'
+
+test_expect_success GPG '--graft with a signed commit' '
+ git cat-file commit $HASH8 >orig &&
+ git replace --graft $HASH8 &&
+ git cat-file commit $HASH8 >repl &&
+ commit_has_parents $HASH8 &&
+ test_must_fail git verify-commit $HASH8 &&
+ sed -n -e "/^tree /p" -e "/^author /p" -e "/^committer /p" orig >expected &&
+ echo >>expected &&
+ sed -e "/^$/q" repl >actual &&
+ test_cmp expected actual &&
+ git replace -d $HASH8
+'
+
test_done
--
2.0.0.421.g786a89d.dirty
next prev parent reply other threads:[~2014-07-19 15:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-19 15:01 [PATCH v7 0/9] Add --graft option to git replace Christian Couder
2014-07-19 15:01 ` [PATCH v7 1/9] replace: cleanup redirection style in tests Christian Couder
2014-07-19 15:01 ` [PATCH v7 2/9] replace: add --graft option Christian Couder
2014-07-19 15:01 ` [PATCH v7 3/9] replace: add test for --graft Christian Couder
2014-07-19 15:01 ` [PATCH v7 4/9] Documentation: replace: add --graft option Christian Couder
2014-07-19 15:01 ` [PATCH v7 5/9] contrib: add convert-grafts-to-replace-refs.sh Christian Couder
2014-07-19 15:01 ` [PATCH v7 6/9] replace: remove signature when using --graft Christian Couder
2014-07-19 15:01 ` Christian Couder [this message]
2014-07-19 15:01 ` [PATCH v7 8/9] replace: check mergetags " Christian Couder
2014-07-19 15:01 ` [PATCH v7 9/9] replace: add test for --graft with a mergetag Christian Couder
2014-07-21 20:09 ` [PATCH v7 0/9] Add --graft option to git replace Junio C Hamano
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=20140719150116.9564.96311.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=mhagger@alum.mit.edu \
--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).