diff options
| -rw-r--r-- | diff-lib.c | 3 | ||||
| -rw-r--r-- | diff-no-index.c | 8 | ||||
| -rw-r--r-- | diff.c | 8 | ||||
| -rw-r--r-- | diff.h | 2 |
4 files changed, 0 insertions, 21 deletions
diff --git a/diff-lib.c b/diff-lib.c index ec5f722eff..044872935c 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -91,9 +91,6 @@ int run_diff_files(struct rev_info *revs, unsigned int option) unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED) ? CE_MATCH_RACY_IS_DIRTY : 0); - if (option & DIFF_SILENT_ON_REMOVED) - handle_deprecated_show_diff_q(&revs->diffopt); - diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/"); if (diff_unmerged_stage < 0) diff --git a/diff-no-index.c b/diff-no-index.c index 33e5982a1c..8e10bff30e 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -186,7 +186,6 @@ void diff_no_index(struct rev_info *revs, const char *prefix) { int i, prefixlen; - unsigned deprecated_show_diff_q_option_used = 0; const char *paths[2]; diff_setup(&revs->diffopt); @@ -194,10 +193,6 @@ void diff_no_index(struct rev_info *revs, int j; if (!strcmp(argv[i], "--no-index")) i++; - else if (!strcmp(argv[i], "-q")) { - deprecated_show_diff_q_option_used = 1; - i++; - } else if (!strcmp(argv[i], "--")) i++; else { @@ -230,9 +225,6 @@ void diff_no_index(struct rev_info *revs, revs->max_count = -2; diff_setup_done(&revs->diffopt); - if (deprecated_show_diff_q_option_used) - handle_deprecated_show_diff_q(&revs->diffopt); - setup_diff_pager(&revs->diffopt); DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS); @@ -3599,14 +3599,6 @@ static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt) return 0; } -/* Used only by "diff-files" and "diff --no-index" */ -void handle_deprecated_show_diff_q(struct diff_options *opt) -{ - warning("'diff -q' and 'diff-files -q' are deprecated."); - warning("Use 'diff --diff-filter=d' instead to ignore deleted filepairs."); - parse_diff_filter_opt("d", opt); -} - static void enable_patch_output(int *fmt) { *fmt &= ~DIFF_FORMAT_NO_OUTPUT; *fmt |= DIFF_FORMAT_PATCH; @@ -345,8 +345,6 @@ extern int parse_rename_score(const char **cp_p); extern long parse_algorithm_value(const char *value); -extern void handle_deprecated_show_diff_q(struct diff_options *); - extern int print_stat_summary(FILE *fp, int files, int insertions, int deletions); extern void setup_diff_pager(struct diff_options *); |