]> git.ipfire.org Git - thirdparty/git.git/commitdiff
find_first_merges(): initialize merges variable using initializer
authorMichael Haggerty <mhagger@alum.mit.edu>
Sat, 25 May 2013 09:08:12 +0000 (11:08 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 May 2013 16:25:01 +0000 (09:25 -0700)
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
submodule.c

index e728025f60dbf7f3df87b7104af6410832ddb653..b837c04ee2971c0a26572ea32167472b240345ab 100644 (file)
@@ -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));