diff: enable indent heuristic by default

The feature was included in v2.11 (released 2016-11-29) and we got no
negative feedback. Quite the opposite, all feedback we got was positive.

Turn it on by default. Users who dislike the feature can turn it off
by setting diff.indentHeuristic (which also configures plumbing commands,
see prior patches).

The change to t/t4051-diff-function-context.sh is needed because the
heuristic shifts the changed hunk in the patch.  To get the same result
regardless of the heuristic configuration, we modify the test file
differently:  We insert a completely new line after line 2, instead of
simply duplicating it.

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff.c b/diff.c
index da96577ea87689a4f3b66ae8602eb8e83c84147b..2c47ccb4a79ccf5aacc922a089721f4551c5bf83 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -27,7 +27,7 @@
 #endif
 
 static int diff_detect_rename_default;
 #endif
 
 static int diff_detect_rename_default;

-static int diff_indent_heuristic; /* experimental */
+static int diff_indent_heuristic = 1;

 static int diff_rename_limit_default = 400;
 static int diff_suppress_blank_empty;
 static int diff_use_color_default = -1;
 static int diff_rename_limit_default = 400;
 static int diff_suppress_blank_empty;
 static int diff_use_color_default = -1;

diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
index 6154acb4569eb452f4e19a40ba40e19703ecca88..3e6b485ecba1a59e3d69edc3ac5a6f0f1d327bd3 100755 (executable)
--- a/t/t4051-diff-function-context.sh
+++ b/t/t4051-diff-function-context.sh
@@ -72,7 +72,8 @@ test_expect_success 'setup' '
 
        # overlap function context of 1st change and -u context of 2nd change
        grep -v "delete me from hello" <"$dir/hello.c" >file.c &&
 
        # overlap function context of 1st change and -u context of 2nd change
        grep -v "delete me from hello" <"$dir/hello.c" >file.c &&

-       sed 2p <"$dir/dummy.c" >>file.c &&
+       sed "2a\\
+            extra line" <"$dir/dummy.c" >>file.c &&

        commit_and_tag changed_hello_dummy file.c &&
 
        git checkout initial &&
        commit_and_tag changed_hello_dummy file.c &&
 
        git checkout initial &&

diff --git a/t/t4061-diff-indent.sh b/t/t4061-diff-indent.sh
index 13d3dc96a009755838c424ac9ade3ccfaba0a51d..2affd7a100996f93839eec682e4d7381e3ac0b2a 100755 (executable)
--- a/t/t4061-diff-indent.sh
+++ b/t/t4061-diff-indent.sh
@@ -152,26 +152,28 @@ test_expect_success 'prepare' '
        EOF
 '
 
        EOF
 '
 

+# --- diff tests ----------------------------------------------------------
+

 test_expect_success 'diff: ugly spaces' '
 test_expect_success 'diff: ugly spaces' '

-       git diff old new -- spaces.txt >out &&
+       git diff --no-indent-heuristic old new -- spaces.txt >out &&

        compare_diff spaces-expect out
 '
 
        compare_diff spaces-expect out
 '
 

+test_expect_success 'diff: --no-indent-heuristic overrides config' '
+       git -c diff.indentHeuristic=true diff --no-indent-heuristic old new -- spaces.txt >out2 &&
+       compare_diff spaces-expect out2
+'
+

 test_expect_success 'diff: nice spaces with --indent-heuristic' '
 test_expect_success 'diff: nice spaces with --indent-heuristic' '

-       git diff --indent-heuristic old new -- spaces.txt >out-compacted &&
+       git -c diff.indentHeuristic=false diff --indent-heuristic old new -- spaces.txt >out-compacted &&

        compare_diff spaces-compacted-expect out-compacted
 '
 
        compare_diff spaces-compacted-expect out-compacted
 '
 

-test_expect_success 'diff: nice spaces with diff.indentHeuristic' '
+test_expect_success 'diff: nice spaces with diff.indentHeuristic=true' '

        git -c diff.indentHeuristic=true diff old new -- spaces.txt >out-compacted2 &&
        compare_diff spaces-compacted-expect out-compacted2
 '
 
        git -c diff.indentHeuristic=true diff old new -- spaces.txt >out-compacted2 &&
        compare_diff spaces-compacted-expect out-compacted2
 '
 

