mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
2cfe8a68cc
The code notices that the caller does not want any detail of the changes
and only wants to know if there is a change or not by specifying --quiet.
And it breaks out of the loop when it knows it already found any change.
When you have a post-process filter (e.g. --diff-filter), however, the
path we found to be different in the previous round and set HAS_CHANGES
bit may end up being uninteresting, and there may be no output at the end.
The optimization needs to be disabled for such case.
Note that the f245194 (diff: change semantics of "ignore whitespace"
options, 2009-05-22) already disables this optimization by refraining
from setting HAS_CHANGES when post-process filters that need to inspect
the contents of the files (e.g. -S, -w) in diff_change() function.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
70 lines
1.6 KiB
Bash
Executable file
70 lines
1.6 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='diff --exit-code with whitespace'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
mkdir a b &&
|
|
echo >c &&
|
|
echo >a/d &&
|
|
echo >b/e &&
|
|
git add . &&
|
|
test_tick &&
|
|
git commit -m initial &&
|
|
echo " " >a/d &&
|
|
test_tick &&
|
|
git commit -a -m second &&
|
|
echo " " >a/d &&
|
|
echo " " >b/e &&
|
|
git add a/d
|
|
'
|
|
|
|
test_expect_success 'diff-tree --exit-code' '
|
|
test_must_fail git diff --exit-code HEAD^ HEAD &&
|
|
test_must_fail git diff-tree --exit-code HEAD^ HEAD
|
|
'
|
|
|
|
test_expect_success 'diff-tree -b --exit-code' '
|
|
git diff -b --exit-code HEAD^ HEAD &&
|
|
git diff-tree -b -p --exit-code HEAD^ HEAD &&
|
|
git diff-tree -b --exit-code HEAD^ HEAD
|
|
'
|
|
|
|
test_expect_success 'diff-index --cached --exit-code' '
|
|
test_must_fail git diff --cached --exit-code HEAD &&
|
|
test_must_fail git diff-index --cached --exit-code HEAD
|
|
'
|
|
|
|
test_expect_success 'diff-index -b -p --cached --exit-code' '
|
|
git diff -b --cached --exit-code HEAD &&
|
|
git diff-index -b -p --cached --exit-code HEAD
|
|
'
|
|
|
|
test_expect_success 'diff-index --exit-code' '
|
|
test_must_fail git diff --exit-code HEAD &&
|
|
test_must_fail git diff-index --exit-code HEAD
|
|
'
|
|
|
|
test_expect_success 'diff-index -b -p --exit-code' '
|
|
git diff -b --exit-code HEAD &&
|
|
git diff-index -b -p --exit-code HEAD
|
|
'
|
|
|
|
test_expect_success 'diff-files --exit-code' '
|
|
test_must_fail git diff --exit-code &&
|
|
test_must_fail git diff-files --exit-code
|
|
'
|
|
|
|
test_expect_success 'diff-files -b -p --exit-code' '
|
|
git diff -b --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
|