sha1-name.c: move around the collect_ambiguous() function

A subsequent change will make use of this static function in the
get_short_oid() function, which is defined above where the
collect_ambiguous() function is now. Without this we'd then have a
compilation error due to a forward declaration.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sha1-name.c b/sha1-name.c
index cd3b133aaed5eae2d86a2b2d804ff5b1e0ca525e..9d7bbd3e96f3227026909ff92bbb443976683a1f 100644 (file)
--- a/sha1-name.c
+++ b/sha1-name.c
@@ -372,6 +372,12 @@ static int show_ambiguous_object(const struct object_id *oid, void *data)
        return 0;
 }
 
        return 0;
 }
 

+static int collect_ambiguous(const struct object_id *oid, void *data)
+{
+       oid_array_append(data, oid);
+       return 0;
+}
+

 static int get_short_oid(const char *name, int len, struct object_id *oid,
                          unsigned flags)
 {
 static int get_short_oid(const char *name, int len, struct object_id *oid,
                          unsigned flags)
 {


@@ -421,12 +427,6 @@ static int get_short_oid(const char *name, int len, struct object_id *oid,
        return status;
 }
 
        return status;
 }
 

-static int collect_ambiguous(const struct object_id *oid, void *data)
-{
-       oid_array_append(data, oid);
-       return 0;
-}
-

 int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data)
 {
        struct oid_array collect = OID_ARRAY_INIT;
 int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data)
 {
        struct oid_array collect = OID_ARRAY_INIT;