diff options
Diffstat (limited to 't/t2101-update-index-reupdate.sh')
| -rwxr-xr-x | t/t2101-update-index-reupdate.sh | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/t/t2101-update-index-reupdate.sh b/t/t2101-update-index-reupdate.sh index 77aed8d..a78ea7f 100755 --- a/t/t2101-update-index-reupdate.sh +++ b/t/t2101-update-index-reupdate.sh @@ -8,15 +8,16 @@ test_description='git-update-index --again test. . ./test-lib.sh +cat > expected <<\EOF +100644 3b18e512dba79e4c8300dd08aeb37f8e728b8dad 0 file1 +100644 9db8893856a8a02eaa73470054b7c1c5a7c82e47 0 file2 +EOF test_expect_success 'update-index --add' \ 'echo hello world >file1 && echo goodbye people >file2 && git-update-index --add file1 file2 && git-ls-files -s >current && - cmp current - <<\EOF -100644 3b18e512dba79e4c8300dd08aeb37f8e728b8dad 0 file1 -100644 9db8893856a8a02eaa73470054b7c1c5a7c82e47 0 file2 -EOF' + cmp current expected' test_expect_success 'update-index --again' \ 'rm -f file1 && @@ -29,20 +30,22 @@ test_expect_success 'update-index --again' \ echo happy - failed as expected fi && git-ls-files -s >current && - cmp current - <<\EOF -100644 3b18e512dba79e4c8300dd08aeb37f8e728b8dad 0 file1 -100644 9db8893856a8a02eaa73470054b7c1c5a7c82e47 0 file2 -EOF' + cmp current expected' +cat > expected <<\EOF +100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2 +EOF test_expect_success 'update-index --remove --again' \ 'git-update-index --remove --again && git-ls-files -s >current && - cmp current - <<\EOF -100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2 -EOF' + cmp current expected' 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' \ 'mkdir -p dir1 && echo hello world >dir1/file3 && @@ -52,11 +55,12 @@ test_expect_success 'update-index again' \ echo happy >dir1/file3 && git-update-index --again && git-ls-files -s >current && - cmp current - <<\EOF -100644 53ab446c3f4e42ce9bb728a0ccb283a101be4979 0 dir1/file3 -100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2 -EOF' + cmp current expected' +cat > expected <<\EOF +100644 d7fb3f695f06c759dbf3ab00046e7cc2da22d10f 0 dir1/file3 +100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2 +EOF test_expect_success 'update-index --update from subdir' \ 'echo not so happy >file2 && cd dir1 && @@ -64,19 +68,17 @@ test_expect_success 'update-index --update from subdir' \ git-update-index --again && cd .. && git-ls-files -s >current && - cmp current - <<\EOF -100644 d7fb3f695f06c759dbf3ab00046e7cc2da22d10f 0 dir1/file3 -100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2 -EOF' + cmp current expected' +cat > expected <<\EOF +100644 594fb5bb1759d90998e2bf2a38261ae8e243c760 0 dir1/file3 +100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2 +EOF test_expect_success 'update-index --update with pathspec' \ 'echo very happy >file2 && cat file2 >dir1/file3 && git-update-index --again dir1/ && git-ls-files -s >current && - cmp current - <<\EOF -100644 594fb5bb1759d90998e2bf2a38261ae8e243c760 0 dir1/file3 -100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2 -EOF' + cmp current expected' test_done |