Merge branch 'lt/gitweb'

diff --git a/revision.c b/revision.c
index 1cf6276ad8fdfa957bd7b3734494467c40e74962..ab89c22417cace2ee56cd88a7135967690be586a 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -852,8 +852,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
        }
        if (revs->combine_merges) {
                revs->ignore_merges = 0;
-               if (revs->dense_combined_merges &&
-                   (revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT))
+               if (revs->dense_combined_merges && !revs->diffopt.output_format)
                        revs->diffopt.output_format = DIFF_FORMAT_PATCH;
        }
        revs->diffopt.abbrev = revs->abbrev;
@@ -997,7 +996,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)