summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-07 15:17:40 -0800
committerJunio C Hamano <gitster@pobox.com>2014-03-07 15:17:41 -0800
commit2687ffdeb76816a1645a5c3e3c7aaf654cc923bc (patch)
treefea99a64d7d8bc7ff3211155da3f23853b09d68b /diff.c
parent289ca27deefab9b145a156a30571d9d25a9ad17c (diff)
parentc48f6816f03bfb2a09067a4fcfb4698a2192f6f9 (diff)
downloadgit-2687ffdeb76816a1645a5c3e3c7aaf654cc923bc.tar.gz
Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'
Remove a confusing and deprecated "-q" option from "git diff-files"; "git diff-files --diff-filter=d" can be used instead.
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/diff.c b/diff.c
index e8006666d8..7c59bfe2d0 100644
--- 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;