From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <chriscool@tuxfamily.org>
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: Re: [PATCH v5 7/7] replace: add test for --graft with signed commit
Date: Wed, 02 Jul 2014 14:22:01 -0700 [thread overview]
Message-ID: <xmqqlhsbfocm.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140628181117.5687.83337.chriscool@tuxfamily.org> (Christian Couder's message of "Sat, 28 Jun 2014 20:11:16 +0200")
Christian Couder <chriscool@tuxfamily.org> writes:
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
> t/t6050-replace.sh | 22 ++++++++++++++++++++++
> 1 file changed, 22 insertions(+)
>
> diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
> index ca45a84..80b85e3 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()
> {
> @@ -363,4 +364,25 @@ 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 &&
Style?
> + 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 &&
> + test_must_fail grep gpgsig repl &&
> + diff -u orig repl | grep "^-parent $HASH7" &&
> + diff -u orig repl | grep "^-gpgsig -----BEGIN PGP SIGNATURE-----" &&
Almost the same comment as the one for 2/7 applies here.
> + test_must_fail git verify-commit $HASH8 &&
> + git replace -d $HASH8
> +'
> +
> test_done
next prev parent reply other threads:[~2014-07-02 21:22 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-28 18:11 [PATCH v5 0/7] Add --graft option to git replace Christian Couder
2014-06-28 18:11 ` [PATCH v5 1/7] replace: add --graft option Christian Couder
2014-06-28 18:11 ` [PATCH v5 2/7] replace: add test for --graft Christian Couder
2014-07-02 20:49 ` Junio C Hamano
2014-07-03 13:39 ` Christian Couder
2014-07-03 18:45 ` Junio C Hamano
2014-06-28 18:11 ` [PATCH v5 3/7] Documentation: replace: add --graft option Christian Couder
2014-06-28 18:11 ` [PATCH v5 4/7] contrib: add convert-grafts-to-replace-refs.sh Christian Couder
2014-06-28 18:11 ` [PATCH v5 5/7] replace: refactor replacing parents Christian Couder
2014-07-02 21:05 ` Junio C Hamano
2014-07-03 13:42 ` Christian Couder
2014-06-28 18:11 ` [PATCH v5 6/7] replace: remove signature when using --graft Christian Couder
2014-07-02 21:19 ` Junio C Hamano
2014-07-03 14:09 ` Christian Couder
2014-06-28 18:11 ` [PATCH v5 7/7] replace: add test for --graft with signed commit Christian Couder
2014-07-02 21:22 ` Junio C Hamano [this message]
2014-07-03 14:17 ` 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=xmqqlhsbfocm.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--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).