Optionally support old diffs

[git.git] / name-rev.c

diff --git a/name-rev.c b/name-rev.c
index 65333d4..0c3f547 100644 (file)
--- a/name-rev.c
+++ b/name-rev.c
@@ -93,10 +93,11 @@ static int name_ref(const char *path, const unsigned char *sha1)
        }
        if (o && o->type == commit_type) {
                struct commit *commit = (struct commit *)o;
-               const char *p;
 
-               while ((p = strchr(path, '/')))
-                       path = p+1;
+               if (!strncmp(path, "refs/heads/", 11))
+                       path = path + 11;
+               else if (!strncmp(path, "refs/", 5))
+                       path = path + 5;
 
                name_rev(commit, strdup(path), 0, 0, deref);
        }
@@ -231,9 +232,10 @@ int main(int argc, char **argv)
        } else if (all) {
                int i;
 
-               for (i = 0; i < nr_objs; i++)
-                       printf("%s %s\n", sha1_to_hex(objs[i]->sha1),
-                                       get_rev_name(objs[i]));
+               for (i = 0; i < obj_allocs; i++)
+                       if (objs[i])
+                               printf("%s %s\n", sha1_to_hex(objs[i]->sha1),
+                                               get_rev_name(objs[i]));
        } else
                for ( ; revs; revs = revs->next)
                        printf("%s %s\n", revs->name, get_rev_name(revs->item));