summaryrefslogtreecommitdiff
path: root/name-rev.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-03 23:46:02 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-03 23:46:02 -0800
commit423325a2d24638ddcc82ce47be5e40be550f4507 (patch)
tree00960b001d786299d3da04a4467bd0c798bf8cda /name-rev.c
parent93dcab2937624ebb97f91807576cddb242a55a46 (diff)
parentd79374c7b58d3814ffdc277de608243f8e665e3a (diff)
GIT 0.99.9l aka 1.0rc4v1.0rc4v0.99.9l
Diffstat (limited to 'name-rev.c')
-rw-r--r--name-rev.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/name-rev.c b/name-rev.c
index 817e36b793..65333d4166 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;
}
}