summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-10 22:26:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-10 22:26:06 (GMT)
commite5f767554404592cf65e7c49b3594b195a324031 (patch)
treec94786f10cc5820f7526bd88cecde58940c94979
parent45c0c21eb96ce45f05ffbe8600adf6ac65086415 (diff)
parent5580b271af518bae30148edfd42cc8459d8da384 (diff)
downloadgit-e5f767554404592cf65e7c49b3594b195a324031.zip
git-e5f767554404592cf65e7c49b3594b195a324031.tar.gz
git-e5f767554404592cf65e7c49b3594b195a324031.tar.bz2
Merge branch 'jk/diff-compact-heuristic'
It turns out that the earlier effort to update the heuristics may want to use a bit more time to mature. Turn it off by default. * jk/diff-compact-heuristic: diff: disable compaction heuristic for now
-rw-r--r--Documentation/diff-config.txt5
-rw-r--r--Documentation/diff-options.txt7
-rw-r--r--diff.c2
3 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index edba565..d78cfc5 100644
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -170,6 +170,11 @@ diff.tool::
include::mergetools-diff.txt[]
+diff.compactionHeuristic::
+ Set this option to `true` to enable an experimental heuristic that
+ shifts the hunk boundary in an attempt to make the resulting
+ patch easier to read.
+
diff.algorithm::
Choose a diff algorithm. The variants are as follows:
+
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 3cb3015..d9ae681 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -63,6 +63,13 @@ ifndef::git-format-patch[]
Synonym for `-p --raw`.
endif::git-format-patch[]
+--compaction-heuristic::
+--no-compaction-heuristic::
+ These are to help debugging and tuning an experimental
+ heuristic (which is off by default) that shifts the hunk
+ boundary in an attempt to make the resulting patch easier
+ to read.
+
--minimal::
Spend extra time to make sure the smallest possible
diff is produced.
diff --git a/diff.c b/diff.c
index d3734d3..fa78fc1 100644
--- a/diff.c
+++ b/diff.c
@@ -26,7 +26,7 @@
#endif
static int diff_detect_rename_default;
-static int diff_compaction_heuristic = 1;
+static int diff_compaction_heuristic; /* experimental */
static int diff_rename_limit_default = 400;
static int diff_suppress_blank_empty;
static int diff_use_color_default = -1;