From 5e363541d0431b640e4bbbafb2941d1c64fa13c4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 22 May 2006 00:31:02 -0700 Subject: [PATCH] diff: minor option combination fix. output_format == DIFFSTAT and with_stat == true does not make sense, and the way the code is structured it causes trouble. Avoid it. Signed-off-by: Junio C Hamano --- diff.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/diff.c b/diff.c index d3bb10e00..160178367 100644 --- a/diff.c +++ b/diff.c @@ -1303,6 +1303,14 @@ int diff_setup_done(struct diff_options *options) (options->output_format == DIFF_FORMAT_CHECKDIFF)) options->recursive = 1; + /* + * These combinations do not make sense. + */ + if (options->output_format == DIFF_FORMAT_RAW) + options->with_raw = 0; + if (options->output_format == DIFF_FORMAT_DIFFSTAT) + options->with_stat = 0; + if (options->detect_rename && options->rename_limit < 0) options->rename_limit = diff_rename_limit_default; if (options->setup & DIFF_SETUP_USE_CACHE) { -- 2.30.2