mirror of
https://github.com/git/git.git
synced 2024-11-28 20:44:04 +08:00
d3c6751b18
Change various tests that use an idiom of the form:
>expect &&
test_cmp expect actual
To instead use:
test_must_be_empty actual
The test_must_be_empty() wrapper was introduced in ca8d148daf ("test:
test_must_be_empty helper", 2013-06-09). Many of these tests have been
added after that time. This was mostly found with, and manually pruned
from:
git grep '^\s+>.*expect.* &&$' t
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
42 lines
1018 B
Bash
Executable File
42 lines
1018 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='diff with assume-unchanged entries'
|
|
|
|
. ./test-lib.sh
|
|
|
|
# external diff has been tested in t4020-diff-external.sh
|
|
|
|
test_expect_success 'setup' '
|
|
echo zero > zero &&
|
|
git add zero &&
|
|
git commit -m zero &&
|
|
echo one > one &&
|
|
echo two > two &&
|
|
git add one two &&
|
|
git commit -m onetwo &&
|
|
git update-index --assume-unchanged one &&
|
|
echo borked >> one &&
|
|
test "$(git ls-files -v one)" = "h one"
|
|
'
|
|
|
|
test_expect_success 'diff-index does not examine assume-unchanged entries' '
|
|
git diff-index HEAD^ -- one | grep -q 5626abf0f72e58d7a153368ba57db4c673c0e171
|
|
'
|
|
|
|
test_expect_success 'diff-files does not examine assume-unchanged entries' '
|
|
rm one &&
|
|
test -z "$(git diff-files -- one)"
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'find-copies-harder is not confused by mode bits' '
|
|
echo content >exec &&
|
|
chmod +x exec &&
|
|
git add exec &&
|
|
git commit -m exec &&
|
|
git update-index --assume-unchanged exec &&
|
|
git diff-files --find-copies-harder -- exec >actual &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_done
|