Merge branch 'ep/submodule-code-cleanup'
* ep/submodule-code-cleanup: submodule.c: use the ARRAY_SIZE macromaint
commit
d518cc0a56
|
|
@ -965,7 +965,7 @@ static int find_first_merges(struct object_array *result, const char *path,
|
||||||
sha1_to_hex(a->object.sha1));
|
sha1_to_hex(a->object.sha1));
|
||||||
init_revisions(&revs, NULL);
|
init_revisions(&revs, NULL);
|
||||||
rev_opts.submodule = path;
|
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 */
|
/* save all revisions from the above list that contain b */
|
||||||
if (prepare_revision_walk(&revs))
|
if (prepare_revision_walk(&revs))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue