From: Junio C Hamano <gitster@pobox.com>
To: Stephan Beyer <s-beyer@gmx.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Add test cases for git-am
Date: Sat, 31 May 2008 12:22:01 -0700 [thread overview]
Message-ID: <7viqwuffdy.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080531024027.GB5907@leksak.fem-net> (Stephan Beyer's message of "Sat, 31 May 2008 04:40:27 +0200")
Stephan Beyer <s-beyer@gmx.net> writes:
>> > + tail -n +3 msg >file &&
>>
>> "tail -n 3" you mean?
>
> No :-)
> "tail -n 3" or "tail -n -3" results in the last three lines, but
> "tail -n +3" results in the last lines beginning from the third line.
"git grep 'tail.*+' -- '*.sh'" says that this will the first and only
instance of "tail -n +<number>". The syntax may be POSIX but not all
/usr/bin/tail unfortunately knows about it.
I tend to prefer "sed -n -e '3,$p'" for things like this for portability.
Incidentally, the only /usr/bin/tail that is incapable of +number I have
access to is so old that it does not even want -n and only wants "tail -3"
or "tail +3"; funnily enough, /usr/bin/head there does accept -n.
>> Hmmm. Checking for inequality does not feel so robust. You will allow
>> "am" to record garbage and will not be able to detect a breakage.
>
> Oh, right.
>
> Does this feel better?
> --- a/t/t4151-am.sh
> +++ b/t/t4151-am.sh
> @@ -123,15 +123,13 @@ test_expect_success 'am changes committer and keeps author' '
> git checkout first &&
> git am patch2 &&
> ! test -d .dotest &&
> - test "$(git rev-parse master)" != "$(git rev-parse HEAD)" &&
> - test "$(git rev-parse master^)" != "$(git rev-parse HEAD^)" &&
> test "$(git rev-parse master^^)" = "$(git rev-parse HEAD^^)" &&
> test -z "$(git diff master..HEAD)" &&
> test -z "$(git diff master^..HEAD^)" &&
> compare author master HEAD &&
> compare author master^ HEAD^ &&
> - ! compare committer master HEAD &&
> - ! compare committer master^ HEAD^
> + test "Co M Miter <c.miter@example.com>" = \
> + "$(git log -1 --pretty=format:"%cn <%ce>" HEAD)"
> '
That looks like a more direct approach, doesn't it?
>> Again, don't you want to check not just "It added something", but "It
>> added what we expected it to add"?
>
> Like this?
> ---
> test_expect_success 'am --signoff adds Signed-off-by: line' '
> git checkout -b master2 first &&
> git am --signoff <patch2 &&
> test "$(git cat-file commit HEAD | grep -c "^Signed-off-by:")" -eq 1 &&
> - test "$(git cat-file commit HEAD^ | grep -c "^Signed-off-by:")" -eq 2
> + test "$(git cat-file commit HEAD^ | grep -c "^Signed-off-by:")" -eq 2 &&
> + git cat-file commit HEAD | grep -q "^Signed-off-by: Co M Miter <c.miter@example.com>$" &&
> + git cat-file commit HEAD^ | grep -q "^Signed-off-by: Co M Miter <c.miter@example.com>$" &&
> + git cat-file commit HEAD^ | grep -q "^Signed-off-by: C O Mitter <committer@example.com>$"
> '
> ---
>
> Mh, I thought it is not bad to keep the -eq checks just to go sure nothing
> is added twice by whatever reason.
Why not sed out all Signed-off-by lines and make sure all of what you
expect to appear do appear in the order you expect them to do?
next prev parent reply other threads:[~2008-05-31 19:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-30 14:04 [PATCH] Add test cases for git-am Stephan Beyer
2008-05-30 22:12 ` Junio C Hamano
2008-05-31 2:40 ` Stephan Beyer
2008-05-31 6:26 ` Mutt and Mail-Followup-To Teemu Likonen
2008-05-31 19:22 ` Junio C Hamano [this message]
2008-05-31 22:07 ` [PATCH] Add test cases for git-am Stephan Beyer
2008-05-31 22:11 ` [PATCH v2 1/2] " Stephan Beyer
2008-05-31 22:11 ` [PATCH v2 2/2] Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh Stephan Beyer
2008-05-31 22:41 ` [PATCH] Add test cases for git-am Junio C Hamano
2008-06-02 17:53 ` Andreas Ericsson
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=7viqwuffdy.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=s-beyer@gmx.net \
/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).