From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 23B2220372 for ; Thu, 12 Oct 2017 15:12:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752044AbdJLPMK (ORCPT ); Thu, 12 Oct 2017 11:12:10 -0400 Received: from cloud.peff.net ([104.130.231.41]:51030 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751479AbdJLPMK (ORCPT ); Thu, 12 Oct 2017 11:12:10 -0400 Received: (qmail 19678 invoked by uid 109); 12 Oct 2017 15:12:09 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Thu, 12 Oct 2017 15:12:09 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 16381 invoked by uid 111); 12 Oct 2017 15:12:12 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.94) with SMTP; Thu, 12 Oct 2017 11:12:12 -0400 Authentication-Results: peff.net; auth=none Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Thu, 12 Oct 2017 11:12:07 -0400 Date: Thu, 12 Oct 2017 11:12:07 -0400 From: Jeff King To: Junio C Hamano Cc: Jonathan Nieder , git@vger.kernel.org Subject: Re: [PATCH 1/2] color: downgrade "always" to "auto" only for on-disk configuration Message-ID: <20171012151207.liri6qnqasihjg3l@sigill.intra.peff.net> References: <20171012021007.7441-1-gitster@pobox.com> <20171012021007.7441-2-gitster@pobox.com> <20171012044724.GD155740@aiede.mtv.corp.google.com> <20171012054049.GF155740@aiede.mtv.corp.google.com> <20171012130649.b4tmofbvdgkevmnn@sigill.intra.peff.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20171012130649.b4tmofbvdgkevmnn@sigill.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Thu, Oct 12, 2017 at 09:06:49AM -0400, Jeff King wrote: > > -- >8 -- > > From: Jonathan Nieder > > Subject: color: document that "git -c color.*=always" is a bit special > > Date: Wed, 11 Oct 2017 21:47:24 -0700 > > This looks reasonable to me to ship in v2.15. I assume we're going to > leave any "git --default-color=..." options to post-release, since we're > already in -rc1. Ah, I hadn't yet read your cover letter, since I wasn't on the cc for that. So yes, the overall plan seems OK to me. I do have a lingering reservation that the fact that: git -c color.ui=always add -p will break may come back to bite us. In particular, any such: git --default-color=always add -p will run into the same problem if it is respected by plumbing. But in theory we are free to have it not be so. Arguably we could do the same for "-c color.ui", which I guess leaves us an "out" to later fix up that case (my, the kludges are certainly piling up on this one). -Peff