dwim_ref(): Separate name-to-ref DWIM code out.

I'll be using this in another function to figure out what to
pass to resolve_ref().

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/cache.h b/cache.h
index e6e19bdef31363352fe0a7f89e294aa43c63a982..a218db3b30a6b1b41b1feada2f71d71ac1623d8e 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -299,6 +299,8 @@ extern int get_sha1_hex(const char *hex, unsigned char *sha1);
 extern char *sha1_to_hex(const unsigned char *sha1);   /* static buffer result! */
 extern int read_ref(const char *filename, unsigned char *sha1);
 extern const char *resolve_ref(const char *path, unsigned char *sha1, int, int *);
 extern char *sha1_to_hex(const unsigned char *sha1);   /* static buffer result! */
 extern int read_ref(const char *filename, unsigned char *sha1);
 extern const char *resolve_ref(const char *path, unsigned char *sha1, int, int *);

+extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
+

 extern int create_symref(const char *ref, const char *refs_heads_master);
 extern int validate_headref(const char *ref);
 
 extern int create_symref(const char *ref, const char *refs_heads_master);
 extern int validate_headref(const char *ref);
 

diff --git a/sha1_name.c b/sha1_name.c
index 6d7cd78381414aa2fef31d31d46fbb24b0aaab1d..ae31851900cd3b7ef753e1a2254f9a4f1a5fcc8d 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -235,7 +235,7 @@ static int ambiguous_path(const char *path, int len)
        return slash;
 }
 
        return slash;
 }
 

-static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
+int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref)

 {
        static const char *fmt[] = {
                "%.*s",
 {
        static const char *fmt[] = {
                "%.*s",


@@ -246,13 +246,32 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
                "refs/remotes/%.*s/HEAD",
                NULL
        };
                "refs/remotes/%.*s/HEAD",
                NULL
        };

+       const char **p, *r;
+       int refs_found = 0;
+
+       *ref = NULL;
+       for (p = fmt; *p; p++) {
+               unsigned char sha1_from_ref[20];
+               unsigned char *this_result;
+
+               this_result = refs_found ? sha1_from_ref : sha1;
+               r = resolve_ref(mkpath(*p, len, str), this_result, 1, NULL);
+               if (r) {
+                       if (!refs_found++)
+                               *ref = xstrdup(r);
+                       if (!warn_ambiguous_refs)
+                               break;
+               }
+       }
+       return refs_found;
+}
+
+static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
+{

        static const char *warning = "warning: refname '%.*s' is ambiguous.\n";
        static const char *warning = "warning: refname '%.*s' is ambiguous.\n";

-       const char **p, *ref;

        char *real_ref = NULL;
        int refs_found = 0;
        int at, reflog_len;
        char *real_ref = NULL;
        int refs_found = 0;
        int at, reflog_len;

-       unsigned char *this_result;
-       unsigned char sha1_from_ref[20];

 
        if (len == 40 && !get_sha1_hex(str, sha1))
                return 0;
 
        if (len == 40 && !get_sha1_hex(str, sha1))
                return 0;


@@ -273,16 +292,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
        if (ambiguous_path(str, len))
                return -1;
 
        if (ambiguous_path(str, len))
                return -1;
 

-       for (p = fmt; *p; p++) {
-               this_result = refs_found ? sha1_from_ref : sha1;
-               ref = resolve_ref(mkpath(*p, len, str), this_result, 1, NULL);
-               if (ref) {
-                       if (!refs_found++)
-                               real_ref = xstrdup(ref);
-                       if (!warn_ambiguous_refs)
-                               break;
-               }
-       }
+       refs_found = dwim_ref(str, len, sha1, &real_ref);

 
        if (!refs_found)
                return -1;
 
        if (!refs_found)
                return -1;