Merge branch 'jc/simplify-progress' into next

diff --git a/sha1_file.c b/sha1_file.c
index 189a1c3cdd14ad7a9d7e72a4577f47449e2ed5f6..6da17a9c8762c7e79c1c26714722e482713a07aa 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -32,7 +32,7 @@
 #define SZ_FMT PRIuMAX
 static inline uintmax_t sz_fmt(size_t s) { return s; }
 
-const unsigned char null_sha1[20];
+const unsigned char null_sha1[GIT_MAX_RAWSZ];
 const struct object_id null_oid;
 const struct object_id empty_tree_oid = {
        EMPTY_TREE_SHA1_BIN_LITERAL