development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 10:38:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

name-rev: fix parent counting.

Browse source 
Noticed by linux@horizon.com.  The first merge parent (typically
"our branch") is ^1, not ^0, and the first other branch is ^2.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-11-28 20:51:44 -08:00
parent 7f4bd5d831
commit f2e6f1c976
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
name-rev.c
View file

@ -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)