Re: [PATCH 3/3] t/t4013: add test for --diff-merges=off

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 5, 2020, 22:31 UTC
Message-ID: <xmqq3650n2rc.fsf@gitster.c.googlers.com>
In-Reply-To: <20200805220832.3800-4-sorganov@gmail.com>

Sergey Organov <sorganov@gmail.com> writes:

Show 16 quoted lines

> 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

other than that, these three patches all look good to me.

Thanks.