From: Patryk Obara <patryk.obara@gmail.com>
Date: Fri, 18 Aug 2017 01:59:35 +0000 (+0200)
Subject: sha1_file: fix definition of null_sha1
X-Git-Tag: v2.15.0-rc0~111^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50c5cd5800be172300da79b271037148f31d1987;p=thirdparty%2Fgit.git

sha1_file: fix definition of null_sha1

The array is declared in cache.h as:

  extern const unsigned char null_sha1[GIT_MAX_RAWSZ];

Definition in sha1_file.c must match.

Signed-off-by: Patryk Obara <patryk.obara@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/sha1_file.c b/sha1_file.c
index b60ae15f70..f5b5bec52f 100644
--- 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