From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] merge-ort: make informational messages from recursive merges clearer
Date: Tue, 1 Mar 2022 18:32:20 -0800 [thread overview]
Message-ID: <CABPp-BFgLfjLBEK96SLaLxoq6Nspse=FBgViKfiQPk4GaQadFQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqwnheuq79.fsf@gitster.g>
On Mon, Feb 28, 2022 at 10:44 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Junio C Hamano <gitster@pobox.com> writes:
>
> >> One other thing to note here, that I didn't notice until typing up this
> >> commit message, is that merge-recursive does not print any messages from
> >> the inner merges by default; the extra verbosity has to be requested.
> >> merge-ort currently has no verbosity controls and always prints these.
> >> We may also want to change that, but for now, just make the output
> >> clearer with these extra markings and indentation.
> >
> > Yup, I found that the messages on inner conflicts, especially when
> > they "cancel out" at the outer merge, are mostly noise that carries
> > very little useful information (by being noisy, the user gets a sense
> > of how complex the histories being merged are). Reducing the default
> > messaging level would probably be a good idea.
>
> Here is what I just had to scroll through to update 'next' by
> merging back 'master', only to grab the updates to the release
> notes. Needless to say, this would have been somewhat baffling
> if I didn't know to expect it.
>
> It would be good to squelch it before we hear another complaints
> from old-timer power users ;-)
I'll submit a patch soon.
>
> $ git merge -m 'Sync with master' --no-log master
> From inner merge: Auto-merging blame.c
> From inner merge: Auto-merging builtin/am.c
> From inner merge: Auto-merging builtin/blame.c
> From inner merge: Auto-merging builtin/clone.c
> From inner merge: Auto-merging builtin/clone.c
> From inner merge: Auto-merging builtin/commit.c
> From inner merge: Auto-merging builtin/fetch.c
> From inner merge: Auto-merging builtin/fetch.c
> From inner merge: Auto-merging builtin/grep.c
> From inner merge: Auto-merging builtin/hash-object.c
> From inner merge: Auto-merging builtin/log.c
> From inner merge: Auto-merging builtin/log.c
> From inner merge: Auto-merging builtin/pack-objects.c
> From inner merge: Auto-merging builtin/pull.c
> From inner merge: Auto-merging builtin/pull.c
> From inner merge: Auto-merging builtin/rebase.c
> From inner merge: Auto-merging builtin/rebase.c
> From inner merge: Auto-merging builtin/reflog.c
> From inner merge: CONFLICT (content): Merge conflict in builtin/reflog.c
> Auto-merging builtin/reflog.c
> From inner merge: Auto-merging builtin/reset.c
> From inner merge: Auto-merging builtin/sparse-checkout.c
> From inner merge: Auto-merging builtin/sparse-checkout.c
> From inner merge: Auto-merging builtin/submodule--helper.c
> From inner merge: Auto-merging builtin/submodule--helper.c
> From inner merge: CONFLICT (content): Merge conflict in builtin/submodule--helper.c
> Auto-merging builtin/submodule--helper.c
> From inner merge: Auto-merging builtin/worktree.c
> From inner merge: Auto-merging cache.h
> From inner merge: Auto-merging config.c
> From inner merge: Auto-merging config.h
> From inner merge: Auto-merging diff-merges.c
> From inner merge: Auto-merging diff.c
> From inner merge: Auto-merging git.c
> From inner merge: Auto-merging gpg-interface.c
> From inner merge: Auto-merging grep.c
> From inner merge: Auto-merging grep.c
> From inner merge: Auto-merging notes-merge.c
> From inner merge: Auto-merging object-name.c
> From inner merge: Auto-merging pack-bitmap-write.c
> From inner merge: Auto-merging parse-options.c
> From inner merge: CONFLICT (content): Merge conflict in parse-options.c
> From inner merge: Auto-merging parse-options.h
> From inner merge: CONFLICT (content): Merge conflict in parse-options.h
> From inner merge: Auto-merging refs.c
> From inner merge: Auto-merging revision.c
> From inner merge: Auto-merging sequencer.c
> From inner merge: Auto-merging sequencer.c
> From inner merge: Auto-merging sparse-index.c
> From inner merge: Auto-merging submodule-config.c
> From inner merge: Auto-merging t/t1091-sparse-checkout-builtin.sh
> From inner merge: CONFLICT (content): Merge conflict in t/t1091-sparse-checkout-builtin.sh
> Auto-merging t/t1091-sparse-checkout-builtin.sh
> From inner merge: Auto-merging t/t1512-rev-parse-disambiguation.sh
> From inner merge: Auto-merging t/t4202-log.sh
> From inner merge: Auto-merging t/t4202-log.sh
> From inner merge: Auto-merging t/t4202-log.sh
> From inner merge: Auto-merging t/t4202-log.sh
> From inner merge: Auto-merging t/t4202-log.sh
> From inner merge: Auto-merging t/t5316-pack-delta-depth.sh
> From inner merge: Auto-merging t/t6120-describe.sh
> From inner merge: Auto-merging t/t6120-describe.sh
> From inner merge: Auto-merging worktree.c
> Merge made by the 'ort' strategy.
> Documentation/RelNotes/2.36.0.txt | 29 +++++++++++++++++++++++++++++
> 1 file changed, 29 insertions(+)
>
>
next prev parent reply other threads:[~2022-03-02 2:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 6:38 [PATCH] merge-ort: make informational messages from recursive merges clearer Elijah Newren via GitGitGadget
2022-02-17 23:10 ` Junio C Hamano
2022-03-01 6:44 ` Junio C Hamano
2022-03-02 2:32 ` Elijah Newren [this message]
2022-03-02 4:21 ` Elijah Newren
2022-03-02 6:53 ` Junio C Hamano
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='CABPp-BFgLfjLBEK96SLaLxoq6Nspse=FBgViKfiQPk4GaQadFQ@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).