-test_expect_success 'diff: --no-indent-heuristic overrides config' '
-       git -c diff.indentHeuristic=true diff --no-indent-heuristic old new -- spaces.txt >out2 &&
-       compare_diff spaces-expect out2
-'
-

 test_expect_success 'diff: --indent-heuristic with --patience' '
        git diff --indent-heuristic --patience old new -- spaces.txt >out-compacted3 &&
        compare_diff spaces-compacted-expect out-compacted3
 test_expect_success 'diff: --indent-heuristic with --patience' '
        git diff --indent-heuristic --patience old new -- spaces.txt >out-compacted3 &&
        compare_diff spaces-compacted-expect out-compacted3


@@ -183,7 +185,7 @@ test_expect_success 'diff: --indent-heuristic with --histogram' '
 '
 
 test_expect_success 'diff: ugly functions' '
 '
 
 test_expect_success 'diff: ugly functions' '

-       git diff old new -- functions.c >out &&
+       git diff --no-indent-heuristic old new -- functions.c >out &&

        compare_diff functions-expect out
 '
 
        compare_diff functions-expect out
 '
 


@@ -192,42 +194,73 @@ test_expect_success 'diff: nice functions with --indent-heuristic' '
        compare_diff functions-compacted-expect out-compacted
 '
 
        compare_diff functions-compacted-expect out-compacted
 '
 

-test_expect_success 'blame: ugly spaces' '
-       git blame old..new -- spaces.txt >out-blame &&
-       compare_blame spaces-expect out-blame
-'
+# --- blame tests ---------------------------------------------------------

 
 test_expect_success 'blame: nice spaces with --indent-heuristic' '
        git blame --indent-heuristic old..new -- spaces.txt >out-blame-compacted &&
        compare_blame spaces-compacted-expect out-blame-compacted
 '
 
 
 test_expect_success 'blame: nice spaces with --indent-heuristic' '
        git blame --indent-heuristic old..new -- spaces.txt >out-blame-compacted &&
        compare_blame spaces-compacted-expect out-blame-compacted
 '
 

-test_expect_success 'blame: nice spaces with diff.indentHeuristic' '
+test_expect_success 'blame: nice spaces with diff.indentHeuristic=true' '

        git -c diff.indentHeuristic=true blame old..new -- spaces.txt >out-blame-compacted2 &&
        compare_blame spaces-compacted-expect out-blame-compacted2
 '
 
        git -c diff.indentHeuristic=true blame old..new -- spaces.txt >out-blame-compacted2 &&
        compare_blame spaces-compacted-expect out-blame-compacted2
 '
 

+test_expect_success 'blame: ugly spaces with --no-indent-heuristic' '
+       git blame --no-indent-heuristic old..new -- spaces.txt >out-blame &&
+       compare_blame spaces-expect out-blame
+'
+
+test_expect_success 'blame: ugly spaces with diff.indentHeuristic=false' '
+       git -c diff.indentHeuristic=false blame old..new -- spaces.txt >out-blame2 &&
+       compare_blame spaces-expect out-blame2
+'
+

 test_expect_success 'blame: --no-indent-heuristic overrides config' '
 test_expect_success 'blame: --no-indent-heuristic overrides config' '

-       git -c diff.indentHeuristic=true blame --no-indent-heuristic old..new -- spaces.txt >out-blame2 &&
+       git -c diff.indentHeuristic=true blame --no-indent-heuristic old..new -- spaces.txt >out-blame3 &&

        git blame old..new -- spaces.txt >out-blame &&
        git blame old..new -- spaces.txt >out-blame &&

-       compare_blame spaces-expect out-blame2
+       compare_blame spaces-expect out-blame3

 '
 
 '
 

+test_expect_success 'blame: --indent-heuristic overrides config' '
+       git -c diff.indentHeuristic=false blame --indent-heuristic old..new -- spaces.txt >out-blame-compacted3 &&
+       compare_blame spaces-compacted-expect out-blame-compacted2
+'
+
+# --- diff-tree tests -----------------------------------------------------
+

 test_expect_success 'diff-tree: nice spaces with --indent-heuristic' '
        git diff-tree --indent-heuristic -p old new -- spaces.txt >out-diff-tree-compacted &&
        compare_diff spaces-compacted-expect out-diff-tree-compacted
 '
 
 test_expect_success 'diff-tree: nice spaces with --indent-heuristic' '
        git diff-tree --indent-heuristic -p old new -- spaces.txt >out-diff-tree-compacted &&
        compare_diff spaces-compacted-expect out-diff-tree-compacted
 '
 

