diff: remove "diff-files -q" in a version of Git in a distant future
This was inherited from "show-diff -q" that was invented to tell comparison between the index and the working tree to ignore only removals in 2005. These days, it is spelled as "--diff-filter=d". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 18, 2013 at 10:36 UTC
c48f6816f03bfb2a09067a4fcfb4698a2192f6f9
4 files changed
-21
diff-lib.c
-3
@@ -89,9 +89,6 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
89
unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
90
? CE_MATCH_RACY_IS_DIRTY : 0);
91
92
- if (option & DIFF_SILENT_ON_REMOVED)
93
- handle_deprecated_show_diff_q(&revs->diffopt);
94
-
92
diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
93
94
if (diff_unmerged_stage < 0)
diff-no-index.c
-8
@@ -187,7 +187,6 @@ void diff_no_index(struct rev_info *revs,
187
{
188
int i, prefixlen;
189
int no_index = 0;
190
- unsigned deprecated_show_diff_q_option_used = 0;
190
const char *paths[2];
191
192
/* Were we asked to do --no-index explicitly? */
@@ -224,10 +223,6 @@ void diff_no_index(struct rev_info *revs,
223
int j;
224
if (!strcmp(argv[i], "--no-index"))
225
i++;
227
- else if (!strcmp(argv[i], "-q")) {
228
- deprecated_show_diff_q_option_used = 1;
229
- i++;
230
- }
226
else if (!strcmp(argv[i], "--"))
227
i++;
228
else {
@@ -260,9 +255,6 @@ void diff_no_index(struct rev_info *revs,
255
revs->max_count = -2;
256
diff_setup_done(&revs->diffopt);
257
263
- if (deprecated_show_diff_q_option_used)
264
- handle_deprecated_show_diff_q(&revs->diffopt);
265
-
258
setup_diff_pager(&revs->diffopt);
259
DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
260
diff.c
-8
@@ -3570,14 +3570,6 @@ static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt)
3570
return 0;
3571
}
3572
3573
-/* Used only by "diff-files" and "diff --no-index" */
3574
-void handle_deprecated_show_diff_q(struct diff_options *opt)
3575
-{
3576
- warning("'diff -q' and 'diff-files -q' are deprecated.");
3577
- warning("Use 'diff --diff-filter=d' instead to ignore deleted filepairs.");
3578
- parse_diff_filter_opt("d", opt);
3579
-}
3580
-
3573
int diff_opt_parse(struct diff_options *options, const char **av, int ac)
3574
{
3575
const char *arg = av[0];
diff.h
-2
@@ -341,8 +341,6 @@ extern int parse_rename_score(const char **cp_p);
341
342
extern long parse_algorithm_value(const char *value);
343
344
-extern void handle_deprecated_show_diff_q(struct diff_options *);
345
-
344
extern int print_stat_summary(FILE *fp, int files,
345
int insertions, int deletions);
346
extern void setup_diff_pager(struct diff_options *);