Merge branch 'ep/submodule-code-cleanup'

* ep/submodule-code-cleanup: submodule.c: use the ARRAY_SIZE macro
git-mirror · Jul 16, 2014 · d518cc0 · d518cc0
2 parents 5418212 + 94c0cc8
commit d518cc0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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))