-test_expect_success 'diff-tree: nice spaces with diff.indentHeuristic' '
+test_expect_success 'diff-tree: nice spaces with diff.indentHeuristic=true' '

        git -c diff.indentHeuristic=true diff-tree -p old new -- spaces.txt >out-diff-tree-compacted2 &&
        compare_diff spaces-compacted-expect out-diff-tree-compacted2
 '
 
        git -c diff.indentHeuristic=true diff-tree -p old new -- spaces.txt >out-diff-tree-compacted2 &&
        compare_diff spaces-compacted-expect out-diff-tree-compacted2
 '
 

-test_expect_success 'diff-tree: --no-indent-heuristic overrides config' '
-       git -c diff.indentHeuristic=true diff-tree --no-indent-heuristic -p old new -- spaces.txt >out-diff-tree &&
+test_expect_success 'diff-tree: ugly spaces with --no-indent-heuristic' '
+       git diff-tree --no-indent-heuristic -p old new -- spaces.txt >out-diff-tree &&

        compare_diff spaces-expect out-diff-tree
 '
 
        compare_diff spaces-expect out-diff-tree
 '
 

+test_expect_success 'diff-tree: ugly spaces with diff.indentHeuristic=false' '
+       git -c diff.indentHeuristic=false diff-tree -p old new -- spaces.txt >out-diff-tree2 &&
+       compare_diff spaces-expect out-diff-tree2
+'
+
+test_expect_success 'diff-tree: --indent-heuristic overrides config' '
+       git -c diff.indentHeuristic=false diff-tree --indent-heuristic -p old new -- spaces.txt >out-diff-tree-compacted3 &&
+       compare_diff spaces-compacted-expect out-diff-tree-compacted3
+'
+
+test_expect_success 'diff-tree: --no-indent-heuristic overrides config' '
+       git -c diff.indentHeuristic=true diff-tree --no-indent-heuristic -p old new -- spaces.txt >out-diff-tree3 &&
+       compare_diff spaces-expect out-diff-tree3
+'
+
+# --- diff-index tests ----------------------------------------------------
+

 test_expect_success 'diff-index: nice spaces with --indent-heuristic' '
        git checkout -B diff-index &&
        git reset --soft HEAD~ &&
 test_expect_success 'diff-index: nice spaces with --indent-heuristic' '
        git checkout -B diff-index &&
        git reset --soft HEAD~ &&


@@ -236,7 +269,7 @@ test_expect_success 'diff-index: nice spaces with --indent-heuristic' '
        git checkout -f master
 '
 
        git checkout -f master
 '
 

-test_expect_success 'diff-index: nice spaces with diff.indentHeuristic' '
+test_expect_success 'diff-index: nice spaces with diff.indentHeuristic=true' '

        git checkout -B diff-index &&
        git reset --soft HEAD~ &&
        git -c diff.indentHeuristic=true diff-index -p old -- spaces.txt >out-diff-index-compacted2 &&
        git checkout -B diff-index &&
        git reset --soft HEAD~ &&
        git -c diff.indentHeuristic=true diff-index -p old -- spaces.txt >out-diff-index-compacted2 &&


@@ -244,24 +277,50 @@ test_expect_success 'diff-index: nice spaces with diff.indentHeuristic' '
        git checkout -f master
 '
 
        git checkout -f master
 '
 

-test_expect_success 'diff-index: --no-indent-heuristic overrides config' '
+test_expect_success 'diff-index: ugly spaces with --no-indent-heuristic' '

        git checkout -B diff-index &&
        git reset --soft HEAD~ &&
        git checkout -B diff-index &&
        git reset --soft HEAD~ &&

-       git -c diff.indentHeuristic=true diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index &&
+       git diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index &&

        compare_diff spaces-expect out-diff-index &&
        git checkout -f master
 '
 
        compare_diff spaces-expect out-diff-index &&
        git checkout -f master
 '
 

