From: Sergey Organov <sorganov@gmail•com>
To: Junio C Hamano <gitster@pobox•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: Fri, 16 Apr 2021 11:30:38 +0300 [thread overview]
Message-ID: <87im4mbpht.fsf@osv.gnss.ru> (raw)
In-Reply-To: <xmqqpmyvpacr.fsf@gitster.g> (Junio C. Hamano's message of "Thu, 15 Apr 2021 13:21:40 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> 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?
To me these completion tests don't work as expected unless I "make
install; make test" resulting Git version rather than simply "make
tests".
I have been told this by SZEDER Gábor <szeder.dev@gmail•com> earlier in
the discussion of these patch series:
<quote>
It might be related to a bug in the build process that doesn't update
that auto-generated list of supported configuration variables after
e.g. 'Documentation/config/log.txt' was modified; see a proposed fix
at:
https://public-inbox.org/git/20210408212915.3060286-1-szeder.dev@gmail.com/
</quote>
Looks like that's it?
For reference, I've checked all the commits in the series with this
script:
#!/usr/bin/env bash
while read -r rev; do
git checkout "$rev"
make clean > /dev/null 2>&1
commit=$(git log --oneline --abbrev=6 -n1 $rev)
echo "Make $commit"
if ! make prefix=$HOME/git -j8 all >/dev/null 2>&1; then
>&2 echo "Make for commit $rev failed"
exit 1
fi
echo "Install $commit"
if ! make prefix=$HOME/git install>/dev/null 2>&1; then
>&2 echo "Install for commit $rev failed"
exit 2
fi
echo "Test $commit"
if ! make test; then
>&2 echo "Test for commit $rev failed"
exit 3
fi
done < <(git rev-list --reverse "$1")
-- Sergey Organov
next prev parent reply other threads:[~2021-04-16 8:30 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
2021-04-16 8:30 ` Sergey Organov [this message]
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=87im4mbpht.fsf@osv.gnss.ru \
--to=sorganov@gmail$(echo .)com \
--cc=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 \
/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