Skip to content

Commit 407527b

Browse files
bk2204gitster
authored andcommitted
t9100: make test work with SHA-256
Compute the relevant tree objects for SHA-256 and use those when appropriate instead of using the SHA-1 ones. Signed-off-by: brian m. carlson <[email protected]> Acked-by: Eric Wong <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 606b974 commit 407527b

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

t/t9100-git-svn-basic.sh

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,10 @@ name='check imported tree checksums expected tree checksums'
208208
rm -f expected
209209
if test_have_prereq UTF8
210210
then
211-
echo tree dc68b14b733e4ec85b04ab6f712340edc5dc936e > expected
211+
echo tree dc68b14b733e4ec85b04ab6f712340edc5dc936e > expected.sha1
212+
echo tree b95b55b29d771f5eb73aa9b9d52d02fe11a2538c2feb0829f754ce20a91d98eb > expected.sha256
212213
fi
213-
cat >> expected <<\EOF
214+
cat >> expected.sha1 <<\EOF
214215
tree c3322890dcf74901f32d216f05c5044f670ce632
215216
tree d3ccd5035feafd17b030c5732e7808cc49122853
216217
tree d03e1630363d4881e68929d532746b20b0986b83
@@ -220,8 +221,20 @@ tree 149d63cd5878155c846e8c55d7d8487de283f89e
220221
tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
221222
tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
222223
EOF
224+
cat >> expected.sha256 <<\EOF
225+
tree 8d12756699d0b5b110514240a0ff141f6cbf8891fd69ab05e5594196fb437c9f
226+
tree 8187168d33f7d4ccb8c1cc6e99532810aaccb47658f35d19b3803072d1128d7a
227+
tree 74e535d85da8ee25eb23d7b506790c5ab3ccdb1ba0826bd57625ed44ef361650
228+
tree 6fd7dd963e3cdca0cbd6368ed3cfcc8037cc154d2e7719d9d369a0952364fd95
229+
tree 1fd6cec6aa95102d69266e20419bb62ec2a06372d614b9850ef23ff204103bb4
230+
tree 6fd7dd963e3cdca0cbd6368ed3cfcc8037cc154d2e7719d9d369a0952364fd95
231+
tree deb2b7ac79cd8ce6f52af6a5a0a08691e94ba74a2ed55966bb27dbec551730eb
232+
tree 59e2e936761188476a7752034e8aa0a822b34050c8504b0dfd946407f4bc9215
233+
EOF
223234

224-
test_expect_success POSIXPERM,SYMLINKS "$name" "test_cmp expected a"
235+
test_expect_success POSIXPERM,SYMLINKS "$name" '
236+
test_cmp expected.$(test_oid algo) a
237+
'
225238

226239
test_expect_success 'exit if remote refs are ambigious' '
227240
git config --add svn-remote.svn.fetch \

0 commit comments

Comments
 (0)