diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-25 19:20:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-26 15:10:48 -0700 |
| commit | 736f2efcfb841b11e25007f6baebd4a4c64bcaa5 (patch) | |
| tree | b174ff0de72567c2ee76ef5ace759776b2bb11ec | |
| parent | 7cbae724a4e35a55fb788f78be38e88748e25c24 (diff) | |
| download | git-736f2efcfb841b11e25007f6baebd4a4c64bcaa5.tar.gz | |
t2101: abstract away SHA-1-specific constants
Adjust the test so that it uses variables and command substitution for
blobs instead of hard-coded hashes.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t2101-update-index-reupdate.sh | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/t/t2101-update-index-reupdate.sh b/t/t2101-update-index-reupdate.sh index 168733a3c7..685ec45639 100755 --- a/t/t2101-update-index-reupdate.sh +++ b/t/t2101-update-index-reupdate.sh @@ -8,15 +8,15 @@ 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 && + cat >expected <<-EOF && + 100644 $(git hash-object file1) 0 file1 + 100644 $(git hash-object file2) 0 file2 + EOF cmp current expected ' @@ -34,21 +34,17 @@ test_expect_success 'update-index --again' ' 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 && + cat >expected <<-EOF && + 100644 $(git hash-object file2) 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 && @@ -58,13 +54,14 @@ test_expect_success 'update-index again' ' echo happy >dir1/file3 && git update-index --again && git ls-files -s >current && + cat >expected <<-EOF && + 100644 $(git hash-object dir1/file3) 0 dir1/file3 + 100644 $(git hash-object file2) 0 file2 + EOF cmp current expected ' -cat > expected <<\EOF -100644 d7fb3f695f06c759dbf3ab00046e7cc2da22d10f 0 dir1/file3 -100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2 -EOF +file2=$(git hash-object file2) test_expect_success 'update-index --update from subdir' ' echo not so happy >file2 && (cd dir1 && @@ -72,18 +69,22 @@ test_expect_success 'update-index --update from subdir' ' git update-index --again ) && git ls-files -s >current && - cmp current expected + cat >expected <<-EOF && + 100644 $(git hash-object dir1/file3) 0 dir1/file3 + 100644 $file2 0 file2 + EOF + test_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 && + cat >expected <<-EOF && + 100644 $(git hash-object dir1/file3) 0 dir1/file3 + 100644 $file2 0 file2 + EOF cmp current expected ' |