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-no-index.c
View File

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