git wrapper: more careful argument stuffing

diff --git a/sha1_name.c b/sha1_name.c
index fe409fbce4978535bdf38773fd4e2924a68733b9..faac158b16ca978914696ed5d2801770a122cce2 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -236,6 +236,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
                NULL
        };
        const char **p;
+       int found = 0;
 
        if (len == 40 && !get_sha1_hex(str, sha1))
                return 0;
@@ -246,10 +247,20 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
 
        for (p = prefix; *p; p++) {
                char *pathname = git_path("%s/%.*s", *p, len, str);
-               if (!read_ref(pathname, sha1))
-                       return 0;
+               if (!read_ref(pathname, sha1)) {
+                       /* Must be unique; i.e. when heads/foo and
+                        * tags/foo are both present, reject "foo".
+                        * Note that read_ref() eventually calls
+                        * get_sha1_hex() which can smudge initial
+                        * part of the buffer even if what is read
+                        * is found to be invalid halfway.
+                        */
+                       if (1 < found++)
+                               return -1;
+               }
        }
-
+       if (found == 1)
+               return 0;
        return -1;
 }
 
@@ -349,7 +360,7 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
        if (!o)
                return -1;
        if (!type_string) {
-               o = deref_tag(o);
+               o = deref_tag(o, name, sp - name - 2);
                if (!o || (!o->parsed && !parse_object(o->sha1)))
                        return -1;
                memcpy(sha1, o->sha1, 20);