зеркало из https://github.com/microsoft/git.git
t7063: make hash size independent
Use test_oid instead of hard-coding algorithm-specific constants and all-zero values. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
Junio C Hamano
Родитель
4bacb6d50e
Коммит
866be6ece4
|
|
@ -75,14 +75,24 @@ test_expect_success 'setup' '
|
|||
touch one two three done/one dtwo/two dthree/three &&
|
||||
git add one two done/one &&
|
||||
: >.git/info/exclude &&
|
||||
git update-index --untracked-cache
|
||||
git update-index --untracked-cache &&
|
||||
test_oid_cache <<-EOF
|
||||
root sha1:e6fcc8f2ee31bae321d66afd183fcb7237afae6e
|
||||
root sha256:b90c672088c015b9c83876e919da311bad4cd39639fb139f988af6a11493b974
|
||||
|
||||
exclude sha1:13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
||||
exclude sha256:fe4aaa1bbbbce4cb8f73426748a14c5ad6026b26f90505a0bf2494b165a5b76c
|
||||
|
||||
done sha1:1946f0437f90c5005533cbe1736a6451ca301714
|
||||
done sha256:7f079501d79f665b3acc50f5e0e9e94509084d5032ac20113a37dd5029b757cc
|
||||
EOF
|
||||
'
|
||||
|
||||
test_expect_success 'untracked cache is empty' '
|
||||
test-tool dump-untracked-cache >../actual &&
|
||||
cat >../expect-empty <<EOF &&
|
||||
info/exclude 0000000000000000000000000000000000000000
|
||||
core.excludesfile 0000000000000000000000000000000000000000
|
||||
info/exclude $ZERO_OID
|
||||
core.excludesfile $ZERO_OID
|
||||
exclude_per_dir .gitignore
|
||||
flags 00000006
|
||||
EOF
|
||||
|
|
@ -100,17 +110,17 @@ EOF
|
|||
|
||||
cat >../dump.expect <<EOF &&
|
||||
info/exclude $EMPTY_BLOB
|
||||
core.excludesfile 0000000000000000000000000000000000000000
|
||||
core.excludesfile $ZERO_OID
|
||||
exclude_per_dir .gitignore
|
||||
flags 00000006
|
||||
/ 0000000000000000000000000000000000000000 recurse valid
|
||||
/ $ZERO_OID recurse valid
|
||||
dthree/
|
||||
dtwo/
|
||||
three
|
||||
/done/ 0000000000000000000000000000000000000000 recurse valid
|
||||
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/done/ $ZERO_OID recurse valid
|
||||
/dthree/ $ZERO_OID recurse check_only valid
|
||||
three
|
||||
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/dtwo/ $ZERO_OID recurse check_only valid
|
||||
two
|
||||
EOF
|
||||
|
||||
|
|
@ -190,18 +200,18 @@ test_expect_success 'verify untracked cache dump' '
|
|||
test-tool dump-untracked-cache >../actual &&
|
||||
cat >../expect <<EOF &&
|
||||
info/exclude $EMPTY_BLOB
|
||||
core.excludesfile 0000000000000000000000000000000000000000
|
||||
core.excludesfile $ZERO_OID
|
||||
exclude_per_dir .gitignore
|
||||
flags 00000006
|
||||
/ 0000000000000000000000000000000000000000 recurse valid
|
||||
/ $ZERO_OID recurse valid
|
||||
dthree/
|
||||
dtwo/
|
||||
four
|
||||
three
|
||||
/done/ 0000000000000000000000000000000000000000 recurse valid
|
||||
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/done/ $ZERO_OID recurse valid
|
||||
/dthree/ $ZERO_OID recurse check_only valid
|
||||
three
|
||||
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/dtwo/ $ZERO_OID recurse check_only valid
|
||||
two
|
||||
EOF
|
||||
test_cmp ../expect ../actual
|
||||
|
|
@ -239,18 +249,18 @@ test_expect_success 'verify untracked cache dump' '
|
|||
test-tool dump-untracked-cache >../actual &&
|
||||
cat >../expect <<EOF &&
|
||||
info/exclude $EMPTY_BLOB
|
||||
core.excludesfile 0000000000000000000000000000000000000000
|
||||
core.excludesfile $ZERO_OID
|
||||
exclude_per_dir .gitignore
|
||||
flags 00000006
|
||||
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
||||
/ $(test_oid root) recurse valid
|
||||
.gitignore
|
||||
dthree/
|
||||
dtwo/
|
||||
three
|
||||
/done/ 0000000000000000000000000000000000000000 recurse valid
|
||||
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/done/ $ZERO_OID recurse valid
|
||||
/dthree/ $ZERO_OID recurse check_only valid
|
||||
three
|
||||
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/dtwo/ $ZERO_OID recurse check_only valid
|
||||
two
|
||||
EOF
|
||||
test_cmp ../expect ../actual
|
||||
|
|
@ -284,16 +294,16 @@ EOF
|
|||
test_expect_success 'verify untracked cache dump' '
|
||||
test-tool dump-untracked-cache >../actual &&
|
||||
cat >../expect <<EOF &&
|
||||
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
||||
core.excludesfile 0000000000000000000000000000000000000000
|
||||
info/exclude $(test_oid exclude)
|
||||
core.excludesfile $ZERO_OID
|
||||
exclude_per_dir .gitignore
|
||||
flags 00000006
|
||||
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
||||
/ $(test_oid root) recurse valid
|
||||
.gitignore
|
||||
dtwo/
|
||||
/done/ 0000000000000000000000000000000000000000 recurse valid
|
||||
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/done/ $ZERO_OID recurse valid
|
||||
/dthree/ $ZERO_OID recurse check_only valid
|
||||
/dtwo/ $ZERO_OID recurse check_only valid
|
||||
two
|
||||
EOF
|
||||
test_cmp ../expect ../actual
|
||||
|
|
@ -303,14 +313,14 @@ test_expect_success 'move two from tracked to untracked' '
|
|||
git rm --cached two &&
|
||||
test-tool dump-untracked-cache >../actual &&
|
||||
cat >../expect <<EOF &&
|
||||
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
||||
core.excludesfile 0000000000000000000000000000000000000000
|
||||
info/exclude $(test_oid exclude)
|
||||
core.excludesfile $ZERO_OID
|
||||
exclude_per_dir .gitignore
|
||||
flags 00000006
|
||||
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse
|
||||
/done/ 0000000000000000000000000000000000000000 recurse valid
|
||||
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/ $(test_oid root) recurse
|
||||
/done/ $ZERO_OID recurse valid
|
||||
/dthree/ $ZERO_OID recurse check_only valid
|
||||
/dtwo/ $ZERO_OID recurse check_only valid
|
||||
two
|
||||
EOF
|
||||
test_cmp ../expect ../actual
|
||||
|
|
@ -342,17 +352,17 @@ EOF
|
|||
test_expect_success 'verify untracked cache dump' '
|
||||
test-tool dump-untracked-cache >../actual &&
|
||||
cat >../expect <<EOF &&
|
||||
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
||||
core.excludesfile 0000000000000000000000000000000000000000
|
||||
info/exclude $(test_oid exclude)
|
||||
core.excludesfile $ZERO_OID
|
||||
exclude_per_dir .gitignore
|
||||
flags 00000006
|
||||
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
||||
/ $(test_oid root) recurse valid
|
||||
.gitignore
|
||||
dtwo/
|
||||
two
|
||||
/done/ 0000000000000000000000000000000000000000 recurse valid
|
||||
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/done/ $ZERO_OID recurse valid
|
||||
/dthree/ $ZERO_OID recurse check_only valid
|
||||
/dtwo/ $ZERO_OID recurse check_only valid
|
||||
two
|
||||
EOF
|
||||
test_cmp ../expect ../actual
|
||||
|
|
@ -362,14 +372,14 @@ test_expect_success 'move two from untracked to tracked' '
|
|||
git add two &&
|
||||
test-tool dump-untracked-cache >../actual &&
|
||||
cat >../expect <<EOF &&
|
||||
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
||||
core.excludesfile 0000000000000000000000000000000000000000
|
||||
info/exclude $(test_oid exclude)
|
||||
core.excludesfile $ZERO_OID
|
||||
exclude_per_dir .gitignore
|
||||
flags 00000006
|
||||
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse
|
||||
/done/ 0000000000000000000000000000000000000000 recurse valid
|
||||
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/ $(test_oid root) recurse
|
||||
/done/ $ZERO_OID recurse valid
|
||||
/dthree/ $ZERO_OID recurse check_only valid
|
||||
/dtwo/ $ZERO_OID recurse check_only valid
|
||||
two
|
||||
EOF
|
||||
test_cmp ../expect ../actual
|
||||
|
|
@ -401,16 +411,16 @@ EOF
|
|||
test_expect_success 'verify untracked cache dump' '
|
||||
test-tool dump-untracked-cache >../actual &&
|
||||
cat >../expect <<EOF &&
|
||||
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
||||
core.excludesfile 0000000000000000000000000000000000000000
|
||||
info/exclude $(test_oid exclude)
|
||||
core.excludesfile $ZERO_OID
|
||||
exclude_per_dir .gitignore
|
||||
flags 00000006
|
||||
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
||||
/ $(test_oid root) recurse valid
|
||||
.gitignore
|
||||
dtwo/
|
||||
/done/ 0000000000000000000000000000000000000000 recurse valid
|
||||
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/done/ $ZERO_OID recurse valid
|
||||
/dthree/ $ZERO_OID recurse check_only valid
|
||||
/dtwo/ $ZERO_OID recurse check_only valid
|
||||
two
|
||||
EOF
|
||||
test_cmp ../expect ../actual
|
||||
|
|
@ -447,16 +457,16 @@ EOF
|
|||
test_expect_success 'untracked cache correct after commit' '
|
||||
test-tool dump-untracked-cache >../actual &&
|
||||
cat >../expect <<EOF &&
|
||||
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
||||
core.excludesfile 0000000000000000000000000000000000000000
|
||||
info/exclude $(test_oid exclude)
|
||||
core.excludesfile $ZERO_OID
|
||||
exclude_per_dir .gitignore
|
||||
flags 00000006
|
||||
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
||||
/ $(test_oid root) recurse valid
|
||||
.gitignore
|
||||
dtwo/
|
||||
/done/ 0000000000000000000000000000000000000000 recurse valid
|
||||
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/done/ $ZERO_OID recurse valid
|
||||
/dthree/ $ZERO_OID recurse check_only valid
|
||||
/dtwo/ $ZERO_OID recurse check_only valid
|
||||
two
|
||||
EOF
|
||||
test_cmp ../expect ../actual
|
||||
|
|
@ -508,17 +518,17 @@ EOF
|
|||
test_expect_success 'untracked cache correct after status' '
|
||||
test-tool dump-untracked-cache >../actual &&
|
||||
cat >../expect <<EOF &&
|
||||
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
||||
core.excludesfile 0000000000000000000000000000000000000000
|
||||
info/exclude $(test_oid exclude)
|
||||
core.excludesfile $ZERO_OID
|
||||
exclude_per_dir .gitignore
|
||||
flags 00000006
|
||||
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
||||
/ $(test_oid root) recurse valid
|
||||
.gitignore
|
||||
dtwo/
|
||||
/done/ 1946f0437f90c5005533cbe1736a6451ca301714 recurse valid
|
||||
/done/ $(test_oid done) recurse valid
|
||||
five
|
||||
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/dthree/ $ZERO_OID recurse check_only valid
|
||||
/dtwo/ $ZERO_OID recurse check_only valid
|
||||
two
|
||||
EOF
|
||||
test_cmp ../expect ../actual
|
||||
|
|
@ -580,22 +590,22 @@ EOF
|
|||
test_expect_success 'verify untracked cache dump (sparse/subdirs)' '
|
||||
test-tool dump-untracked-cache >../actual &&
|
||||
cat >../expect-from-test-dump <<EOF &&
|
||||
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
||||
core.excludesfile 0000000000000000000000000000000000000000
|
||||
info/exclude $(test_oid exclude)
|
||||
core.excludesfile $ZERO_OID
|
||||
exclude_per_dir .gitignore
|
||||
flags 00000006
|
||||
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
||||
/ $(test_oid root) recurse valid
|
||||
.gitignore
|
||||
dtwo/
|
||||
/done/ 1946f0437f90c5005533cbe1736a6451ca301714 recurse valid
|
||||
/done/ $(test_oid done) recurse valid
|
||||
five
|
||||
sub/
|
||||
/done/sub/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/done/sub/ $ZERO_OID recurse check_only valid
|
||||
sub/
|
||||
/done/sub/sub/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/done/sub/sub/ $ZERO_OID recurse check_only valid
|
||||
file
|
||||
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
||||
/dthree/ $ZERO_OID recurse check_only valid
|
||||
/dtwo/ $ZERO_OID recurse check_only valid
|
||||
two
|
||||
EOF
|
||||
test_cmp ../expect-from-test-dump ../actual
|
||||
|
|
@ -806,8 +816,8 @@ test_expect_success '"status" after file replacement should be clean with UC=tru
|
|||
test-tool dump-untracked-cache >../actual &&
|
||||
grep -F "recurse valid" ../actual >../actual.grep &&
|
||||
cat >../expect.grep <<EOF &&
|
||||
/ 0000000000000000000000000000000000000000 recurse valid
|
||||
/two/ 0000000000000000000000000000000000000000 recurse valid
|
||||
/ $ZERO_OID recurse valid
|
||||
/two/ $ZERO_OID recurse valid
|
||||
EOF
|
||||
status_is_clean &&
|
||||
test_cmp ../expect.grep ../actual.grep
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче