mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show-branch: fix commit naming breakage.

Browse Source 
It was ignoring the generation number of the commit when naming 2nd
and later parents, showing "(linus^n)^2" for any <n> incorrectly as
"linus^2".

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2005-09-24 23:33:02 -07:00
parent c9fc748f84
commit fbaf834de1
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
show-branch.c
View File

@ -138,7 +138,20 @@ static void name_commits(struct commit_list *list,
nth++; nth++;
if (p->object.util) if (p->object.util)
continue; continue;
sprintf(newname, "%s^%d", n->head_name, nth); switch (n->generation) {
case 0:
sprintf(newname, "%s^%d",
n->head_name, nth);
break;
case 1:
sprintf(newname, "%s^^%d",
n->head_name, nth);
break;
default:
sprintf(newname, "%s~%d^%d",
n->head_name, n->generation,
nth);
}
name_commit(p, strdup(newname), 0); name_commit(p, strdup(newname), 0);
i++; i++;
name_first_parent_chain(p); name_first_parent_chain(p);