Skip to content

Commit

Permalink
name-rev: fix parent counting.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Nov 29, 2005
1 parent 7f4bd5d commit f2e6f1c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions name-rev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit f2e6f1c

Please sign in to comment.