From 02d3dca3bff6a67dead9f5b97dfe3576fe5b14e5 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 2 Jul 2006 10:55:59 -0700 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- revision.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/revision.c b/revision.c index 1cf6276ad8..880fb7bb30 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)