diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-07-02 10:55:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-02 10:55:59 -0700 |
| commit | 02d3dca3bff6a67dead9f5b97dfe3576fe5b14e5 (patch) | |
| tree | 837d51fb5afb7ad4c9a6c12ad8233024b2f07d30 | |
| parent | 0556a11a0df6b4119e01aa77dfb795561e62eb34 (diff) | |
| download | git-02d3dca3bff6a67dead9f5b97dfe3576fe5b14e5.tar.gz git-02d3dca3bff6a67dead9f5b97dfe3576fe5b14e5.tar.xz | |
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>
| -rw-r--r-- | revision.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |