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

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 2643b75b543c91a553db657c8ef2af04cd7fae91..af8bf5b35145c468a76ab353a0b07d27f0b781f0 100644 (file)
--- a/sha1-name.c
+++ b/sha1-name.c
@@ -771,7 +771,7 @@ static inline int push_mark(const char *string, int len)
 }
 
 static enum get_oid_result get_oid_1(const char *name, int len, struct object_id *oid, unsigned lookup_flags);
 }
 
 static enum get_oid_result get_oid_1(const char *name, int len, struct object_id *oid, unsigned lookup_flags);

-static int interpret_nth_prior_checkout(const char *name, int namelen, struct strbuf *buf);
+static int interpret_nth_prior_checkout(struct repository *r, const char *name, int namelen, struct strbuf *buf);

 
 static int get_oid_basic(const char *str, int len, struct object_id *oid,
                          unsigned int flags)
 
 static int get_oid_basic(const char *str, int len, struct object_id *oid,
                          unsigned int flags)


@@ -835,7 +835,7 @@ static int get_oid_basic(const char *str, int len, struct object_id *oid,
                struct strbuf buf = STRBUF_INIT;
                int detached;
 
                struct strbuf buf = STRBUF_INIT;
                int detached;
 

-               if (interpret_nth_prior_checkout(str, len, &buf) > 0) {
+               if (interpret_nth_prior_checkout(the_repository, str, len, &buf) > 0) {

                        detached = (buf.len == the_hash_algo->hexsz && !get_oid_hex(buf.buf, oid));
                        strbuf_release(&buf);
                        if (detached)
                        detached = (buf.len == the_hash_algo->hexsz && !get_oid_hex(buf.buf, oid));
                        strbuf_release(&buf);
                        if (detached)


@@ -1288,7 +1288,8 @@ static int grab_nth_branch_switch(struct object_id *ooid, struct object_id *noid
  * Parse @{-N} syntax, return the number of characters parsed
  * if successful; otherwise signal an error with negative value.
  */
  * Parse @{-N} syntax, return the number of characters parsed
  * if successful; otherwise signal an error with negative value.
  */

-static int interpret_nth_prior_checkout(const char *name, int namelen,
+static int interpret_nth_prior_checkout(struct repository *r,
+                                       const char *name, int namelen,

                                        struct strbuf *buf)
 {
        long nth;
                                        struct strbuf *buf)
 {
        long nth;


@@ -1312,12 +1313,14 @@ static int interpret_nth_prior_checkout(const char *name, int namelen,
        cb.remaining = nth;
        strbuf_init(&cb.buf, 20);
 
        cb.remaining = nth;
        strbuf_init(&cb.buf, 20);
 

-       retval = 0;
-       if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch, &cb)) {
+       retval = refs_for_each_reflog_ent_reverse(get_main_ref_store(r),
+                       "HEAD", grab_nth_branch_switch, &cb);
+       if (0 < retval) {

                strbuf_reset(buf);
                strbuf_addbuf(buf, &cb.buf);
                retval = brace - name + 1;
                strbuf_reset(buf);
                strbuf_addbuf(buf, &cb.buf);
                retval = brace - name + 1;

-       }
+       } else
+               retval = 0;

 
        strbuf_release(&cb.buf);
        return retval;
 
        strbuf_release(&cb.buf);
        return retval;


@@ -1484,7 +1487,7 @@ int repo_interpret_branch_name(struct repository *r,
                namelen = strlen(name);
 
        if (!allowed || (allowed & INTERPRET_BRANCH_LOCAL)) {
                namelen = strlen(name);
 
        if (!allowed || (allowed & INTERPRET_BRANCH_LOCAL)) {

-               len = interpret_nth_prior_checkout(name, namelen, buf);
+               len = interpret_nth_prior_checkout(the_repository, name, namelen, buf);

                if (!len) {
                        return len; /* syntax Ok, not enough switches */
                } else if (len > 0) {
                if (!len) {
                        return len; /* syntax Ok, not enough switches */
                } else if (len > 0) {