From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 09 Nov 2016 23:40:17 GMT
Subject: Re: 2.11.0-rc1 will not be tagged for a few days
Message-ID: <xmqqshr06x3y.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20161108004038.a7gyoe6wpucxjmvz@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> I think we also need to make a final decision on the indent/compaction
> heuristic naming. After reading Michael's [0], and the claim by you and
> Stefan that the "compaction" name was declared sufficiently experimental
> that we could later take it away, I'm inclined to follow this plan:
>
>   1. Ship v2.11 with what is in master; i.e., both compaction and indent
>      heuristics, triggerable by config or command line.
>
>   2. Post-v2.11, retire the compaction heuristic as a failed experiment.
>      Keeping it in v2.11 doesn't hurt anything (it was already
>      released), and lets us take our time coming up with and cooking the
>      patch.
>
>   3. Post-v2.11, flip the default for diff.indentHeuristic to "true".
>      Keep at least the command line option around indefinitely for
>      experimenting (i.e., "this diff looks funny; I wonder if
>      --no-indent-heuristic makes it look better").
>
>      Config option can either stay or go at that point. I have no
>      preference.
>
> The nice thing about that plan is it punts on merging any new code to
> post-v2.11. :)

OK, I can go with that plan.  Thanks for an outline.