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 1cf6276ad8fdfa957bd7b3734494467c40e74962..880fb7bb30b75d9c5bb6a8aa037a6048cba5c922 100644 (file)
--- 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)