diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-22 00:33:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-22 00:33:34 -0700 |
| commit | b05b52027c0e43abc9629049944283729a07899f (patch) | |
| tree | 0720a55ceb41729702f2a75c40dc3bce7dacbe20 | |
| parent | 7b8e4ab07c6ebc72e311804c9c79ef93cfbbe704 (diff) | |
| parent | 5e363541d0431b640e4bbbafb2941d1c64fa13c4 (diff) | |
| download | git-b05b52027c0e43abc9629049944283729a07899f.tar.gz git-b05b52027c0e43abc9629049944283729a07899f.tar.xz | |
Merge branch 'master' into next
* master:
diff: minor option combination fix.
| -rw-r--r-- | diff.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -1304,6 +1304,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) { |