sha1-name.c: remove the_repo from get_describe_name()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sha1-name.c b/sha1-name.c
index fb80306f1a6aa7b341d8fe0979b7a0401f1cb01f..1cda854f023eff4c5f1179bfb6f094faae9df860 100644 (file)
--- a/sha1-name.c
+++ b/sha1-name.c
@@ -1097,7 +1097,9 @@ static int peel_onion(const char *name, int len, struct object_id *oid,
        return 0;
 }
 
        return 0;
 }
 

-static int get_describe_name(const char *name, int len, struct object_id *oid)
+static int get_describe_name(struct repository *r,
+                            const char *name, int len,
+                            struct object_id *oid)

 {
        const char *cp;
        unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT;
 {
        const char *cp;
        unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT;


@@ -1111,7 +1113,7 @@ static int get_describe_name(const char *name, int len, struct object_id *oid)
                        if (ch == 'g' && cp[-1] == '-') {
                                cp++;
                                len -= cp - name;
                        if (ch == 'g' && cp[-1] == '-') {
                                cp++;
                                len -= cp - name;

-                               return get_short_oid(the_repository,
+                               return get_short_oid(r,

                                                     cp, len, oid, flags);
                        }
                }
                                                     cp, len, oid, flags);
                        }
                }


@@ -1162,7 +1164,7 @@ static enum get_oid_result get_oid_1(const char *name, int len,
                return FOUND;
 
        /* It could be describe output that is "SOMETHING-gXXXX" */
                return FOUND;
 
        /* It could be describe output that is "SOMETHING-gXXXX" */

-       ret = get_describe_name(name, len, oid);
+       ret = get_describe_name(the_repository, name, len, oid);

        if (!ret)
                return FOUND;
 
        if (!ret)
                return FOUND;