Thread (6 messages) flat view 6 messages, 4 authors, 2016-06-16

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

From: "Keller, Jacob E" <jacob.e.keller@intel.com>
Date: 2016-06-16 02:19:05

Possibly related (same subject, not in this thread)

On Fri, 2016-04-29 at 15:44 -0700, Stefan Beller wrote:
quoted
Currently it's an "opt in" knob, so this doesn't make sense to me.
+static int diff_compaction_heuristic = 1;
Oops didn't know we'd made it default at some point. (all my versions
had it disabled by default)
It's rather an opt-out knob going by the current
origin/jk/diff-compact-heuristic
Yea in that case, we could keep it.
quoted
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
True. I think the chances that it needs such a thing are quite minor,
and if an undocumented knob gets exposed it would have to become
documented and maintained, so I'd prefer to avoid it. Given that the
risk is pretty small I think that's ok.

Thanks,
Jake
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help