Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
name-rev: fix parent counting.
author
Junio C Hamano
<junkio@cox.net>
Tue, 29 Nov 2005 04:51:44 +0000
(20:51 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 29 Nov 2005 04:51:44 +0000
(20:51 -0800)
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>
name-rev.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
7f4bd5d
)
diff --git
a/name-rev.c
b/name-rev.c
index 7d89401a41e911ff770b1ef63b56ef1a11619934..65333d4166da845d8594d2dc397c0026eebe2421 100644
(file)
--- 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
@@
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)