From: Eduardo Habkost <ehabkost@redhat.com>
To: Stefan Beller <sbeller@google.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
Paul Tan <pyokagan@gmail.com>
Subject: Re: [PATCH v2] am: add am.signoff add config variable
Date: Wed, 28 Dec 2016 17:19:28 -0200 [thread overview]
Message-ID: <20161228191928.GH3441@thinpad.lan.raisama.net> (raw)
In-Reply-To: <20161228191142.GF3441@thinpad.lan.raisama.net>
On Wed, Dec 28, 2016 at 05:11:42PM -0200, Eduardo Habkost wrote:
> On Wed, Dec 28, 2016 at 10:51:28AM -0800, Stefan Beller wrote:
> > On Wed, Dec 28, 2016 at 10:35 AM, Eduardo Habkost <ehabkost@redhat.com> wrote:
[...]
> > > + test $(git cat-file commit HEAD | grep -c "Signed-off-by:") -eq 0
> >
> > and then we check if the top most commit has zero occurrences
> > for lines grepped for sign off. That certainly works, but took me a
> > while to understand (TIL about -c in grep :).
> >
> > Another way that to write this check, that Git regulars may be more used to is:
> >
> > git cat-file commit HEAD | grep "Signed-off-by:" >actual
> > test_must_be_empty actual
>
> test_must_be_empty is what I was looking for. But if I do this:
>
> test_expect_success '--no-signoff overrides am.signoff' '
> rm -fr .git/rebase-apply &&
> git reset --hard first &&
> test_config am.signoff true &&
> git am --no-signoff <patch2 &&
> printf "%s\n" "$signoff" >expected &&
> git cat-file commit HEAD^ | grep "Signed-off-by:" >actual &&
> test_cmp expected actual &&
> git cat-file commit HEAD | grep "Signed-off-by:" >actual &&
> test_must_be_empty actual
> '
>
> The test fails because the second "grep" command returns a
> non-zero exit code. Any suggestions to avoid that problem in a
> more idiomatic way?
I just found out that "test_must_fail grep ..." is a common
idiom, so what about:
test_expect_success '--no-signoff overrides am.signoff' '
rm -fr .git/rebase-apply &&
git reset --hard first &&
test_config am.signoff true &&
git am --no-signoff <patch2 &&
printf "%s\n" "$signoff" >expected &&
git cat-file commit HEAD^ | grep "Signed-off-by:" >actual &&
test_cmp expected actual &&
git cat-file commit HEAD | test_must_fail grep -q "Signed-off-by:"
'
--
Eduardo
next prev parent reply other threads:[~2016-12-28 19:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-28 18:35 [PATCH v2] am: add am.signoff add config variable Eduardo Habkost
2016-12-28 18:51 ` Stefan Beller
2016-12-28 19:11 ` Eduardo Habkost
2016-12-28 19:19 ` Eduardo Habkost [this message]
2016-12-28 19:24 ` Stefan Beller
2016-12-29 7:59 ` Pranit Bauva
2016-12-29 15:37 ` Eduardo Habkost
2016-12-28 19:07 ` Andreas Schwab
2016-12-28 19:12 ` Eduardo Habkost
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161228191928.GH3441@thinpad.lan.raisama.net \
--to=ehabkost@redhat.com \
--cc=git@vger.kernel.org \
--cc=pyokagan@gmail.com \
--cc=sbeller@google.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).