Browse Source

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>
maint
Michael Haggerty 12 years ago committed by Junio C Hamano
parent
commit
3826902d25
  1. 3
      submodule.c

3
submodule.c

@ -846,7 +846,7 @@ static int find_first_merges(struct object_array *result, const char *path, @@ -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, @@ -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));


Loading…
Cancel
Save