Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 6b4d1c52bbf1e3edf01dd67794bf221effc581a7..9337b81064bbdbe4e7f590830b458c48226c4a17 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -112,7 +112,7 @@ do
                } >"$actual" &&
                if test -f "$expect"
                then
-                       git diff "$expect" "$actual" &&
+                       test_cmp "$expect" "$actual" &&
                        rm -f "$actual"
                else
                        # this is to help developing new tests.
@@ -257,6 +257,7 @@ diff --patch-with-raw initial..side
 diff --patch-with-stat -r initial..side
 diff --patch-with-raw -r initial..side
 diff --name-status dir2 dir
+diff --no-index --name-status dir2 dir
 EOF
 
 test_done