name-rev: fix parent counting.

diff --git a/name-rev.c b/name-rev.c
index 21fecdf542a05e9bfa80990061ed3d0d3c849823..65333d4166da845d8594d2dc397c0026eebe2421 100644 (file)
--- a/name-rev.c
+++ b/name-rev.c
@@ -21,7 +21,7 @@ static void name_rev(struct commit *commit,
 {
        struct rev_name *name = (struct rev_name *)commit->object.util;
        struct commit_list *parents;
-       int parent_number = 0;
+       int parent_number = 1;
 
        if (!commit->object.parsed)
                parse_commit(commit);
@@ -56,7 +56,7 @@ static void name_rev(struct commit *commit,
        for (parents = commit->parents;
                        parents;
                        parents = parents->next, parent_number++) {
-               if (parent_number > 0) {
+               if (parent_number > 1) {
                        char *new_name = xmalloc(strlen(tip_name)+8);
 
                        if (generation > 0)
@@ -164,7 +164,7 @@ int main(int argc, char **argv)
                        continue;
                }
 
-               o = deref_tag(parse_object(sha1));
+               o = deref_tag(parse_object(sha1), *argv, 0);
                if (!o || o->type != commit_type) {
                        fprintf(stderr, "Could not get commit for %s. Skipping.\n",
                                        *argv);
@@ -217,10 +217,9 @@ int main(int argc, char **argv)
                                        if (!strcmp(name, "undefined"))
                                                continue;
 
-                                       fwrite(p_start, p - p_start, 1, stdout);
-                                       fputc('(', stdout);
-                                       fputs(name, stdout);
-                                       fputc(')', stdout);
+                                       fwrite(p_start, p - p_start + 1, 1,
+                                              stdout);
+                                       printf(" (%s)", name);
                                        p_start = p + 1;
                                }
                        }
@@ -230,8 +229,6 @@ int main(int argc, char **argv)
                                fwrite(p_start, p - p_start, 1, stdout);
                }
        } else if (all) {
-               extern struct object **objs;
-               extern int nr_objs;
                int i;
 
                for (i = 0; i < nr_objs; i++)