mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 05:13:58 +01:00
Code

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

Browse Source 
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>
This commit is contained in:
Linus Torvalds 2006-07-02 10:55:59 -07:00 committed by Junio C Hamano
parent 0556a11a0d
commit 02d3dca3bf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
revision.c
View File

@ -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)