X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git.c;h=5209b04de50b23c2410573dae285e156ed25f833;hb=cf9dc65368113caa28f2829e2ada5477fbb031ec;hp=140ed1873d7b5e334452cc8f8ac75a0541e32b6c;hpb=e190bc55431d906b8c70dc07f8b6d823721f12c9;p=git.git diff --git a/git.c b/git.c index 140ed187..5209b04d 100644 --- a/git.c +++ b/git.c @@ -344,8 +344,6 @@ static int cmd_log(int argc, const char **argv, char **envp) opt.ignore_merges = 0; if (opt.dense_combined_merges) opt.diffopt.output_format = DIFF_FORMAT_PATCH; - if (opt.diffopt.output_format == DIFF_FORMAT_PATCH) - opt.diffopt.recursive = 1; if (!full_diff && rev.prune_data) diff_tree_setup_paths(rev.prune_data, &opt.diffopt); diff_setup_done(&opt.diffopt);