{"thread":{"id":"30527","subject":"[PATCH] builtin/apply.c: Fix a \"Using plain integer as NULL pointer\" warning","startedAt":"2012-05-13T21:42:36Z","lastAt":"2012-05-13T21:42:36Z","messageCount":1,"participants":["Ramsay Jones"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"191476","messageId":"4FB02ACC.80703@ramsay1.demon.co.uk","threadId":"30527","inReplyTo":null,"subject":"[PATCH] builtin/apply.c: Fix a \"Using plain integer as NULL pointer\" warning","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2012-05-13T21:42:36Z","receivedAt":"2012-05-13T21:42:36Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\n\nSigned-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\n---\n\nHi Junio,\n\nCould you please squash this into commit fe823c5 (\"apply: plug the\nthree-way merge logic in\", 09-05-2012) in branch 'jc/apply-3way'.\n\nThanks!\n\nATB,\nRamsay Jones\n\n builtin/apply.c |    2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/apply.c b/builtin/apply.c\nindex 507c73c..9cf3ce7 100644\n--- a/builtin/apply.c\n+++ b/builtin/apply.c\n@@ -3094,7 +3094,7 @@ static int three_way_merge(struct image *image,\n \t\t\t   const unsigned char *theirs)\n {\n \tmmfile_t base_file, our_file, their_file;\n-\tmmbuffer_t result = { 0 };\n+\tmmbuffer_t result = { NULL };\n \tint status;\n \n \tread_mmblob(&base_file, base);\n-- \n1.7.10\n"}]}