git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Sergey Organov <sorganov@gmail.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: Wed, 05 Aug 2020 16:19:31 -0700	[thread overview]
Message-ID: <xmqqy2msllz0.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <87lfisk915.fsf@osv.gnss.ru> (Sergey Organov's message of "Thu, 06 Aug 2020 01:44:22 +0300")

Sergey Organov <sorganov@gmail.com> writes:

> 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?

Who said it didn't need it?

  reply	other threads:[~2020-08-05 23:19 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
2020-08-05 23:19       ` Junio C Hamano [this message]
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

  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=xmqqy2msllz0.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=sorganov@gmail.com \
    --subject='Re: [PATCH  3/3] t/t4013: add test for --diff-merges=off' \
    /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

Code repositories for project(s) associated with this 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).