X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=name-rev.c;h=65333d4166da845d8594d2dc397c0026eebe2421;hb=9470657ad0d0472e3e3c2e352334f60e7bd777c1;hp=817e36b793aa1560d43b27682afe6631564e5738;hpb=93dcab2937624ebb97f91807576cddb242a55a46;p=git.git diff --git a/name-rev.c b/name-rev.c index 817e36b7..65333d41 100644 --- 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 @@ copy_data: 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) @@ -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; } }