Merge branch 'js-fat'

diff --git a/sha1_name.c b/sha1_name.c
index 75c688ecf2d9381d665f4b2f388df4ceaa0fdab5..cc320d3d7fc38787190598034fceb787d95336d6 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -323,6 +323,8 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
                return -1;
        if (!type_string) {
                o = deref_tag(o);
+               if (!o || (!o->parsed && !parse_object(o->sha1)))
+                       return -1;
                memcpy(sha1, o->sha1, 20);
        }
        else {
@@ -332,7 +334,7 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
                 */
 
                while (1) {
-                       if (!o)
+                       if (!o || (!o->parsed && !parse_object(o->sha1)))
                                return -1;
                        if (o->type == type_string) {
                                memcpy(sha1, o->sha1, 20);