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

3
diff-lib.c
View File

@ -91,9 +91,6 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED) unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
? CE_MATCH_RACY_IS_DIRTY : 0); ? 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/"); diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
if (diff_unmerged_stage < 0) if (diff_unmerged_stage < 0)

8
diff-no-index.c
View File

@ -186,7 +186,6 @@ void diff_no_index(struct rev_info *revs,
const char *prefix) const char *prefix)
{ {
int i, prefixlen; int i, prefixlen;
unsigned deprecated_show_diff_q_option_used = 0;
const char *paths[2]; const char *paths[2];
diff_setup(&revs->diffopt); diff_setup(&revs->diffopt);
@ -194,10 +193,6 @@ void diff_no_index(struct rev_info *revs,
int j; int j;
if (!strcmp(argv[i], "--no-index")) if (!strcmp(argv[i], "--no-index"))
i++; i++;
else if (!strcmp(argv[i], "-q")) {
deprecated_show_diff_q_option_used = 1;
i++;
}
else if (!strcmp(argv[i], "--")) else if (!strcmp(argv[i], "--"))
i++; i++;
else { else {
@ -230,9 +225,6 @@ void diff_no_index(struct rev_info *revs,
revs->max_count = -2; revs->max_count = -2;
diff_setup_done(&revs->diffopt); diff_setup_done(&revs->diffopt);
if (deprecated_show_diff_q_option_used)
handle_deprecated_show_diff_q(&revs->diffopt);
setup_diff_pager(&revs->diffopt); setup_diff_pager(&revs->diffopt);
DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS); DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);

8
diff.c
View File

@ -3599,14 +3599,6 @@ static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt)
return 0; 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) { static void enable_patch_output(int *fmt) {
*fmt &= ~DIFF_FORMAT_NO_OUTPUT; *fmt &= ~DIFF_FORMAT_NO_OUTPUT;
*fmt |= DIFF_FORMAT_PATCH; *fmt |= DIFF_FORMAT_PATCH;

2
diff.h
View File

@ -345,8 +345,6 @@ extern int parse_rename_score(const char **cp_p);
extern long parse_algorithm_value(const char *value); extern long parse_algorithm_value(const char *value);
extern void handle_deprecated_show_diff_q(struct diff_options *);
extern int print_stat_summary(FILE *fp, int files, extern int print_stat_summary(FILE *fp, int files,
int insertions, int deletions); int insertions, int deletions);
extern void setup_diff_pager(struct diff_options *); extern void setup_diff_pager(struct diff_options *);