Merge branch 'es/local-atomic-push-failure-with-http' into maint

diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh
index a37753047e084c9be40251e7c4286084bff6870a..7099d33508a0571cd8f960fcd80c46e4364f1766 100755 (executable)
--- a/t/t1007-hash-object.sh
+++ b/t/t1007-hash-object.sh
@@ -199,10 +199,6 @@ test_expect_success 'too-short tree' '
        test_i18ngrep "too-short tree object" err
 '
 
-hex2oct() {
-    perl -ne 'printf "\\%03o", hex for /../g'
-}
-
 test_expect_success 'malformed mode in tree' '
        hex_sha1=$(echo foo | git hash-object --stdin -w) &&
        bin_sha1=$(echo $hex_sha1 | hex2oct) &&