Merge branch 'jk/maint-config-alias-fix' into maint

diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh
index 4ea42e00dad9bf15e221e6eac5d91748cb0a07e7..083f62d1d6bb6bfd908b0a03db1a47f80071ef91 100755 (executable)
--- a/t/t4020-diff-external.sh
+++ b/t/t4020-diff-external.sh
@@ -4,8 +4,6 @@ test_description='external diff interface test'
 
 . ./test-lib.sh
 
-_z40=0000000000000000000000000000000000000000
-
 test_expect_success setup '
 
        test_tick &&
@@ -166,7 +164,7 @@ test_expect_success 'diff --cached' '
        git update-index --assume-unchanged file &&
        echo second >file &&
        git diff --cached >actual &&
-       test_cmp ../t4020/diff.NUL actual
+       test_cmp "$TEST_DIRECTORY"/t4020/diff.NUL actual
 '
 
 test_done