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/t3040-subprojects-basic.sh | |
parent | 2fe18392f0355c80295b8b74b24fc817183d3752 (diff) | |
parent | b3fde6ccb1cbdd362dec19e317905f71528b3a53 (diff) | |
download | git-3beb56bde63d1a10abc02ffe76c1f98d59ec0874.tar.gz |
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/t3040-subprojects-basic.sh')
-rwxr-xr-x | t/t3040-subprojects-basic.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3040-subprojects-basic.sh b/t/t3040-subprojects-basic.sh index 79b9f23654..f6973e96a5 100755 --- a/t/t3040-subprojects-basic.sh +++ b/t/t3040-subprojects-basic.sh @@ -24,7 +24,7 @@ test_expect_success 'create subprojects' \ git add sub2 && git commit -q -m "subprojects added" && git diff-tree --abbrev=5 HEAD^ HEAD |cut -d" " -f-3,5- >current && - git diff expected current' + test_cmp expected current' git branch save HEAD @@ -62,7 +62,7 @@ test_expect_success 'check if clone works' \ 'git ls-files -s >expected && git clone -l -s . cloned && ( cd cloned && git ls-files -s ) >current && - git diff expected current' + test_cmp expected current' test_expect_success 'removing and adding subproject' \ 'git update-index --force-remove -- sub2 && |