submodule.c: migrate diff output to use emit_diff_symbol

diff --git a/t/t4061-diff-indent.sh b/t/t4061-diff-indent.sh
index 556450609b91873efc966d36f20b84f33425b4dc..2affd7a100996f93839eec682e4d7381e3ac0b2a 100755 (executable)
--- a/t/t4061-diff-indent.sh
+++ b/t/t4061-diff-indent.sh
@@ -152,26 +152,28 @@ test_expect_success 'prepare' '
        EOF
 '
 
+# --- diff tests ----------------------------------------------------------
+
 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
 '
 
+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' '
-       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
 '
 
-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
 '
 
-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
@@ -183,7 +185,7 @@ test_expect_success 'diff: --indent-heuristic with --histogram' '
 '
 
 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
 '
 
@@ -192,25 +194,175 @@ test_expect_success 'diff: nice functions with --indent-heuristic' '
        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 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
 '
 
+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' '
-       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 &&
-       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 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
+'
+
+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
+'
+
+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~ &&
+       git diff-index --indent-heuristic -p old -- spaces.txt >out-diff-index-compacted &&
+       compare_diff spaces-compacted-expect out-diff-index-compacted &&
+       git checkout -f master
+'
+
+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 &&
+       compare_diff spaces-compacted-expect out-diff-index-compacted2 &&
+       git checkout -f master
+'
+
+test_expect_success 'diff-index: ugly spaces with --no-indent-heuristic' '
+       git checkout -B diff-index &&
+       git reset --soft HEAD~ &&
+       git diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index &&
+       compare_diff spaces-expect out-diff-index &&
+       git checkout -f master
+'
+
+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 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
+'
+
+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 &&
+       grep -v index out-diff-files-raw2 >out-diff-files-compacted2 &&
+       compare_diff spaces-compacted-expect out-diff-files-compacted2 &&
+       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~ &&
+       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
 '
 
 test_done