From: "Ævar Arnfjörð Bjarmason" <avarab@gmail•com>
To: Sergey Organov <sorganov@gmail•com>
Cc: Junio C Hamano <gitster@pobox•com>, Jeff King <peff@peff•net>,
Philip Oakley <philipoakley@iee•email>,
Elijah Newren <newren@gmail•com>,
Felipe Contreras <felipe.contreras@gmail•com>,
git@vger•kernel.org
Subject: Re: [PATCH 6/9] t4013: add tests for log.diffMerges config
Date: Thu, 08 Apr 2021 01:06:26 +0200 [thread overview]
Message-ID: <87v98xitjh.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20210407225608.14611-7-sorganov@gmail.com>
On Thu, Apr 08 2021, Sergey Organov wrote:
> Test that wrong values are denied.
>
> Test that the value of log.diffMerges properly affects both
> --diff-merges=def and -m.
>
> Signed-off-by: Sergey Organov <sorganov@gmail•com>
> ---
> t/t4013-diff-various.sh | 26 ++++++++++++++++++++++++++
> 1 file changed, 26 insertions(+)
>
> diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
> index 275a6790896d..ee4afca06ced 100755
> --- a/t/t4013-diff-various.sh
> +++ b/t/t4013-diff-various.sh
> @@ -460,6 +460,32 @@ test_expect_success 'log --diff-merges=def matches --diff-merges=separate' '
> test_cmp expected actual
> '
>
> +test_expect_success 'deny wrong log.diffMerges config' '
> + git config log.diffMerges wrong-value &&
> + test_expect_code 128 git log &&
> + git config --unset log.diffMerges
Don't use "git config", but "test_config" at the start, then you don't
need the --unset at the end, it'll happen automatically. Ditto for the
following tests.
> +'
> +
> +test_expect_success 'git config log.diffMerges first-parent' '
> + git log -p --diff-merges=first-parent master >result &&
> + process_diffs result >expected &&
> + git config log.diffMerges first-parent &&
> + git log -p --diff-merges=def master >result &&
> + process_diffs result >actual &&
> + git config --unset log.diffMerges &&
> + test_cmp expected actual
> +'
> +
> +test_expect_success 'git config log.diffMerges first-parent vs -m' '
> + git log -p --diff-merges=first-parent master >result &&
> + process_diffs result >expected &&
> + git config log.diffMerges first-parent &&
> + git log -p -m master >result &&
> + process_diffs result >actual &&
> + git config --unset log.diffMerges &&
> + test_cmp expected actual
> +'
> +
> test_expect_success 'log -S requires an argument' '
> test_must_fail git log -S
> '
next prev parent reply other threads:[~2021-04-07 23:06 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 22:55 [PATCH 0/9] git log: configurable default format for merge diffs Sergey Organov
2021-04-07 22:56 ` [PATCH 1/9] diff-merges: introduce --diff-merges=def Sergey Organov
2021-04-08 11:48 ` Philip Oakley
2021-04-08 14:21 ` Sergey Organov
2021-04-08 17:27 ` Junio C Hamano
2021-04-08 17:38 ` Sergey Organov
2021-04-07 22:56 ` [PATCH 2/9] diff-merges: refactor set_diff_merges() Sergey Organov
2021-04-07 22:56 ` [PATCH 3/9] diff-merges: introduce log.diffMerges config variable Sergey Organov
2021-04-08 21:37 ` SZEDER Gábor
2021-04-08 21:51 ` SZEDER Gábor
2021-04-08 22:01 ` Junio C Hamano
2021-04-08 23:04 ` Sergey Organov
2021-04-07 22:56 ` [PATCH 4/9] diff-merges: adapt -m to enable default diff format Sergey Organov
2021-04-07 22:56 ` [PATCH 5/9] t4013: add test for --diff-merges=def Sergey Organov
2021-04-07 22:56 ` [PATCH 6/9] t4013: add tests for log.diffMerges config Sergey Organov
2021-04-07 23:06 ` Ævar Arnfjörð Bjarmason [this message]
2021-04-07 23:35 ` Junio C Hamano
2021-04-08 14:25 ` Sergey Organov
2021-04-07 22:56 ` [PATCH 7/9] t9902: fix completion tests for log.d* to match log.diffMerges Sergey Organov
2021-04-07 23:05 ` Ævar Arnfjörð Bjarmason
2021-04-08 14:41 ` Sergey Organov
2021-04-08 19:50 ` Ævar Arnfjörð Bjarmason
2021-04-08 20:26 ` Sergey Organov
2021-04-08 22:13 ` SZEDER Gábor
2021-04-08 23:07 ` Sergey Organov
2021-04-07 22:56 ` [PATCH 8/9] doc/diff-options: document new --diff-merges features Sergey Organov
2021-04-07 22:56 ` [PATCH 9/9] doc/config: document log.diffMerges Sergey Organov
2021-04-10 17:16 ` [PATCH v1 0/5] git log: configurable default format for merge diffs Sergey Organov
2021-04-10 17:16 ` [PATCH v1 1/5] diff-merges: introduce --diff-merges=default Sergey Organov
2021-04-10 17:16 ` [PATCH v1 2/5] diff-merges: refactor set_diff_merges() Sergey Organov
2021-04-10 17:16 ` [PATCH v1 3/5] diff-merges: adapt -m to enable default diff format Sergey Organov
2021-04-10 17:16 ` [PATCH v1 4/5] diff-merges: introduce log.diffMerges config variable Sergey Organov
2021-04-10 17:16 ` [PATCH v1 5/5] doc/diff-options: document new --diff-merges features Sergey Organov
2021-04-11 16:13 ` [PATCH v1 0/5] git log: configurable default format for merge diffs Junio C Hamano
2021-04-11 18:04 ` Sergey Organov
2021-04-11 19:02 ` Junio C Hamano
2021-04-11 20:38 ` Sergey Organov
2021-04-11 21:58 ` Sergey Organov
2021-04-13 11:41 ` [PATCH v2 " Sergey Organov
2021-04-13 11:41 ` [PATCH v2 1/5] diff-merges: introduce --diff-merges=on Sergey Organov
2021-04-13 23:18 ` Junio C Hamano
2021-04-13 11:41 ` [PATCH v2 2/5] diff-merges: refactor set_diff_merges() Sergey Organov
2021-04-13 11:41 ` [PATCH v2 3/5] diff-merges: adapt -m to enable default diff format Sergey Organov
2021-04-13 11:41 ` [PATCH v2 4/5] diff-merges: introduce log.diffMerges config variable Sergey Organov
2021-04-15 20:21 ` Junio C Hamano
2021-04-16 8:30 ` Sergey Organov
2021-04-13 11:41 ` [PATCH v2 5/5] doc/diff-options: document new --diff-merges features 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=87v98xitjh.fsf@evledraar.gmail.com \
--to=avarab@gmail$(echo .)com \
--cc=felipe.contreras@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=newren@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=philipoakley@iee$(echo .)email \
--cc=sorganov@gmail$(echo .)com \
/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