sed -e '/RE/r rfile/' needs space in 'r rfile'

diff --git a/revision.c b/revision.c
index 56bc4ff0e83b4cfedee6b0893f921be0c0bfcc31..a7750e626b63815cb0a579287220b289af7311b3 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -817,6 +817,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                                        exclude = get_merge_bases(a, b, 1);
                                        add_pending_commit_list(revs, exclude,
                                                                flags_exclude);
+                                       free_commit_list(exclude);
                                        a->object.flags |= flags;
                                } else
                                        a->object.flags |= flags_exclude;
@@ -882,8 +883,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;