From f56ef54174598d5362d0446c5a560cb5892537c2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 18 Apr 2006 11:29:33 -0700 Subject: diff --stat: make sure to set recursive. Just like "patch" format always needs recursive, "diffstat" format does not make sense without setting recursive. Signed-off-by: Junio C Hamano --- diff.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'diff.c') diff --git a/diff.c b/diff.c index b54bbfa627..3a1e6ce619 100644 --- a/diff.c +++ b/diff.c @@ -1029,6 +1029,16 @@ 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->with_stat)) + 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) { -- cgit v1.3