cleanups: ensure that git-compat-util.h is included first

diff --git a/submodule.c b/submodule.c
index 2fe2ad8ee41aefa3108f7a51861df0a389a56b68..c3a61e70f9f72eced2530d425717972881b947c8 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -962,7 +962,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))