kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff: remove "diff-files -q" in a version of Git in a distant future 

This was inherited from "show-diff -q" that was invented to tell
comparison between the index and the working tree to ignore only
removals in 2005.

These days, it is spelled as "--diff-filter=d".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2013-07-18 10:36:51 -07:00
parent 95a7c546b0
commit c48f6816f0
4 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diff-lib.c
View File

@ -89,9 +89,6 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
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)

8
diff-no-index.c
View File

@ -187,7 +187,6 @@ void diff_no_index(struct rev_info *revs,
{
int i, prefixlen;
int no_index = 0;
unsigned deprecated_show_diff_q_option_used = 0;
const char *paths[2];

/* Were we asked to do --no-index explicitly? */
@ -224,10 +223,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 {
@ -260,9 +255,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);


8
diff.c
View File

@ -3570,14 +3570,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);
}

int diff_opt_parse(struct diff_options *options, const char **av, int ac)
{
const char *arg = av[0];

2
diff.h
View File

@ -341,8 +341,6 @@ extern int parse_rename_score(const char **cp_p);

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,
int insertions, int deletions);
extern void setup_diff_pager(struct diff_options *);