diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-17 17:18:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-19 15:20:47 -0700 |
| commit | 95a7c546b02a962b9e458f7fd2d0ed9b657c0ca6 (patch) | |
| tree | cf6d5a0b08a04946f3613c590cc22020ee980484 /diff-no-index.c | |
| parent | 7f2ea5f0f2fb056314092cce23202096ca70f076 (diff) | |
| download | git-95a7c546b02a962b9e458f7fd2d0ed9b657c0ca6.tar.gz | |
diff: deprecate -q option to diff-filesjc/diff-filter-negation
This reimplements the ancient "-q" option to "git diff-files" that
was inherited from "show-diff -q" in terms of "--diff-filter=d". We
will be deprecating the "-q" option, so let's issue a warning when
we do so.
Incidentally this also tentatively fixes "git diff --no-index" to
honor "-q" and hide deletions; the use will get the same warning.
We should remove the support for "-q" in a future version but it is
not that urgent.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-no-index.c')
| -rw-r--r-- | diff-no-index.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 74da659368..a788a5f304 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -187,7 +187,7 @@ void diff_no_index(struct rev_info *revs, { int i, prefixlen; int no_index = 0; - unsigned options = 0; + unsigned deprecated_show_diff_q_option_used = 0; const char *paths[2]; /* Were we asked to do --no-index explicitly? */ @@ -225,7 +225,7 @@ void diff_no_index(struct rev_info *revs, if (!strcmp(argv[i], "--no-index")) i++; else if (!strcmp(argv[i], "-q")) { - options |= DIFF_SILENT_ON_REMOVED; + deprecated_show_diff_q_option_used = 1; i++; } else if (!strcmp(argv[i], "--")) @@ -260,6 +260,9 @@ 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); |