On Tue, Nov 01, 2016 at 01:56:34PM -0700, Junio C Hamano wrote: > > 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 thought the plan mentioned in the mail I linked was to keep the indent heuristic, but simply _call_ it the compaction heuristic. IOW, to swap out the implementation under the hood for something we know is better. We've already released a version with --compaction-heuristic, so we are stuck keeping it forever either way. > 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. So the matching variant of that plan would be to drop the internals of compaction-heuristic, swap in the new heuristic instead, and then drop all of the --indent-heuristic. It remains off by default, but we may flip that in a later release. -Peff
