summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-07 23:17:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-07 23:17:41 (GMT)
commit2687ffdeb76816a1645a5c3e3c7aaf654cc923bc (patch)
treefea99a64d7d8bc7ff3211155da3f23853b09d68b
parent289ca27deefab9b145a156a30571d9d25a9ad17c (diff)
parentc48f6816f03bfb2a09067a4fcfb4698a2192f6f9 (diff)
downloadgit-2687ffdeb76816a1645a5c3e3c7aaf654cc923bc.zip
git-2687ffdeb76816a1645a5c3e3c7aaf654cc923bc.tar.gz
git-2687ffdeb76816a1645a5c3e3c7aaf654cc923bc.tar.bz2
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.
-rw-r--r--diff-lib.c3
-rw-r--r--diff-no-index.c8
-rw-r--r--diff.c8
-rw-r--r--diff.h2
4 files changed, 0 insertions, 21 deletions
diff --git a/diff-lib.c b/diff-lib.c
index ec5f722..0448729 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 33e5982..8e10bff 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);
diff --git a/diff.c b/diff.c
index e800666..7c59bfe 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;
diff --git a/diff.h b/diff.h
index e79f3b3..a24a767 100644
--- a/diff.h
+++ b/diff.h
@@ -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 *);