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

Linus Torvalds · Junio C Hamano · commit 02d3dca3bff6 · 2006-07-02T10:55:59.000-07:00
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 &lt;torvalds@osdl.org&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -997,7 +997,7 @@ struct commit get_revision(struct rev_info revs)`
`997`	`997`	`if (!revs->parents)`
`998`	`998`	`continue;`
`999`	`999`	`/* non-merge - always ignore it */`
`1000`		`- if (commit->parents && !commit->parents->next)`
	`1000`	`+ if (!commit->parents \|\| !commit->parents->next)`
`1001`	`1001`	`continue;`
`1002`	`1002`	`}`
`1003`	`1003`	`if (revs->parents)`