In add_parents_to_list, if any parent of a revision had already been
SEEN, the current code would continue with the next parent. But if the
first parent has been SEEN and --first-parent has been specified we need
to break, not continue.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
revision.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/revision.c b/revision.c
index 44d780b..974ad10 100644
--- a/revision.c
+++ b/revision.c
@@ -468,8 +468,11 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit, str
if (parse_commit(p) < 0)
return -1;
p->object.flags |= left_flag;
- if (p->object.flags & SEEN)
+ if (p->object.flags & SEEN) {
+ if (revs->first_parent_only)
+ break;
continue;
+ }
p->object.flags |= SEEN;
insert_by_date(p, list);
if(revs->first_parent_only)
--
1.5.5.1.148.g8ee22.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
| Karl Meyer | PROBLEM: 2.6.23-rc "NETDEV WATCHDOG: eth0: transmit timed out" |
| David Miller | Slow DOWN, please!!! |
| S.Çağlar | Rescheduling interrupts |
| Renato S. Yamane | Error -71 on device descriptor read/all |
git: | |
| Sverre Rabbelier | Git vs Monotone |
| Sergei Organov | Newbie: report of first experience with git-rebase. |
| Paolo Ciarrocchi | Question about "git commit -a" |
| Matthieu Moy | git push to a non-bare repository |
| Richard Stallman | Real men don't attack straw men |
| Brandon Mercer | Solid State Hard Disk in OpenBSD |
| GVG GVG | ssh_exchange_identification: Connection closed by remote host |
| Pau | acer aspire one dmesg? |
| Radu Rendec | Endianness problem with u32 classifier hash masks |
| Sami Farin | Linux 2.6.27.5 / SFQ/HTB scheduling problems |
| Jarek Poplawski | [PATCH take 2] pkt_sched: Protect gen estimators under est_lock. |
| Stephen Hemminger | Re: data received but not detected |
