diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-05-26 22:38:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-05-26 22:38:19 -0700 |
commit | 3beb56bde63d1a10abc02ffe76c1f98d59ec0874 (patch) | |
tree | 69a2fa30848725866acfc359799bbfab5a2ce1d7 /t/t3001-ls-files-others-exclude.sh | |
parent | 2fe18392f0355c80295b8b74b24fc817183d3752 (diff) | |
parent | b3fde6ccb1cbdd362dec19e317905f71528b3a53 (diff) | |
download | git-3beb56bde63d1a10abc02ffe76c1f98d59ec0874.tar.gz git-3beb56bde63d1a10abc02ffe76c1f98d59ec0874.tar.xz |
Merge branch 'jc/diff-no-no-index'
* jc/diff-no-no-index:
git diff --no-index: default to page like other diff frontends
git-diff: allow --no-index semantics a bit more
"git diff": do not ignore index without --no-index
diff-files: do not play --no-index games
tests: do not use implicit "git diff --no-index"
Diffstat (limited to 't/t3001-ls-files-others-exclude.sh')
-rwxr-xr-x | t/t3001-ls-files-others-exclude.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh index 55f057ceb..1caeacafa 100755 --- a/t/t3001-ls-files-others-exclude.sh +++ b/t/t3001-ls-files-others-exclude.sh @@ -65,7 +65,7 @@ test_expect_success \ --exclude-per-directory=.gitignore \ --exclude-from=.git/ignore \ >output && - git diff expect output' + test_cmp expect output' # Test \r\n (MSDOS-like systems) printf '*.1\r\n/*.3\r\n!*.6\r\n' >.gitignore @@ -77,7 +77,7 @@ test_expect_success \ --exclude-per-directory=.gitignore \ --exclude-from=.git/ignore \ >output && - git diff expect output' + test_cmp expect output' cat > excludes-file << EOF *.[1-8] |