diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-28 20:51:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-28 20:51:44 -0800 |
| commit | f2e6f1c9763f65918211ed28caf77a40effa4e7e (patch) | |
| tree | 0eea4db49bc2e8f538ea5ee8b1d396b7ae5295b4 /name-rev.c | |
| parent | 7f4bd5d831ea838668d1de5f5af022f763230eee (diff) | |
| download | git-f2e6f1c9763f65918211ed28caf77a40effa4e7e.tar.gz git-f2e6f1c9763f65918211ed28caf77a40effa4e7e.tar.xz | |
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>
Diffstat (limited to 'name-rev.c')
| -rw-r--r-- | name-rev.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |