diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:25:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:25:57 -0700 |
| commit | d518cc0a56b8b22a5d085be8710f082dbabfe1b3 (patch) | |
| tree | c2e4e8d002c2681b6be3e666f710f94727b07e13 | |
| parent | Merge branch 'jk/replace-edit-raw' (diff) | |
| parent | submodule.c: use the ARRAY_SIZE macro (diff) | |
| download | git-d518cc0a56b8b22a5d085be8710f082dbabfe1b3.tar.gz git-d518cc0a56b8b22a5d085be8710f082dbabfe1b3.zip | |
Merge branch 'ep/submodule-code-cleanup'
* ep/submodule-code-cleanup:
submodule.c: use the ARRAY_SIZE macro
| -rw-r--r-- | submodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index b80ecacf60..48e3b44e21 100644 --- a/submodule.c +++ b/submodule.c @@ -965,7 +965,7 @@ static int find_first_merges(struct object_array *result, const char *path, sha1_to_hex(a->object.sha1)); init_revisions(&revs, NULL); rev_opts.submodule = path; - setup_revisions(sizeof(rev_args)/sizeof(char *)-1, rev_args, &revs, &rev_opts); + setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts); /* save all revisions from the above list that contain b */ if (prepare_revision_walk(&revs)) |