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 v1 0/5] git log: configurable default format for merge diffs
Date: Sun, 11 Apr 2021 21:04:30 +0300 [thread overview]
Message-ID: <87wnt84s0h.fsf@osv.gnss.ru> (raw)
In-Reply-To: <xmqqsg3whka6.fsf@gitster.g> (Junio C. Hamano's message of "Sun, 11 Apr 2021 09:13:05 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> Sergey Organov <sorganov@gmail•com> writes:
>
>> These patches introduce capability to configure the default format of
>> output of diffs for merge commits by means of new log.diffMerges
>> configuration variable. The default format is then used by -m,
>> --diff-merges=m, and new --diff-merges=default options.
>>
>> In particular,
>>
>> git config log.diffMerges first-parent
>>
>> will change -m option format from "separate" to "first-parent" that
>> will in turn cause, say,
>>
>> git show -m <merge_commit>
>>
>> to output diff to the first parent only, instead of appending
>> typically large and surprising diff to the second parent at the end of
>> the output.
>
> I think that it is a good goal to free a short-and-sweet "-m" from
> getting tied forever to the current "two-tree diff for each of the
> parent" (aka "separate"), and a configuration to change what the
> "-m" option means would be a good approach to do so. It would help
> the interactive use by human end-users, which is the point of having
> short-and-sweet options. Existing scripts may depend on the current
> behaviour, so the configuration cannot be introduced right away, but
> over time they can be migrated to use the longer and more explicit
> option "--diff-merges=separate".
Yep, that's exactly the plan I have in mind.
To tell the truth, I hope there are no scripts that use "git log -m -p",
or "git show -m", but I do want to be on the safe side with it anyway,
and then sometime in the future maybe we will be safe to change
configuration default.
>
> But I do not see much point in adding the "--diff-merges=default".
> Who is the target audience? Certainly not scripts that want to
> avoid depending on the 'default' that can be different and easily
> vary per user.
There are 2 reasons to have "default":
1. --diff-merges=default and -m are not exact synonyms: unlike -m,
--diff-merges=default (similar to other --diff-merges options)
immediately enables diff output for merges, without -p, thus, for
example, allowing to output diffs for merge commits only.
The exact synonyms are rather --diff-merges=m and --diff-merges=default,
and then we get to the next reason:
2. We have descriptive long name for every other option, and it'd be an
exception if we'd have none for --diff-merges=m. In fact, it's
--diff-merges=m that could have been removed, but it'd break resemblance
with --cc and -c that both do have their --diff-merges=cc and
--diff-merges=c counterparts.
Overall, having "default" has both functional and consistency merits.
> Or is the plan to deprecate and remove the short-and-sweet "-m"
> option and standardize on "--diff-merges=<style>"? If so, such a
> design makes sense from pureness and completeness standpoint, but I
> am not sure if that is a good design for practical use.
No, what I have in mind is resurrection of -m as more useful option, not
removing it.
Thanks,
-- Sergey Organov
next prev parent reply other threads:[~2021-04-11 18:04 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 [this message]
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=87wnt84s0h.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