Subject: [PATCH] builtin/apply.c: Fix a "Using plain integer as NULL pointer" warning

From: Ramsay Jones <[email-masked]>
Date: Sun, 13 May 2012 22:42:36 +0100

Signed-off-by: Ramsay Jones <[email-masked]>
---

Hi Junio,

Could you please squash this into commit fe823c5 ("apply: plug the
three-way merge logic in", 09-05-2012) in branch 'jc/apply-3way'.

Thanks!

ATB,
Ramsay Jones

 builtin/apply.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/apply.c b/builtin/apply.c
index 507c73c..9cf3ce7 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3094,7 +3094,7 @@ static int three_way_merge(struct image *image,
 			   const unsigned char *theirs)
 {
 	mmfile_t base_file, our_file, their_file;
-	mmbuffer_t result = { 0 };
+	mmbuffer_t result = { NULL };
 	int status;
 
 	read_mmblob(&base_file, base);
-- 
1.7.10