From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Sat, 25 May 2013 09:08:12 +0000 (+0200)
Subject: find_first_merges(): initialize merges variable using initializer
X-Git-Tag: v1.8.4-rc0~170^2~12
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=3826902d25febf61274925d6f12cc7471ba3c38f;p=git.git

find_first_merges(): initialize merges variable using initializer

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/submodule.c b/submodule.c
index e728025f60..b837c04ee2 100644
--- a/submodule.c
+++ b/submodule.c
@@ -846,7 +846,7 @@ static int find_first_merges(struct object_array *result, const char *path,
 		struct commit *a, struct commit *b)
 {
 	int i, j;
-	struct object_array merges;
+	struct object_array merges = OBJECT_ARRAY_INIT;
 	struct commit *commit;
 	int contains_another;
 
@@ -856,7 +856,6 @@ static int find_first_merges(struct object_array *result, const char *path,
 	struct rev_info revs;
 	struct setup_revision_opt rev_opts;
 
-	memset(&merges, 0, sizeof(merges));
 	memset(result, 0, sizeof(struct object_array));
 	memset(&rev_opts, 0, sizeof(rev_opts));