mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'

Browse Source 
Remove a confusing and deprecated "-q" option from "git diff-files";
"git diff-files --diff-filter=d" can be used instead.
This commit is contained in:
Junio C Hamano
2014-03-07 15:17:40 -08:00
parent 289ca27dee c48f6816f0
commit 2687ffdeb7
4 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
diff.c
View File

@ -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;