Merge branch 'ld/git-p4-updates'

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index bae78c4e89e2402d5ab37e3b7cd094dde41d69b3..84dd1cb6907d583ec4019f1bb5b949865beac6cb 100755 (executable)
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -383,7 +383,7 @@ test_expect_success 'describe complains about tree object' '
 '
 
 test_expect_success 'describe complains about missing object' '
-       test_must_fail git describe $_z40
+       test_must_fail git describe $ZERO_OID
 '
 
 test_done