Re: [PATCH] merge-recursive: do not report the resulting tree object name

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

This is a smallish example:

        $ git merge jc/merge-base
     1	Trying really trivial in-index merge...
     2	fatal: Merge requires file-level merging
     3	Nope.
     4	Merging HEAD with jc/merge-base
     5	Merging:
     6	b60daf0 Make git-prune-packed a bit more chatty.
     7	5b75a55 Teach "git-merge-base --check-ancestry" about refs.
     8	found 1 common ancestor(s):
     9	1c23d79 Don't die in git-http-fetch when fetching packs.
    10	Auto-merging Makefile
    11	Auto-merging builtin-branch.c
    12	Auto-merging builtin-reflog.c
    13	CONFLICT (content): Merge conflict in builtin-reflog.c
    14	Auto-merging builtin.h
    15	Auto-merging git.c
    16	Removing merge-base.c
    17	Resolved 'builtin-reflog.c' using previous resolution.
    18	Automatic merge failed; fix conflicts and then commit the result.

Among these, I think lines 2..3 are somewhat confusing but I am used to seeing them and do not mind them too much.

Lines 4..9 do not have any real information that helps the end user (even though it would be a very good debugging aid for merge-recursive developers).

Lines 10..16 are useful, but I think we probably should show them only for outermost merges.

An multi-base example:

        $ git merge 82560983997c961d9deafe0074b787c8484c2e1d
     1	Merging HEAD with 82560983997c961d9deafe0074b787c8484c2e1d
     2	Merging:
     3	9ee93dc Merge for-each-ref to sync gitweb fully with 'next'...
     4	8256098 gitweb: Print commit message without title in commi...
     5	found 2 common ancestor(s):
     6	b2d3476 Gitweb - provide site headers and footers
     7	1259404 Merge branch 'maint'
     8	  Merging:
     9	  b2d3476 Gitweb - provide site headers and footers
    10	  1259404 Merge branch 'maint'
    11	  found 1 common ancestor(s):
    12	  128eead gitweb: document webserver configuration for comm...
    13	  Auto-merging Makefile
    14	  Auto-merging gitweb/gitweb.perl
    15	  CONFLICT (content): Merge conflict in gitweb/gitweb.perl
    16	Auto-merging gitweb/gitweb.perl
    17	Merge made by recursive.
    18	 gitweb/gitweb.css  |    2 +
    19	 gitweb/gitweb.perl |  165 ++++++++++++++++++++++++++++++++...
    20	 2 files changed, 117 insertions(+), 50 deletions(-)

I do not think we need to show 1..15 at all, perhaps without "export GIT_MERGE_BASE_DEBUG=YesPlease".