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-lib.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-lib.c')
| -rw-r--r-- | diff-lib.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/diff-lib.c b/diff-lib.c index f35de0ffa0..4634b29199 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -86,10 +86,12 @@ int run_diff_files(struct rev_info *revs, unsigned int option) { int entries, i; int diff_unmerged_stage = revs->max_count; - int silent_on_removed = option & DIFF_SILENT_ON_REMOVED; 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) @@ -136,8 +138,6 @@ int run_diff_files(struct rev_info *revs, unsigned int option) perror(ce->name); continue; } - if (silent_on_removed) - continue; wt_mode = 0; } dpath->mode = wt_mode; @@ -203,8 +203,6 @@ int run_diff_files(struct rev_info *revs, unsigned int option) perror(ce->name); continue; } - if (silent_on_removed) - continue; diff_addremove(&revs->diffopt, '-', ce->ce_mode, ce->sha1, !is_null_sha1(ce->sha1), ce->name, 0); |