Re: [ANNOUNCE] Git v2.11.0-rc0

From: Jeff King <peff@peff.net>
Date: Nov 1, 2016, 20:36 UTC
Message-ID: <20161101203637.3jr73wwpfal4brho@sigill.intra.peff.net>
In-Reply-To: <xmqq1sywrxxl.fsf@gitster.mtv.corp.google.com>

On Mon, Oct 31, 2016 at 02:49:42PM -0700, Junio C Hamano wrote:

Show 5 quoted lines

>  * Output from "git diff" can be made easier to read by selecting
>    which lines are common and which lines are added/deleted
>    intelligently when the lines before and after the changed section
>    are the same.  A command line option is added to help with the
>    experiment to find a good heuristics.

I'm not sure we ever resolved all the discussion around options and defaults here.

As of -rc0, we have both --indent-heuristic and --compaction-heuristic (along with matching config), and they are mutually exclusive.

In [1], Stefan suggested just replacing the compaction heuristic entirely with the new one (and you seemed to agree). If we're going to do that, it makes sense to do so before the release, so that we don't get stuck supporting --indent-heuristic forever.

We also discussed making this the default (e.g., in [2]). Did we want to do that before the release? If so, it would have been nice to flip it on during -rc0 to get more exposure, but perhaps -rc1 would not be too late. That's less critical than resolving the indent/compaction thing, though it potentially means we could rip out the config entirely and just leave the command-line option (as an escape hatch and debugging tool).

-Peff

[1] http://public-inbox.org/git/CAGZ79kaMSkRfkBng_Epq+2T_q--VkKQ6-m=M_jPkzeYcxuDKWA@mail.gmail.com/

[2] http://public-inbox.org/git/CA+P7+xrsz27Hhk12dwDrUEpn0L7R8F5z-XASS2JkoY6sqK7u5A@mail.gmail.com/