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

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

* jc/maint-diff-q-filter:
  diff --quiet: disable optimization when --diff-filter=X is used
maint
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

1
diff-lib.c
View File

@ -103,6 +103,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
unsigned dirty_submodule = 0; unsigned dirty_submodule = 0;


if (DIFF_OPT_TST(&revs->diffopt, QUICK) && if (DIFF_OPT_TST(&revs->diffopt, QUICK) &&
!revs->diffopt.filter &&
DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES)) DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
break; break;



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 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 test_done