]> git.ipfire.org Git - thirdparty/git.git/commit - diff.c
xdiff: implement empty line chunk heuristic
authorStefan Beller <sbeller@google.com>
Tue, 19 Apr 2016 15:21:30 +0000 (08:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Apr 2016 17:53:34 +0000 (10:53 -0700)
commitd634d61ed6c5f19948937012b5e3a0ed2d631d3f
treef5c443c8ae8a4def49ffd7f147ccc82ab1420805
parent92e5b62fec0e9b647429e8d3736c571c434dd375
xdiff: implement empty line chunk heuristic

In order to produce the smallest possible diff and combine several diff
hunks together, we implement a heuristic from GNU Diff which moves diff
hunks forward as far as possible when we find common context above and
below a diff hunk. This sometimes produces less readable diffs when
writing C, Shell, or other programming languages, ie:

...
 /*
+ *
+ *
+ */
+
+/*
...

instead of the more readable equivalent of

...
+/*
+ *
+ *
+ */
+
 /*
...

Implement the following heuristic to (optionally) produce the desired
output.

  If there are diff chunks which can be shifted around, shift each hunk
  such that the last common empty line is below the chunk with the rest
  of the context above.

This heuristic appears to resolve the above example and several other
common issues without producing significantly weird results. However, as
with any heuristic it is not really known whether this will always be
more optimal. Thus, it can be disabled via diff.compactionHeuristic.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/diff-config.txt
Documentation/diff-options.txt
diff.c
xdiff/xdiff.h
xdiff/xdiffi.c