* [PATCH] builtin/apply.c: Fix a "Using plain integer as NULL pointer" warning
@ 2012-05-13 21:42 Ramsay Jones
0 siblings, 0 replies; only message in thread
From: Ramsay Jones @ 2012-05-13 21:42 UTC (permalink / raw)
To: Junio C Hamano; +Cc: GIT Mailing-list
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-05-13 23:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-13 21:42 [PATCH] builtin/apply.c: Fix a "Using plain integer as NULL pointer" warning Ramsay Jones
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.