summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-05-01 20:39:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-05-01 20:39:56 (GMT)
commitbf04590ecdf87d0ad034f7fbff36a10eb20637cb (patch)
tree0eec97b7ca3c86fffe3d510ed124789d09c77a5a /fmt-merge-msg.c
parent3e68f552f3c3aa5b16570a87d3ffd74b2d866ba8 (diff)
parent3cacb9aaf46cef6f9cd9b3a859fcc64416954b56 (diff)
downloadgit-bf04590ecdf87d0ad034f7fbff36a10eb20637cb.zip
git-bf04590ecdf87d0ad034f7fbff36a10eb20637cb.tar.gz
git-bf04590ecdf87d0ad034f7fbff36a10eb20637cb.tar.bz2
Merge branch 'dd/sparse-fixes'
Compilation fix. * dd/sparse-fixes: progress.c: silence cgcc suggestion about internal linkage graph.c: limit linkage of internal variable compat/regex: move stdlib.h up in inclusion chain test-parse-pathspec-file.c: s/0/NULL/ for pointer type
Diffstat (limited to 'fmt-merge-msg.c')
-rw-r--r--fmt-merge-msg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index 08022ed..72d32bd 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -484,7 +484,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
enum object_type type;
unsigned long size, len;
char *buf = read_object_file(oid, &type, &size);
- struct signature_check sigc = { 0 };
+ struct signature_check sigc = { NULL };
struct strbuf sig = STRBUF_INIT;
if (!buf || type != OBJ_TAG)