From: Junio C Hamano <junkio@cox.net>
Date: Tue, 29 Nov 2005 04:51:44 +0000 (-0800)
Subject: name-rev: fix parent counting.
X-Git-Tag: v0.99.9l^2~37
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f2e6f1c9763f65918211ed28caf77a40effa4e7e;p=git.git

name-rev: fix parent counting.

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

diff --git a/name-rev.c b/name-rev.c
index 7d89401a4..65333d416 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)