development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-diff-q-filter'

Browse source 
* jc/maint-diff-q-filter:
  diff --quiet: disable optimization when --diff-filter=X is used
This commit is contained in:
Junio C Hamano 2011-03-23 14:55:17 -07:00
parent 98b256bd08 2cfe8a68cc
commit 7d0cf357a3
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
diff-lib.c
View file

@ -103,7 +103,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
unsigned dirty_submodule = 0;
if (DIFF_OPT_TST(&revs->diffopt, QUICK) &&
DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
!revs->diffopt.filter &&
DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
break;
if (!ce_path_match(ce, &revs->prune_data))

7
t/t4040-whitespace-status.sh
View file

@ -60,4 +60,11 @@ test_expect_success 'diff-files -b -p --exit-code' '
git diff-files -b -p --exit-code
'
test_expect_success 'diff-files --diff-filter --quiet' '
git reset --hard &&
rm a/d &&
echo x >>b/e &&
test_must_fail git diff-files --diff-filter=M --quiet
'
test_done