From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: Bryan Turner <bturner@atlassian•com>, Git Users <git@vger•kernel.org>
Subject: Re: git diff-tree commit detail bug in 2.0.2 and 2.0.3
Date: Mon, 28 Jul 2014 11:19:46 -0700 [thread overview]
Message-ID: <xmqqppgp4a7x.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140728180157.GA11265@peff.net> (Jeff King's message of "Mon, 28 Jul 2014 14:01:57 -0400")
Jeff King <peff@peff•net> writes:
> On Mon, Jul 28, 2014 at 01:37:34PM -0400, Jeff King wrote:
>
>> On Mon, Jul 28, 2014 at 10:32:45AM -0700, Junio C Hamano wrote:
>>
>> > > Junio, we should consider a v2.0.4 with that series, I think. This is a
>> > > pretty serious regression in diff-tree (I didn't even realize that the
>> > > buffer-slab work went into the maint series; that may have been a little
>> > > ambitious).
>> >
>> > Or v2.0.4 without that series, which is how we usually do things,
>> > but let me see if jk/alloc-commit-id is easily applicable there
>> > first.
>>
>> Yeah, I'm fine with a straight revert, too (I think it is fine to keep
>> in master, though). I think jk/alloc-commit-id is built right on top of
>> the original commit-slab topic, so it should be easy to do either way.
>>
>> Thanks for dealing with it.
>
> Whatever we do, perhaps it is worth applying the test below on top?
Yeah, thanks. I think that is a good idea. I was preparing a patch
to tuck your minimum reproduction at the end of 4202, but your version
and placement makes good sense.
> -- >8 --
> Subject: t4013: test diff-tree's --stdin commit formatting
>
> Once upon a time, git-log was just "rev-list | diff-tree",
> and we did not bother to test it separately. These days git-log
> is implemented internally, but we want to make sure that the
> rev-list to diff-tree pipeline continues to function. Let's
> add a basic sanity test.
>
> Signed-off-by: Jeff King <peff@peff•net>
> ---
> t/t4013-diff-various.sh | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
> index 805b055..6ec6072 100755
> --- a/t/t4013-diff-various.sh
> +++ b/t/t4013-diff-various.sh
> @@ -324,4 +324,14 @@ test_expect_success 'diff --cached -- file on unborn branch' '
> test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result
> '
>
> +test_expect_success 'diff-tree --stdin with log formatting' '
> + cat >expect <<-\EOF &&
> + Side
> + Third
> + Second
> + EOF
> + git rev-list master | git diff-tree --stdin --format=%s -s >actual &&
> + test_cmp expect actual
> +'
> +
> test_done
next prev parent reply other threads:[~2014-07-28 18:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-28 9:42 git diff-tree commit detail bug in 2.0.2 and 2.0.3 Bryan Turner
2014-07-28 10:18 ` Ramsay Jones
2014-07-28 10:35 ` Jeff King
2014-07-28 10:44 ` Jeff King
2014-07-28 12:08 ` Bryan Turner
2014-07-28 15:35 ` Junio C Hamano
2014-07-28 15:48 ` Jeff King
2014-07-28 17:32 ` Junio C Hamano
2014-07-28 17:37 ` Jeff King
2014-07-28 18:01 ` Jeff King
2014-07-28 18:19 ` Junio C Hamano [this message]
2014-07-29 0:11 ` Junio C Hamano
2014-07-29 1:06 ` Bryan Turner
2014-07-29 7:54 ` Jeff King
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=xmqqppgp4a7x.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=bturner@atlassian$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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