From: Jeff King <peff@peff.net>
To: Bryan Turner <bturner@atlassian.com>
Cc: Junio C Hamano <gitster@pobox.com>, Git Users <git@vger.kernel.org>
Subject: Re: [ANNOUNCE] Git v2.4.0-rc2
Date: Wed, 15 Apr 2015 22:22:16 -0400 [thread overview]
Message-ID: <20150416022216.GA30991@peff.net> (raw)
In-Reply-To: <CAGyf7-H_Njn8poGKnvgjq+0bKhHfs7S7qaFkDHsqa4NVUjt4EA@mail.gmail.com>
[side note: please trim your quoted material when doing inline quoting]
On Thu, Apr 16, 2015 at 12:05:57PM +1000, Bryan Turner wrote:
> > merge: pass verbosity flag down to merge-recursive
>
> I'm pretty confident this change is working as intended, but the
> intended change is causing a regression in behavior for me. I'll
> readily admit that my workflow is probably wrong, but I thought
> perhaps it would be worth surfacing.
>
> [...]
> If the goal of passing the verbosity flag down was to fix git merge
> --quiet, should the "Automatic merge failed" line also be omitted? But
> if that line should _stay_, wouldn't it be better for the "CONFLICT"
> lines to also stay?
Yeah, I feared there might be fallouts like this. We are somewhat
blindly passing down the "--quiet" flag without doing a careful audit of
the severity levels in merge-recursive. Potentially we would want a few
levels of verbosity:
-2: totally silent (-q -q)
-1: silence chat, mention important errors like CONFLICT markers (-q)
0: current defaults
1: more verbosity (-v, what is currently level "3", I guess?)
>1: and so on with more "-v"; I don't even know what levels are used
That's off the top of my head. I think it really needs somebody to look
through and categorize all of the messages generated by merge-recursive.
In the meantime, unless somebody is planning to jump on this topic
immediately (I am not), I think we can revert 2bf15a3330a from master.
It's definitely fixing _a_ problem, but it's one we've lived with for
many years already.
-Peff
next prev parent reply other threads:[~2015-04-16 2:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-14 21:48 [ANNOUNCE] Git v2.4.0-rc2 Junio C Hamano
2015-04-16 2:05 ` Bryan Turner
2015-04-16 2:22 ` Jeff King [this message]
2015-04-16 4:34 ` Randall S. Becker
2015-04-16 5: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=20150416022216.GA30991@peff.net \
--to=peff@peff.net \
--cc=bturner@atlassian.com \
--cc=git@vger.kernel.org \
--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).