Merge branch 'dl/complete-cherry-pick-revert-skip'

diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index 8de36b7d12227a38769f658983363a5ebd52fd68..e5116a76a1cc660370e1f5e958f87c2844a95f83 100755 (executable)
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -78,7 +78,7 @@ test_expect_success 'git diff-files --no-patch --patch shows the patch' '
 
 test_expect_success 'git diff-files --no-patch --patch-with-raw shows the patch and raw data' '
        git diff-files --no-patch --patch-with-raw >actual &&
-       grep -q "^:100644 100755 .* 0000000000000000000000000000000000000000 M  path0\$" actual &&
+       grep -q "^:100644 100755 .* $ZERO_OID M path0\$" actual &&
        tail -n +4 actual >actual-patch &&
        compare_diff_patch expected actual-patch
 '