Merge branches 'jc/branch' and 'jc/rebase'

diff --git a/sha1_name.c b/sha1_name.c
index fe409fbce4978535bdf38773fd4e2924a68733b9..be1755a70b2c53fc102db41a62e6099fa0adac1b 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -349,7 +349,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);