t4008: abstract away SHA-1-specific constants

diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh
index 044620186d135fe5caeb9376665305af1c8acbe5..49d3f54b298c6519cf83dd59a3886fed9bdf4d96 100755 (executable)
--- a/t/t4020-diff-external.sh
+++ b/t/t4020-diff-external.sh
@@ -26,7 +26,7 @@ test_expect_success 'GIT_EXTERNAL_DIFF environment' '
                read path oldfile oldhex oldmode newfile newhex newmode &&
                test "z$path" = zfile &&
                test "z$oldmode" = z100644 &&
-               test "z$newhex" = "z$_z40" &&
+               test "z$newhex" = "z$ZERO_OID" &&
                test "z$newmode" = z100644 &&
                oh=$(git rev-parse --verify HEAD:file) &&
                test "z$oh" = "z$oldhex"
@@ -55,7 +55,7 @@ test_expect_success SYMLINKS 'typechange diff' '
                read path oldfile oldhex oldmode newfile newhex newmode &&
                test "z$path" = zfile &&
                test "z$oldmode" = z100644 &&
-               test "z$newhex" = "z$_z40" &&
+               test "z$newhex" = "z$ZERO_OID" &&
                test "z$newmode" = z120000 &&
                oh=$(git rev-parse --verify HEAD:file) &&
                test "z$oh" = "z$oldhex"
@@ -73,7 +73,7 @@ test_expect_success 'diff.external' '
                read path oldfile oldhex oldmode newfile newhex newmode &&
                test "z$path" = zfile &&
                test "z$oldmode" = z100644 &&
-               test "z$newhex" = "z$_z40" &&
+               test "z$newhex" = "z$ZERO_OID" &&
                test "z$newmode" = z100644 &&
                oh=$(git rev-parse --verify HEAD:file) &&
                test "z$oh" = "z$oldhex"
@@ -104,7 +104,7 @@ test_expect_success 'diff attribute' '
                read path oldfile oldhex oldmode newfile newhex newmode &&
                test "z$path" = zfile &&
                test "z$oldmode" = z100644 &&
-               test "z$newhex" = "z$_z40" &&
+               test "z$newhex" = "z$ZERO_OID" &&
                test "z$newmode" = z100644 &&
                oh=$(git rev-parse --verify HEAD:file) &&
                test "z$oh" = "z$oldhex"
@@ -137,7 +137,7 @@ test_expect_success 'diff attribute' '
                read path oldfile oldhex oldmode newfile newhex newmode &&
                test "z$path" = zfile &&
                test "z$oldmode" = z100644 &&
-               test "z$newhex" = "z$_z40" &&
+               test "z$newhex" = "z$ZERO_OID" &&
                test "z$newmode" = z100644 &&
                oh=$(git rev-parse --verify HEAD:file) &&
                test "z$oh" = "z$oldhex"