mirror of
https://github.com/git/git.git
synced 2024-06-19 12:29:06 +02:00
5626558e63
"diff-tree -b --exit-code" without "--patch" exits with 0 status, not because it finds that the two input files are equivalent while ignoring whitespaces, but because the implied "--raw" mode always exits with 0 when whitespace tweaking options like "-b" and "-w" are given, which is a long-standing bug. We are about to fix it so that "--raw" and friends report the differences with the exit status (even though they ignore the whitespace tweaking options when producing their output), which will make this test, which succeeded for a wrong reason, start failing. Remove it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
77 lines
1.8 KiB
Bash
Executable File
77 lines
1.8 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='diff --exit-code with whitespace'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./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
|
|
'
|
|
|
|
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_expect_success 'diff-tree --diff-filter --quiet' '
|
|
git commit -a -m "worktree state" &&
|
|
test_must_fail git diff-tree --diff-filter=M --quiet HEAD^ HEAD
|
|
'
|
|
|
|
test_done
|