Re: [ANNOUNCE] Git v2.11.0-rc0

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 1, 2016, 20:56 UTC
Message-ID: <xmqqlgx2or5p.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20161101203637.3jr73wwpfal4brho@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 18 quoted lines

> On Mon, Oct 31, 2016 at 02:49:42PM -0700, Junio C Hamano wrote:
>
>>  * 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.

You meant "compaction" in the last part? I think it is probably a good idea.

I'd vote for just removing compaction-heuristic while keeping the indent-heuristic with experimental label and knobs and keeping it off by default for a while.

Thanks for bringing it up.