diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-04-11 13:09:54 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 13:09:54 +0900 |
| commit | 709f9f5b4b2d9f55fa95fcff92832f24cc09a8b8 (patch) | |
| tree | b90c0309f36e068ede6a1d86f080db142241aeca /t/t2107-update-index-basic.sh | |
| parent | Merge branch 'ab/drop-contrib-examples' (diff) | |
| parent | t2107: abstract away SHA-1-specific constants (diff) | |
| download | tgif-709f9f5b4b2d9f55fa95fcff92832f24cc09a8b8.tar.xz | |
Merge branch 'bc/hash-independent-tests'
Tests that rely on the exact hardcoded values of object names have
been updated in preparation for hash function migration.
* bc/hash-independent-tests:
t2107: abstract away SHA-1-specific constants
t2101: abstract away SHA-1-specific constants
t2101: modernize test style
t2020: abstract away SHA-1 specific constants
t1507: abstract away SHA-1-specific constants
t1411: abstract away SHA-1-specific constants
t1405: sort reflog entries in a hash-independent way
t1300: abstract away SHA-1-specific constants
t1304: abstract away SHA-1-specific constants
t1011: abstract away SHA-1-specific constants
Diffstat (limited to 't/t2107-update-index-basic.sh')
| -rwxr-xr-x | t/t2107-update-index-basic.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh index 32ac6e09bd..1db7e6a1ab 100755 --- a/t/t2107-update-index-basic.sh +++ b/t/t2107-update-index-basic.sh @@ -85,9 +85,9 @@ test_expect_success '--chmod=+x and chmod=-x in the same argument list' ' >B && git add A B && git update-index --chmod=+x A --chmod=-x B && - cat >expect <<-\EOF && - 100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 A - 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 B + cat >expect <<-EOF && + 100755 $EMPTY_BLOB 0 A + 100644 $EMPTY_BLOB 0 B EOF git ls-files --stage A B >actual && test_cmp expect actual |