From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.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, 01 Mar 2022 22:53:21 -0800 [thread overview]
Message-ID: <xmqqk0dconfi.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BFgLfjLBEK96SLaLxoq6Nspse=FBgViKfiQPk4GaQadFQ@mail.gmail.com> (Elijah Newren's message of "Tue, 1 Mar 2022 18:32:20 -0800")
Elijah Newren <newren@gmail.com> writes:
>> > 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
Thanks. I think "From inner merge: " can be removed even when we
emit these messages, as the indentation would make it clear that the
indented ones are different from the outermost ones.
prev parent reply other threads:[~2022-03-02 6:53 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
2022-03-02 4:21 ` Elijah Newren
2022-03-02 6:53 ` Junio C Hamano [this message]
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=xmqqk0dconfi.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.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).