diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-05-10 12:43:01 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-11 12:15:02 +0900 |
| commit | a885c93b5c2975352d7c61b330be04a270c9062f (patch) | |
| tree | e50e2a9f410a812f3314027dde420d00e9197ac5 | |
| parent | git-p4: change "commitish" typo to "committish" (diff) | |
| download | tgif-a885c93b5c2975352d7c61b330be04a270c9062f.tar.xz | |
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>
| -rw-r--r-- | sha1-name.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sha1-name.c b/sha1-name.c index cd3b133aae..9d7bbd3e96 100644 --- 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; } +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) { @@ -421,12 +427,6 @@ static int get_short_oid(const char *name, int len, struct object_id *oid, 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; |