diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2013-05-25 09:08:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-28 16:25:01 (GMT) |
| commit | 3826902d25febf61274925d6f12cc7471ba3c38f (patch) | |
| tree | 35443afaf01261b7398d436dee6c2a374bbca6fb /submodule.c | |
| parent | 16aa3bfc9b9dc587d02f29d8e54810480cf955e4 (diff) | |
| download | git-3826902d25febf61274925d6f12cc7471ba3c38f.zip git-3826902d25febf61274925d6f12cc7471ba3c38f.tar.gz git-3826902d25febf61274925d6f12cc7471ba3c38f.tar.bz2 | |
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>
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/submodule.c b/submodule.c index e728025..b837c04 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)); |