diff options
| -rw-r--r-- | diff.c | 9 | ||||
| -rw-r--r-- | revision.c | 2 |
2 files changed, 9 insertions, 2 deletions
@@ -1029,6 +1029,15 @@ int diff_setup_done(struct diff_options *options) options->detect_rename != DIFF_DETECT_COPY) || (0 <= options->rename_limit && !options->detect_rename)) return -1; + + /* + * These cases always need recursive; we do not drop caller-supplied + * recursive bits for other formats here. + */ + if ((options->output_format == DIFF_FORMAT_PATCH) || + (options->output_format == DIFF_FORMAT_DIFFSTAT)) + options->recursive = 1; + if (options->detect_rename && options->rename_limit < 0) options->rename_limit = diff_rename_limit_default; if (options->setup & DIFF_SETUP_USE_CACHE) { diff --git a/revision.c b/revision.c index 5abec18bc1..4d2a64ef6b 100644 --- a/revision.c +++ b/revision.c @@ -791,8 +791,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch if (revs->dense_combined_merges) revs->diffopt.output_format = DIFF_FORMAT_PATCH; } - if (revs->diffopt.output_format == DIFF_FORMAT_PATCH) - revs->diffopt.recursive = 1; revs->diffopt.abbrev = revs->abbrev; diff_setup_done(&revs->diffopt); |