development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Remove heredoc usage inside quotes

Browse source 
The use of heredoc inside quoted strings doesn't seem to be
supported by dash.  pdksh seems to handle it fine, however.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Eric Wong 2006-05-25 19:06:16 -07:00 committed by Junio C Hamano
parent 003d6ddaf4
commit c7053aa88f
2 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
t/t2101-update-index-reupdate.sh
View file

@ -8,15 +8,16 @@ test_description='git-update-index --again test.
. ./test-lib.sh . ./test-lib.sh
cat > expected <<\EOF
100644 3b18e512dba79e4c8300dd08aeb37f8e728b8dad 0 file1
100644 9db8893856a8a02eaa73470054b7c1c5a7c82e47 0 file2
EOF
test_expect_success 'update-index --add' \ test_expect_success 'update-index --add' \
'echo hello world >file1 && 'echo hello world >file1 &&
echo goodbye people >file2 && echo goodbye people >file2 &&
git-update-index --add file1 file2 && git-update-index --add file1 file2 &&
git-ls-files -s >current && git-ls-files -s >current &&
cmp current - <<\EOF cmp current expected'
100644 3b18e512dba79e4c8300dd08aeb37f8e728b8dad 0 file1
100644 9db8893856a8a02eaa73470054b7c1c5a7c82e47 0 file2
EOF'
test_expect_success 'update-index --again' \ test_expect_success 'update-index --again' \
'rm -f file1 && 'rm -f file1 &&
@ -29,20 +30,22 @@ test_expect_success 'update-index --again' \
echo happy - failed as expected echo happy - failed as expected
fi && fi &&
git-ls-files -s >current && git-ls-files -s >current &&
cmp current - <<\EOF cmp current expected'
100644 3b18e512dba79e4c8300dd08aeb37f8e728b8dad 0 file1
100644 9db8893856a8a02eaa73470054b7c1c5a7c82e47 0 file2
EOF'
cat > expected <<\EOF
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
EOF
test_expect_success 'update-index --remove --again' \ test_expect_success 'update-index --remove --again' \
'git-update-index --remove --again && 'git-update-index --remove --again &&
git-ls-files -s >current && git-ls-files -s >current &&
cmp current - <<\EOF cmp current expected'
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
EOF'
test_expect_success 'first commit' 'git-commit -m initial' test_expect_success 'first commit' 'git-commit -m initial'
cat > expected <<\EOF
100644 53ab446c3f4e42ce9bb728a0ccb283a101be4979 0 dir1/file3
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
EOF
test_expect_success 'update-index again' \ test_expect_success 'update-index again' \
'mkdir -p dir1 && 'mkdir -p dir1 &&
echo hello world >dir1/file3 && echo hello world >dir1/file3 &&
@ -52,11 +55,12 @@ test_expect_success 'update-index again' \
echo happy >dir1/file3 && echo happy >dir1/file3 &&
git-update-index --again && git-update-index --again &&
git-ls-files -s >current && git-ls-files -s >current &&
cmp current - <<\EOF cmp current expected'
100644 53ab446c3f4e42ce9bb728a0ccb283a101be4979 0 dir1/file3
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
EOF'
cat > expected <<\EOF
100644 d7fb3f695f06c759dbf3ab00046e7cc2da22d10f 0 dir1/file3
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
EOF
test_expect_success 'update-index --update from subdir' \ test_expect_success 'update-index --update from subdir' \
'echo not so happy >file2 && 'echo not so happy >file2 &&
cd dir1 && cd dir1 &&
@ -64,19 +68,17 @@ test_expect_success 'update-index --update from subdir' \
git-update-index --again && git-update-index --again &&
cd .. && cd .. &&
git-ls-files -s >current && git-ls-files -s >current &&
cmp current - <<\EOF cmp current expected'
100644 d7fb3f695f06c759dbf3ab00046e7cc2da22d10f 0 dir1/file3
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
EOF'
cat > expected <<\EOF
100644 594fb5bb1759d90998e2bf2a38261ae8e243c760 0 dir1/file3
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
EOF
test_expect_success 'update-index --update with pathspec' \ test_expect_success 'update-index --update with pathspec' \
'echo very happy >file2 && 'echo very happy >file2 &&
cat file2 >dir1/file3 && cat file2 >dir1/file3 &&
git-update-index --again dir1/ && git-update-index --again dir1/ &&
git-ls-files -s >current && git-ls-files -s >current &&
cmp current - <<\EOF cmp current expected'
100644 594fb5bb1759d90998e2bf2a38261ae8e243c760 0 dir1/file3
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
EOF'
test_done test_done

17
t/t4012-diff-binary.sh
View file

@ -16,25 +16,20 @@ test_expect_success 'prepare repository' \
echo git >c && echo git >c &&
cat b b >d' cat b b >d'
test_expect_success 'diff without --binary' \ cat > expected <<\EOF
'git-diff | git-apply --stat --summary >current &&
cmp current - <<\EOF
a | 2 +- a | 2 +-
b | Bin b | Bin
c | 2 +- c | 2 +-
d | Bin d | Bin
4 files changed, 2 insertions(+), 2 deletions(-) 4 files changed, 2 insertions(+), 2 deletions(-)
EOF' EOF
test_expect_success 'diff without --binary' \
'git-diff | git-apply --stat --summary >current &&
cmp current expected'
test_expect_success 'diff with --binary' \ test_expect_success 'diff with --binary' \
'git-diff --binary | git-apply --stat --summary >current && 'git-diff --binary | git-apply --stat --summary >current &&
cmp current - <<\EOF cmp current expected'
a | 2 +-
b | Bin
c | 2 +-
d | Bin
4 files changed, 2 insertions(+), 2 deletions(-)
EOF'
# apply needs to be able to skip the binary material correctly # apply needs to be able to skip the binary material correctly
# in order to report the line number of a corrupt patch. # in order to report the line number of a corrupt patch.