Skip to content

Commit

Permalink
diff: allow lowercase letter to specify what change class to exclude
Browse files Browse the repository at this point in the history
In order to express "we do not care about deletions", we had to say
"--diff-filter=ACMRTXUB", giving all the possible change class
except for the one we do not want, "D".

This is cumbersome.  As all the change classes are in uppercase,
allow their lowercase counterpart to selectively exclude the class
from the output.  When such a negated change class is in the input,
start the filter option with the full bits set.

This would allow us to express the old "show-diff -q" with
"git diff-files --diff-filter=d".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
gitster committed Jul 18, 2013
1 parent bf142ec commit 7f2ea5f
Showing 1 changed file with 28 additions and 1 deletion.
29 changes: 28 additions & 1 deletion diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -3532,13 +3532,40 @@ static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt)
int i, optch;

prepare_filter_bits();

/*
* If there is a negation e.g. 'd' in the input, and we haven't
* initialized the filter field with another --diff-filter, start
* from full set of bits, except for AON.
*/
if (!opt->filter) {
for (i = 0; (optch = optarg[i]) != '\0'; i++) {
if (optch < 'a' || 'z' < optch)
continue;
opt->filter = (1 << (ARRAY_SIZE(diff_status_letters) - 1)) - 1;
opt->filter &= ~filter_bit[DIFF_STATUS_FILTER_AON];
break;
}
}

for (i = 0; (optch = optarg[i]) != '\0'; i++) {
unsigned int bit;
int negate;

if ('a' <= optch && optch <= 'z') {
negate = 1;
optch = toupper(optch);
} else {
negate = 0;
}

bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0;
if (!bit)
return optarg[i];
opt->filter |= bit;
if (negate)
opt->filter &= ~bit;
else
opt->filter |= bit;
}
return 0;
}
Expand Down

0 comments on commit 7f2ea5f

Please sign in to comment.