From: "Randall S. Becker" <rsbecker@nexbridge.com>
To: "'Jeff King'" <peff@peff.net>, "'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: Thu, 16 Apr 2015 00:34:12 -0400 [thread overview]
Message-ID: <001601d077fe$97288cc0$c579a640$@nexbridge.com> (raw)
In-Reply-To: <20150416022216.GA30991@peff.net>
On April 15, 2015 10:22 PM Jeff King wrote:
> Sent: April 15, 2015 10:22 PM
> To: Bryan Turner
> Cc: Junio C Hamano; Git Users
> Subject: Re: [ANNOUNCE] Git v2.4.0-rc2
>
> [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
As a more (slightly nano) enhanced suggestion, please consider adding something along the lines of multiple occurrences of -v:{module=level} to specifically show messages from things like git-upload-pak, specifically passing verbosity down to selective components. I do not know whether there is value in the git subject domain for this, but I'm bringing it up since I have had specific issues with that part of the code while porting on my platform and I would have liked to be able to ignore verbosity from everything other than that module while diagnosing issues. Having this available to test suites would be a bit more useful as well.
Cheers,
Randall
-- Brief whoami: NonStop&UNIX developer since approximately UNIX(421664400)/NonStop(211288444200000000)
-- In my real life, I talk too much.
next prev parent reply other threads:[~2015-04-16 4:34 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
2015-04-16 4:34 ` Randall S. Becker [this message]
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='001601d077fe$97288cc0$c579a640$@nexbridge.com' \
--to=rsbecker@nexbridge.com \
--cc=bturner@atlassian.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).