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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html