Stefan Beller <sbeller@xxxxxxxxxx> writes: >> OK, so perhaps either of you two can do a final version people can >> start having fun with? > > Here we go. I squashed in your patch, although with a minor change: > > - if ((flags & XDF_SHORTEST_LINE_HEURISTIC)) { > + if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) { > > We did not need that in the "shortest line" heuristic as we know > a line with the shortest line length must exist. We do not know about > empty lines though. Makes sense. The last hunk of $ git show 9614b8dcf -- update-cache.c gives an unexpected result without "&& blank_lines" above. Lack of "&& blank_lines" happens to make the result slightly easier to read, but at the cost of having an extra line in the hunk. Thanks. -- 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