diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-07-18 04:18:32 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-20 02:20:47 +0400 |
commit | 95a7c546b02a962b9e458f7fd2d0ed9b657c0ca6 (patch) | |
tree | cf6d5a0b08a04946f3613c590cc22020ee980484 /diff.c | |
parent | 7f2ea5f0f2fb056314092cce23202096ca70f076 (diff) |
diff: deprecate -q option to diff-files
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.c')
-rw-r--r-- | diff.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -3570,6 +3570,14 @@ 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); +} + int diff_opt_parse(struct diff_options *options, const char **av, int ac) { const char *arg = av[0]; |