git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "René Scharfe" <l.s.r@web.de>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Git List <git@vger.kernel.org>,
	Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 1/2] t1450: add tests for NUL in headers of commits and tags
Date: Thu, 19 Nov 2015 21:54:54 +0100	[thread overview]
Message-ID: <564E371E.50606@web.de> (raw)
In-Reply-To: <CAPig+cSXiGVLvq59sUFAzTRoQFf-QswAoMSk20LvJqntzaf65A@mail.gmail.com>

Am 19.11.2015 um 21:33 schrieb Eric Sunshine:
> On Thu, Nov 19, 2015 at 11:20 AM, René Scharfe <l.s.r@web.de> wrote:
>> Signed-off-by: Rene Scharfe <l.s.r@web.de>
>> ---
>> diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
>> @@ -176,6 +176,18 @@ test_expect_success 'integer overflow in timestamps is reported' '
>> +test_expect_success 'commit with NUL in header' '
>> +       git cat-file commit HEAD >basis &&
>> +       sed "s/author ./author Q/" <basis | q_to_nul >commit-NUL-header &&
>> +       new=$(git hash-object -t commit -w --stdin <commit-NUL-header) &&
>> +       test_when_finished "remove_object $new" &&
>> +       git update-ref refs/heads/bogus "$new" &&
>> +       test_when_finished "git update-ref -d refs/heads/bogus" &&
>> +       test_must_fail git fsck 2>out &&
>> +       cat out &&
>
> What is the purpose of this 'cat'?

It shows the full error message when the test is run with --debug, which 
is convenient when the following grep doesn't match.  The same is done 
in most tests in that file.

>
>> +       grep "error in commit $new.*unterminated header: NUL at offset" out
>> +'
>> @@ -276,6 +288,26 @@ test_expect_success 'tag with bad tagger' '
>> +test_expect_failure 'tag with NUL in header' '
>> +       sha=$(git rev-parse HEAD) &&
>> +       q_to_nul >tag-NUL-header <<-EOF &&
>> +       object $sha
>> +       type commit
>> +       tag contains-Q-in-header
>> +       tagger T A Gger <tagger@example.com> 1234567890 -0000
>> +
>> +       This is an invalid tag.
>> +       EOF
>> +
>> +       tag=$(git hash-object --literally -t tag -w --stdin <tag-NUL-header) &&
>> +       test_when_finished "remove_object $tag" &&
>> +       echo $tag >.git/refs/tags/wrong &&
>> +       test_when_finished "git update-ref -d refs/tags/wrong" &&
>> +       test_must_fail git fsck --tags 2>out &&
>> +       cat out &&
>
> Ditto.
>
>> +       grep "error in tag $tag.*unterminated header: NUL at offset" out
>> +'
>> +
>> --
>> 2.6.3

  reply	other threads:[~2015-11-19 20:55 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-19 16:20 [PATCH 1/2] t1450: add tests for NUL in headers of commits and tags René Scharfe
2015-11-19 16:25 ` [PATCH 2/2] fsck: treat a NUL in a tag header as an error René Scharfe
2015-11-20 11:13   ` Jeff King
2015-11-20 20:18   ` Johannes Schindelin
2015-11-19 20:33 ` [PATCH 1/2] t1450: add tests for NUL in headers of commits and tags Eric Sunshine
2015-11-19 20:54   ` René Scharfe [this message]
2015-11-20 11:14     ` Jeff King
2015-11-20 20:49       ` René Scharfe
2015-11-20 20:50       ` [PATCH 3/2] test: factor out helper function test_must_contain René Scharfe
2015-11-21  8:11         ` Johannes Sixt
2015-11-21  9:35           ` René Scharfe
2015-11-20 20:50       ` [PATCH 4/2] test: use test_must_contain René Scharfe
2015-11-21  1:16         ` SZEDER Gábor
2015-11-21  2:30           ` René Scharfe

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=564E371E.50606@web.de \
    --to=l.s.r@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    --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).