From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: [ANNOUNCE] Git v2.4.0-rc2 Date: Wed, 15 Apr 2015 22:22:16 -0400 Message-ID: <20150416022216.GA30991@peff.net> References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Junio C Hamano , Git Users To: Bryan Turner X-From: git-owner@vger.kernel.org Thu Apr 16 04:22:25 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YiZRg-0005li-JS for gcvg-git-2@plane.gmane.org; Thu, 16 Apr 2015 04:22:24 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752919AbbDPCWT (ORCPT ); Wed, 15 Apr 2015 22:22:19 -0400 Received: from cloud.peff.net ([50.56.180.127]:45999 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752508AbbDPCWT (ORCPT ); Wed, 15 Apr 2015 22:22:19 -0400 Received: (qmail 5494 invoked by uid 102); 16 Apr 2015 02:22:19 -0000 Received: from Unknown (HELO peff.net) (10.0.1.1) by cloud.peff.net (qpsmtpd/0.84) with SMTP; Wed, 15 Apr 2015 21:22:19 -0500 Received: (qmail 20571 invoked by uid 107); 16 Apr 2015 02:22:42 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.84) with SMTP; Wed, 15 Apr 2015 22:22:42 -0400 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Wed, 15 Apr 2015 22:22:16 -0400 Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: [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