From: Linus Torvalds <torvalds@osdl.org>
Date: Sun, 2 Jul 2006 17:55:59 +0000 (-0700)
Subject: revision.c: fix "dense" under --remove-empty
X-Git-Tag: v1.4.2-rc1~99
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=02d3dca3bff6a67dead9f5b97dfe3576fe5b14e5;p=git.git

revision.c: fix "dense" under --remove-empty

It had the wrong test for whether a commit was a merge. What it did was to
say that a non-merge has exactly one parent (which sounds almost right),
but the fact is, initial trees have no parent at all, but they're
obviously not merges.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/revision.c b/revision.c
index 1cf6276ad..880fb7bb3 100644
--- a/revision.c
+++ b/revision.c
@@ -997,7 +997,7 @@ struct commit *get_revision(struct rev_info *revs)
 				if (!revs->parents)
 					continue;
 				/* non-merge - always ignore it */
-				if (commit->parents && !commit->parents->next)
+				if (!commit->parents || !commit->parents->next)
 					continue;
 			}
 			if (revs->parents)