t3311: make test work with SHA-256
Replace the hard-coded SHA-1 constants with the use of test_oid to look up an appropriate constant for each hash algorithm. In addition, adjust the fanout checks to look for either zero or one slashes in the filename without needing to check for an explicit length. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Feb 7, 2020 at 00:52 UTC
5df0f11f079fa83db8269f2d9818d93a240b115c
1 file changed
+35
-25
t/t3311-notes-merge-fanout.sh
+35
-25
@@ -29,15 +29,10 @@ verify_fanout () {
29
git ls-tree -r --name-only "refs/notes/$notes_ref" |
30
while read path
31
do
32
- case "$path" in
33
- ??/??????????????????????????????????????)
34
- : true
35
- ;;
36
- *)
32
+ echo "$path" | grep "^../[0-9a-f]*$" || {
33
echo "Invalid path \"$path\"" &&
38
- return 1
39
- ;;
40
- esac
34
+ return 1;
35
+ }
36
done
37
}
38
@@ -48,15 +43,10 @@ verify_no_fanout () {
43
git ls-tree -r --name-only "refs/notes/$notes_ref" |
44
while read path
45
do
51
- case "$path" in
52
- ????????????????????????????????????????)
53
- : true
54
- ;;
55
- *)
46
+ echo "$path" | grep -v "^../.*" || {
47
echo "Invalid path \"$path\"" &&
57
- return 1
58
- ;;
59
- esac
48
+ return 1;
49
+ }
50
done
51
}
52
@@ -67,7 +57,27 @@ test_expect_success 'setup a few initial commits with notes (notes ref: x)' '
57
do
58
test_commit "commit$i" >/dev/null &&
59
git notes add -m "notes for commit$i" || return 1
70
- done
60
+ done &&
61
+
62
+ git log --format=oneline &&
63
+
64
+ test_oid_cache <<-EOF
65
+ hash05a sha1:aed91155c7a72c2188e781fdf40e0f3761b299db
66
+ hash04a sha1:99fab268f9d7ee7b011e091a436c78def8eeee69
67
+ hash03a sha1:953c20ae26c7aa0b428c20693fe38bc687f9d1a9
68
+ hash02a sha1:6358796131b8916eaa2dde6902642942a1cb37e1
69
+ hash01a sha1:b02d459c32f0e68f2fe0981033bb34f38776ba47
70
+ hash03b sha1:9f506ee70e20379d7f78204c77b334f43d77410d
71
+ hash02b sha1:23a47d6ea7d589895faf800752054818e1e7627b
72
+
73
+ hash05a sha256:3aae5d26619d96dba93795f66325716e4cbc486884f95a6adee8fb0615a76d12
74
+ hash04a sha256:07e43dd3d89fe634d3252e253b426aacc7285a995dcdbcf94ac284060a1122cf
75
+ hash03a sha256:26fb52eaa7f4866bf735254587be7b31209ec10e525912ffd8e8ba549ba892ff
76
+ hash02a sha256:b57ebdf23634e750dcbc4b9a37991d70f90830d568a0e4529ce9de0a3f8d605c
77
+ hash01a sha256:377903b1572bd5117087a5518fcb1011b5053cccbc59e3c7c823a8615204173b
78
+ hash03b sha256:04e7b392fda7c185bfa17c9179b56db732edc2dc2b3bf887308dcaabb717270d
79
+ hash02b sha256:66099aaaec49a485ed990acadd9a9b81232ea592079964113d8f581ff69ef50b
80
+ EOF
81
'
82
83
commit_sha1=$(git rev-parse commit1^{commit})
@@ -77,11 +87,11 @@ commit_sha4=$(git rev-parse commit4^{commit})
87
commit_sha5=$(git rev-parse commit5^{commit})
88
89
cat <<EOF | sort >expect_notes_x
80
-aed91155c7a72c2188e781fdf40e0f3761b299db $commit_sha5
81
-99fab268f9d7ee7b011e091a436c78def8eeee69 $commit_sha4
82
-953c20ae26c7aa0b428c20693fe38bc687f9d1a9 $commit_sha3
83
-6358796131b8916eaa2dde6902642942a1cb37e1 $commit_sha2
84
-b02d459c32f0e68f2fe0981033bb34f38776ba47 $commit_sha1
90
+$(test_oid hash05a) $commit_sha5
91
+$(test_oid hash04a) $commit_sha4
92
+$(test_oid hash03a) $commit_sha3
93
+$(test_oid hash02a) $commit_sha2
94
+$(test_oid hash01a) $commit_sha1
95
EOF
96
97
cat >expect_log_x <<EOF
@@ -145,9 +155,9 @@ test_expect_success 'Fast-forward merge (y => x)' '
155
'
156
157
cat <<EOF | sort >expect_notes_z
148
-9f506ee70e20379d7f78204c77b334f43d77410d $commit_sha3
149
-23a47d6ea7d589895faf800752054818e1e7627b $commit_sha2
150
-b02d459c32f0e68f2fe0981033bb34f38776ba47 $commit_sha1
158
+$(test_oid hash03b) $commit_sha3
159
+$(test_oid hash02b) $commit_sha2
160
+$(test_oid hash01a) $commit_sha1
161
EOF
162
163
cat >expect_log_z <<EOF