mirror of
https://github.com/git/git.git
synced 2026-01-09 01:34:00 +00:00
Merge branch 'jk/all-negative-diff-filter-fix'
A diff-filter with negative-only specification like "git log --diff-filter=d" did not trigger correctly, which has been fixed. * jk/all-negative-diff-filter-fix: setup_revisions(): turn on diffs for all-negative diff filter
This commit is contained in:
@@ -3112,7 +3112,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
||||
|
||||
/* Pickaxe, diff-filter and rename following need diffs */
|
||||
if ((revs->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) ||
|
||||
revs->diffopt.filter ||
|
||||
revs->diffopt.filter || revs->diffopt.filter_not ||
|
||||
revs->diffopt.flags.follow_renames)
|
||||
revs->diff = 1;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user