diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:03:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:03:18 -0800 |
| commit | 648f40701764cc3b47f2d2978518852e2aeb42cf (patch) | |
| tree | 38111ee58e089e336b4c981cdfba00911c4e5dde /t | |
| parent | 3cc3fb7df67dc9c83b71fec82e5bfb1df3724089 (diff) | |
| parent | 3e97c7c6af2901cec63bf35fcd43ae3472e24af8 (diff) | |
| download | git-648f40701764cc3b47f2d2978518852e2aeb42cf.tar.gz git-648f40701764cc3b47f2d2978518852e2aeb42cf.tar.xz | |
Merge branch 'gb/1.7.0-diff-whitespace-only-output'
* gb/1.7.0-diff-whitespace-only-output:
No diff -b/-w output for all-whitespace changes
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 8dd147d78..90f334237 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -93,8 +93,6 @@ git diff > out test_expect_success 'another test, without options' 'test_cmp expect out' cat << EOF > expect -diff --git a/x b/x -index d99af23..8b32fb5 100644 EOF git diff -w > out test_expect_success 'another test, with -w' 'test_cmp expect out' @@ -386,6 +384,18 @@ test_expect_success 'checkdiff allows new blank lines' ' git diff --check ' +cat <<EOF >expect +EOF +test_expect_success 'whitespace-only changes not reported' ' + git reset --hard && + echo >x "hello world" && + git add x && + git commit -m "hello 1" && + echo >x "hello world" && + git diff -b >actual && + test_cmp expect actual +' + test_expect_success 'combined diff with autocrlf conversion' ' git reset --hard && |