diff options
| -rw-r--r-- | builtin-log.c | 5 | ||||
| -rw-r--r-- | revision.c | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/builtin-log.c b/builtin-log.c index c1bf9d4ee..4e5273aec 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -24,11 +24,8 @@ static int cmd_log_wc(int argc, const char **argv, char **envp, rev->verbose_header = 1; argc = setup_revisions(argc, argv, rev, "HEAD"); if (rev->always_show_header) { - if (rev->diffopt.pickaxe || rev->diffopt.filter) { + if (rev->diffopt.pickaxe || rev->diffopt.filter) rev->always_show_header = 0; - if (rev->diffopt.output_format == DIFF_FORMAT_RAW) - rev->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT; - } } if (argc > 1) diff --git a/revision.c b/revision.c index b963f2adf..ae4ca8200 100644 --- a/revision.c +++ b/revision.c @@ -851,8 +851,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; |