> Currently it's an "opt in" knob, so this doesn't make sense to me. +static int diff_compaction_heuristic = 1; It's rather an opt-out knob going by the current origin/jk/diff-compact-heuristic > If > we remove the entire knob as is, we can always (fairly easily) add it > back. I would keep the code inside xdiff as a knob, but set it to > enable default so that the user config has no knob at the top level but > the xdiff machinery does (this making a "disable" be relatively small > patch). When writing my reply, I thought about people using Git from a binary distribution with little to no admin rights. They want to have an emergency knob to disable this thing, but cannot patch/recompile Git. If you can patch and compile your version of Git, then reverting is easy, so in that case Junios patch looks good to me. Thanks, Stefan > > Thanks, > Jake -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html