From: Sergey Organov <sorganov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: [PATCH 3/3] t/t4013: add test for --diff-merges=off
Date: Thu, 06 Aug 2020 01:44:22 +0300 [thread overview]
Message-ID: <87lfisk915.fsf@osv.gnss.ru> (raw)
In-Reply-To: <xmqq3650n2rc.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Wed, 05 Aug 2020 15:31:35 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Sergey Organov <sorganov@gmail.com> writes:
>
>> Signed-off-by: Sergey Organov <sorganov@gmail.com>
>> ---
>> t/t4013-diff-various.sh | 1 +
>> ...--diff-merges=off_-p_--first-parent_master | 78 +++++++++++++++++++
>> 2 files changed, 79 insertions(+)
>> create mode 100644
>> t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
>>
>> diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
>> index 40e222c94520..86fb11cecc61 100755
>> --- a/t/t4013-diff-various.sh
>> +++ b/t/t4013-diff-various.sh
>> @@ -298,6 +298,7 @@ log --root -c --patch-with-stat --summary master
>> # improved by Timo's patch
>> log --root --cc --patch-with-stat --summary master
>> log --no-diff-merges -p --first-parent master
>> +log --diff-merges=off -p --first-parent master
>
> I think we want to also test it in a different order, e.g.
>
> log --first-parent --diff-merges=off -p master
Dunno, why original Jeff series didn't need
log --first-parent --no-diff-merges -p master
then?
> other than that, these three patches all look good to me.
Thanks,
-- Sergey
next prev parent reply other threads:[~2020-08-05 22:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-05 22:08 [PATCH 0/3] Change "--diff-merges" to require parameter Sergey Organov
2020-08-05 22:08 ` [PATCH 1/3] revision: change "--diff-merges" option " Sergey Organov
2020-08-05 22:08 ` [PATCH 2/3] doc/git-log: describe --diff-merges=off Sergey Organov
2020-08-12 0:06 ` Junio C Hamano
2020-08-12 0:48 ` Junio C Hamano
2020-08-12 8:08 ` Sergey Organov
2020-08-05 22:08 ` [PATCH 3/3] t/t4013: add test for --diff-merges=off Sergey Organov
2020-08-05 22:31 ` Junio C Hamano
2020-08-05 22:44 ` Sergey Organov [this message]
2020-08-05 23:19 ` Junio C Hamano
2020-08-05 23:44 ` Junio C Hamano
2020-08-06 8:34 ` Sergey Organov
2020-08-06 17:10 ` Junio C Hamano
2020-08-06 20:52 ` Sergey Organov
2020-08-07 23:11 ` Sergey Organov
2020-08-17 17:17 ` Junio C Hamano
2020-08-17 20:36 ` Sergey Organov
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=87lfisk915.fsf@osv.gnss.ru \
--to=sorganov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.