From: Junio C Hamano <junkio@cox.net>
Date: Sun, 25 Sep 2005 06:33:02 +0000 (-0700)
Subject: show-branch: fix commit naming breakage.
X-Git-Tag: v0.99.7d~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fbaf834de12efb43dea8d2679a040462e9d3d03d;p=git.git

show-branch: fix commit naming breakage.

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

diff --git a/show-branch.c b/show-branch.c
index 8cc0755e0..5778a594f 100644
--- a/show-branch.c
+++ b/show-branch.c
@@ -138,7 +138,20 @@ static void name_commits(struct commit_list *list,
 				nth++;
 				if (p->object.util)
 					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);
 				i++;
 				name_first_parent_chain(p);