Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'

diff --git a/diff.c b/diff.c
index e8006666d8a528689157aed0e84d23a5477111be..7c59bfe2d08edd8fe0f13b5487c1af34043d7ef1 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -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;