-test_expect_success 'diff-files: nice spaces with diff.indentHeuristic' '
+test_expect_success 'diff-index: ugly spaces with diff.indentHeuristic=false' '
+       git checkout -B diff-index &&
+       git reset --soft HEAD~ &&
+       git -c diff.indentHeuristic=false diff-index -p old -- spaces.txt >out-diff-index2 &&
+       compare_diff spaces-expect out-diff-index2 &&
+       git checkout -f master
+'
+
+test_expect_success 'diff-index: --indent-heuristic overrides config' '
+       git checkout -B diff-index &&
+       git reset --soft HEAD~ &&
+       git -c diff.indentHeuristic=false diff-index --indent-heuristic -p old -- spaces.txt >out-diff-index-compacted3 &&
+       compare_diff spaces-compacted-expect out-diff-index-compacted3 &&
+       git checkout -f master
+'
+
+test_expect_success 'diff-index: --no-indent-heuristic overrides config' '
+       git checkout -B diff-index &&
+       git reset --soft HEAD~ &&
+       git -c diff.indentHeuristic=true diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index3 &&
+       compare_diff spaces-expect out-diff-index3 &&
+       git checkout -f master
+'
+
+# --- diff-files tests ----------------------------------------------------
+
+test_expect_success 'diff-files: nice spaces with --indent-heuristic' '

        git checkout -B diff-files &&
        git reset HEAD~ &&
        git checkout -B diff-files &&
        git reset HEAD~ &&

-       git -c diff.indentHeuristic=true diff-files -p spaces.txt >out-diff-files-raw &&
+       git diff-files --indent-heuristic -p spaces.txt >out-diff-files-raw &&

        grep -v index out-diff-files-raw >out-diff-files-compacted &&
        compare_diff spaces-compacted-expect out-diff-files-compacted &&
        git checkout -f master
 '
 
        grep -v index out-diff-files-raw >out-diff-files-compacted &&
        compare_diff spaces-compacted-expect out-diff-files-compacted &&
        git checkout -f master
 '
 

-test_expect_success 'diff-files: nice spaces with diff.indentHeuristic' '
+test_expect_success 'diff-files: nice spaces with diff.indentHeuristic=true' '

        git checkout -B diff-files &&
        git reset HEAD~ &&
        git -c diff.indentHeuristic=true diff-files -p spaces.txt >out-diff-files-raw2 &&
        git checkout -B diff-files &&
        git reset HEAD~ &&
        git -c diff.indentHeuristic=true diff-files -p spaces.txt >out-diff-files-raw2 &&


@@ -270,11 +329,38 @@ test_expect_success 'diff-files: nice spaces with diff.indentHeuristic' '
        git checkout -f master
 '
 
        git checkout -f master
 '
 

+test_expect_success 'diff-files: ugly spaces with --no-indent-heuristic' '
+       git checkout -B diff-files &&
+       git reset HEAD~ &&
+       git diff-files --no-indent-heuristic -p spaces.txt >out-diff-files-raw &&
+       grep -v index out-diff-files-raw >out-diff-files &&
+       compare_diff spaces-expect out-diff-files &&
+       git checkout -f master
+'
+
+test_expect_success 'diff-files: ugly spaces with diff.indentHeuristic=false' '
+       git checkout -B diff-files &&
+       git reset HEAD~ &&
+       git -c diff.indentHeuristic=false diff-files -p spaces.txt >out-diff-files-raw2 &&
+       grep -v index out-diff-files-raw2 >out-diff-files &&
+       compare_diff spaces-expect out-diff-files &&
+       git checkout -f master
+'
+
+test_expect_success 'diff-files: --indent-heuristic overrides config' '
+       git checkout -B diff-files &&
+       git reset HEAD~ &&
+       git -c diff.indentHeuristic=false diff-files --indent-heuristic -p spaces.txt >out-diff-files-raw3 &&
+       grep -v index out-diff-files-raw3 >out-diff-files-compacted &&
+       compare_diff spaces-compacted-expect out-diff-files-compacted &&
+       git checkout -f master
+'
+

 test_expect_success 'diff-files: --no-indent-heuristic overrides config' '
        git checkout -B diff-files &&
        git reset HEAD~ &&
 test_expect_success 'diff-files: --no-indent-heuristic overrides config' '
        git checkout -B diff-files &&
        git reset HEAD~ &&

-       git -c diff.indentHeuristic=true diff-files --no-indent-heuristic -p spaces.txt >out-diff-files-raw3 &&
-       grep -v index out-diff-files-raw3 >out-diff-files &&
+       git -c diff.indentHeuristic=true diff-files --no-indent-heuristic -p spaces.txt >out-diff-files-raw4 &&
+       grep -v index out-diff-files-raw4 >out-diff-files &&

        compare_diff spaces-expect out-diff-files &&
        git checkout -f master
 '
        compare_diff spaces-expect out-diff-files &&
        git checkout -f master
 '