summaryrefslogtreecommitdiff
path: root/diff-no-index.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-no-index.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-no-index.c')
-rw-r--r--diff-no-index.c8
1 files changed, 0 insertions, 8 deletions
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);