* [PATCH] merge-ort: make informational messages from recursive merges clearer
@ 2022-02-17 6:38 Elijah Newren via GitGitGadget
2022-02-17 23:10 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Elijah Newren via GitGitGadget @ 2022-02-17 6:38 UTC (permalink / raw)
To: git; +Cc: Elijah Newren, Elijah Newren
From: Elijah Newren <newren@gmail.com>
This is another simple change with a long explanation...
merge-recursive and merge-ort are both based on the same recursive idea:
if there is more than one merge base, merge the merge bases (which may
require first merging the merge bases of the merges bases, etc.). The
depth of the inner merge is recorded via a variable called "call_depth",
which we'll bring up again later. Naturally, the inner merges
themselves can have conflicts and various messages generated about those
files.
merge-recursive immediately prints to stdout as it goes, at the risk of
printing multiple conflict notices for the same path separated far apart
from each other with many intervenining conflict notices for other paths
between them. And this is true even if there are no inner merges
involved. An example of this was given in [1] and apparently caused
some confusion:
CONFLICT (rename/add): Rename A->B in HEAD. B added in otherbranch
...dozens of conflicts for OTHER paths...
CONFLICT (content): Merge conflicts in B
In contrast, merge-ort collects messages and stores them by path so that
it can print them grouped by path. Thus, the same case handled by
merge-ort would have output of the form:
CONFLICT (rename/add): Rename A->B in HEAD. B added in otherbranch
CONFLICT (content): Merge conflicts in B
...dozens of conflicts for OTHER paths...
This is generally helpful, but does make a separate bug more
problematic. In particular, while merge-recursive might report the
following for a recursive merge:
Auto-merging dir.c
Auto-merging midx.c
CONFLICT (content): Merge conflict in midx.c
Auto-merging diff.c
Auto-merging dir.c
CONFLICT (content): Merge conflict in dir.c
merge-ort would instead report:
Auto-merging diff.c
Auto-merging dir.c
Auto-merging dir.c
CONFLICT (content): Merge conflict in dir.c
Auto-merging midx.c
CONFLICT (content): Merge conflict in midx.c
The fact that messages for the same file are together is probably
helpful in general, but with the indentation missing for the inner
merge it unfortunately serves to confuse. This probably would lead
users to wonder:
* Why is Git reporting that "dir.c" is being merged twice?
* If midx.c has conflicts, why do I not see any when I open up the
file and why are no conflicts shown in the index?
Fix this output confusion by changing the output to clearly
differentiate the messages for outer merges from the ones for inner
merges, changing the above output from merge-ort to:
Auto-merging diff.c
From inner merge: Auto-merging dir.c
Auto-merging dir.c
CONFLICT (content): Merge conflict in dir.c
From inner merge: Auto-merging midx.c
From inner merge: CONFLICT (content): Merge conflict in midx.c
(Note: the number of spaces after the 'From inner merge:' is
2*call_depth).
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.
[1] https://lore.kernel.org/git/CAGyf7-He4in8JWUh9dpAwvoPkQz9hr8nCBpxOxhZEd8+jtqTpg@mail.gmail.com/
Signed-off-by: Elijah Newren <newren@gmail.com>
---
merge-ort: make informational messages from recursive merges clearer
Sorry for any confusion caused by this bug (though I'm surprised no one
else reported it).
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1121%2Fnewren%2Fmerge-ort-clearer-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1121/newren/merge-ort-clearer-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1121
merge-ort.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/merge-ort.c b/merge-ort.c
index d85b1cd99e9..55decb2587e 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -651,6 +651,11 @@ static void path_msg(struct merge_options *opt,
dest = (opt->record_conflict_msgs_as_headers ? &tmp : sb);
va_start(ap, fmt);
+ if (opt->priv->call_depth) {
+ strbuf_addchars(dest, ' ', 2);
+ strbuf_addstr(dest, "From inner merge:");
+ strbuf_addchars(dest, ' ', opt->priv->call_depth * 2);
+ }
strbuf_vaddf(dest, fmt, ap);
va_end(ap);
base-commit: 45fe28c951c3e70666ee4ef8379772851a8e4d32
--
gitgitgadget
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] merge-ort: make informational messages from recursive merges clearer
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
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2022-02-17 23:10 UTC (permalink / raw)
To: Elijah Newren via GitGitGadget; +Cc: git, Elijah Newren
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Elijah Newren <newren@gmail.com>
>
> This is another simple change with a long explanation...
>
> merge-recursive and merge-ort are both based on the same recursive idea:
> if there is more than one merge base, merge the merge bases (which may
> require first merging the merge bases of the merges bases, etc.). The
> depth of the inner merge is recorded via a variable called "call_depth",
> which we'll bring up again later. Naturally, the inner merges
> themselves can have conflicts and various messages generated about those
> files.
>
> merge-recursive immediately prints to stdout as it goes, at the risk of
> printing multiple conflict notices for the same path separated far apart
> from each other with many intervenining conflict notices for other paths
> between them. And this is true even if there are no inner merges
> involved. An example of this was given in [1] and apparently caused
> some confusion:
>
> CONFLICT (rename/add): Rename A->B in HEAD. B added in otherbranch
> ...dozens of conflicts for OTHER paths...
> CONFLICT (content): Merge conflicts in B
>
> In contrast, merge-ort collects messages and stores them by path so that
> it can print them grouped by path. Thus, the same case handled by
> merge-ort would have output of the form:
>
> CONFLICT (rename/add): Rename A->B in HEAD. B added in otherbranch
> CONFLICT (content): Merge conflicts in B
> ...dozens of conflicts for OTHER paths...
>
> This is generally helpful, but does make a separate bug more
> problematic. In particular, while merge-recursive might report the
> following for a recursive merge:
>
> Auto-merging dir.c
> Auto-merging midx.c
> CONFLICT (content): Merge conflict in midx.c
> Auto-merging diff.c
> Auto-merging dir.c
> CONFLICT (content): Merge conflict in dir.c
>
> merge-ort would instead report:
>
> Auto-merging diff.c
> Auto-merging dir.c
> Auto-merging dir.c
> CONFLICT (content): Merge conflict in dir.c
> Auto-merging midx.c
> CONFLICT (content): Merge conflict in midx.c
>
> The fact that messages for the same file are together is probably
> helpful in general, but with the indentation missing for the inner
> merge it unfortunately serves to confuse. This probably would lead
> users to wonder:
>
> * Why is Git reporting that "dir.c" is being merged twice?
> * If midx.c has conflicts, why do I not see any when I open up the
> file and why are no conflicts shown in the index?
>
> Fix this output confusion by changing the output to clearly
> differentiate the messages for outer merges from the ones for inner
> merges, changing the above output from merge-ort to:
>
> Auto-merging diff.c
> From inner merge: Auto-merging dir.c
> Auto-merging dir.c
> CONFLICT (content): Merge conflict in dir.c
> From inner merge: Auto-merging midx.c
> From inner merge: CONFLICT (content): Merge conflict in midx.c
>
> (Note: the number of spaces after the 'From inner merge:' is
> 2*call_depth).
So "From inner merge: " label is what we get extra, compared to the
recursive one that just gives deeper leading-space indentation?
> 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.
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1121%2Fnewren%2Fmerge-ort-clearer-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1121/newren/merge-ort-clearer-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/1121
>
> merge-ort.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/merge-ort.c b/merge-ort.c
> index d85b1cd99e9..55decb2587e 100644
> --- a/merge-ort.c
> +++ b/merge-ort.c
> @@ -651,6 +651,11 @@ static void path_msg(struct merge_options *opt,
> dest = (opt->record_conflict_msgs_as_headers ? &tmp : sb);
>
> va_start(ap, fmt);
> + if (opt->priv->call_depth) {
> + strbuf_addchars(dest, ' ', 2);
> + strbuf_addstr(dest, "From inner merge:");
> + strbuf_addchars(dest, ' ', opt->priv->call_depth * 2);
I am unsure if the long label adds much value, but I am perfectly OK
tostart from more verbose and see if people complain (or not). This
is for human consumption and not meant to be machine parseable so we
can iterate.
Will queue. Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] merge-ort: make informational messages from recursive merges clearer
2022-02-17 23:10 ` Junio C Hamano
@ 2022-03-01 6:44 ` Junio C Hamano
2022-03-02 2:32 ` Elijah Newren
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2022-03-01 6:44 UTC (permalink / raw)
To: Elijah Newren via GitGitGadget; +Cc: git, Elijah Newren
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 ;-)
$ 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(+)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] merge-ort: make informational messages from recursive merges clearer
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
0 siblings, 2 replies; 6+ messages in thread
From: Elijah Newren @ 2022-03-02 2:32 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Elijah Newren via GitGitGadget, Git Mailing List
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(+)
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] merge-ort: make informational messages from recursive merges clearer
2022-03-02 2:32 ` Elijah Newren
@ 2022-03-02 4:21 ` Elijah Newren
2022-03-02 6:53 ` Junio C Hamano
1 sibling, 0 replies; 6+ messages in thread
From: Elijah Newren @ 2022-03-02 4:21 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Elijah Newren via GitGitGadget, Git Mailing List
On Tue, Mar 1, 2022 at 6:32 PM Elijah Newren <newren@gmail.com> wrote:
>
> 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.
https://lore.kernel.org/git/pull.1167.git.1646194761463.gitgitgadget@gmail.com/,
which would drop all the "From inner merge:" lines below.
>
> >
> > $ 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(+)
> >
> >
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] merge-ort: make informational messages from recursive merges clearer
2022-03-02 2:32 ` Elijah Newren
2022-03-02 4:21 ` Elijah Newren
@ 2022-03-02 6:53 ` Junio C Hamano
1 sibling, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2022-03-02 6:53 UTC (permalink / raw)
To: Elijah Newren; +Cc: Elijah Newren via GitGitGadget, Git Mailing List
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-03-02 6:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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).