From: Christian Couder <christian.couder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Christian Couder <chriscool@tuxfamily.org>,
git <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: Thu, 3 Jul 2014 16:17:20 +0200 [thread overview]
Message-ID: <CAP8UFD2ddGr=cHSv06chD402k1dYrcQ=mxxWP+EHs48zE5twuA@mail.gmail.com> (raw)
In-Reply-To: <xmqqlhsbfocm.fsf@gitster.dls.corp.google.com>
On Wed, Jul 2, 2014 at 11:22 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Christian Couder <chriscool@tuxfamily.org> writes:
>
>>
>> +test_expect_success GPG 'set up a signed commit' '
>> + echo "line 17" >> hello &&
>> + echo "line 18" >> hello &&
>
> Style?
Yeah, I will change it to:
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 &&
>> + 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.
Ok, I will find a way to make it better.
Thanks,
Christian.
prev parent reply other threads:[~2014-07-03 14:17 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
2014-07-03 14:17 ` Christian Couder [this message]
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='CAP8UFD2ddGr=cHSv06chD402k1dYrcQ=mxxWP+EHs48zE5twuA@mail.gmail.com' \
--to=christian.couder@gmail.com \
--cc=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).