From: Junio C Hamano <gitster@pobox.com>
To: Sergey Organov <sorganov@gmail.com>
Cc: "Jeff King" <peff@peff.net>,
"Philip Oakley" <philipoakley@iee.email>,
"Elijah Newren" <newren@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH v2 4/5] diff-merges: introduce log.diffMerges config variable
Date: Thu, 15 Apr 2021 13:21:40 -0700 [thread overview]
Message-ID: <xmqqpmyvpacr.fsf@gitster.g> (raw)
In-Reply-To: <20210413114118.25693-5-sorganov@gmail.com> (Sergey Organov's message of "Tue, 13 Apr 2021 14:41:17 +0300")
Sergey Organov <sorganov@gmail.com> writes:
> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
> index 04ce884ef5ac..4d732d6d4f81 100755
> --- a/t/t9902-completion.sh
> +++ b/t/t9902-completion.sh
> @@ -2306,6 +2306,7 @@ test_expect_success 'git config - variable name' '
> test_completion "git config log.d" <<-\EOF
> log.date Z
> log.decorate Z
> + log.diffMerges Z
> EOF
> '
>
> @@ -2327,6 +2328,7 @@ test_expect_success 'git -c - variable name' '
> test_completion "git -c log.d" <<-\EOF
> log.date=Z
> log.decorate=Z
> + log.diffMerges=Z
> EOF
> '
>
> @@ -2348,6 +2350,7 @@ test_expect_success 'git clone --config= - variable name' '
> test_completion "git clone --config=log.d" <<-\EOF
> log.date=Z
> log.decorate=Z
> + log.diffMerges=Z
> EOF
> '
$ sh ./t9902-completion.sh -i -v
ends like the attached. Is there a prerequisite patch I am missing,
or something?
ok 195 - git config - section
expecting success of 9902.196 'git config - variable name':
test_completion "git config log.d" <<-\EOF
log.date Z
log.decorate Z
log.diffMerges Z
EOF
--- expected 2021-04-15 20:20:09.652861741 +0000
+++ out_sorted 2021-04-15 20:20:09.660862400 +0000
@@ -1,3 +1,2 @@
log.date
log.decorate
-log.diffMerges
not ok 196 - git config - variable name
#
# test_completion "git config log.d" <<-\EOF
# log.date Z
# log.decorate Z
# log.diffMerges Z
# EOF
#
:
next prev parent reply other threads:[~2021-04-15 20:22 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
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 [this message]
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
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=xmqqpmyvpacr.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
--cc=sorganov@gmail.com \
--subject='Re: [PATCH v2 4/5] diff-merges: introduce log.diffMerges config variable' \
/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).