Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t2101: abstract away SHA-1-specific constants
author
brian m. carlson
<sandals@crustytoothpaste.net>
Sun, 25 Mar 2018 19:20:54 +0000
(19:20 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 26 Mar 2018 22:10:48 +0000
(15:10 -0700)
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>
t/t2101-update-index-reupdate.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
7cbae72
)
diff --git
a/t/t2101-update-index-reupdate.sh
b/t/t2101-update-index-reupdate.sh
index 168733a3c7354c4d33439bf7b8475317391bf1bd..685ec45639a5e9a2bf929e10aa30976e9a4c456b 100755
(executable)
--- 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
. ./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 &&
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
'
cmp current expected
'
@@
-34,21
+34,17
@@
test_expect_success 'update-index --again' '
cmp current expected
'
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 &&
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'
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 &&
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 &&
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
'
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 &&
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 &&
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 &&
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
'
cmp current expected
'