undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5703: make test work with SHA-256

Browse Source 
This test used an object ID which was 40 hex characters in length,
causing the test not only not to pass, but to hang, when run with
SHA-256 as the hash.  Change this value to a fixed dummy object ID using
test_oid_init and test_oid.

Furthermore, ensure we extract an object ID of the appropriate length
using cut with fields instead of a fixed length.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2020-02-07 00:52:51 +00:00 committed by Junio C Hamano
parent 88ed241a7e
commit d341e0805d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
t/t5703-upload-pack-ref-in-want.sh
View File

@ -19,7 +19,7 @@ get_actual_commits () {
}' <out | test-tool pkt-line unpack-sideband >o.pack && }' <out | test-tool pkt-line unpack-sideband >o.pack &&
git index-pack o.pack && git index-pack o.pack &&
git verify-pack -v o.idx >objs && git verify-pack -v o.idx >objs &&
grep commit objs | cut -c-40 | sort >actual_commits grep commit objs | cut -d" " -f1 | sort >actual_commits
} }
check_output () { check_output () {
@ -37,6 +37,7 @@ check_output () {
# \ | / # \ | /
# a # a
test_expect_success 'setup repository' ' test_expect_success 'setup repository' '
test_oid_init &&
test_commit a && test_commit a &&
git checkout -b o/foo && git checkout -b o/foo &&
test_commit b && test_commit b &&
@ -333,7 +334,7 @@ test_expect_success 'server is initially ahead - no ref in want' '
git -C "$REPO" config uploadpack.allowRefInWant false && git -C "$REPO" config uploadpack.allowRefInWant false &&
rm -rf local && rm -rf local &&
cp -r "$LOCAL_PRISTINE" local && cp -r "$LOCAL_PRISTINE" local &&
inconsistency master 1234567890123456789012345678901234567890 && inconsistency master $(test_oid numeric) &&
test_must_fail git -C local fetch 2>err && test_must_fail git -C local fetch 2>err &&
test_i18ngrep "fatal: remote error: upload-pack: not our ref" err test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
' '
@ -342,7 +343,7 @@ test_expect_success 'server is initially ahead - ref in want' '
git -C "$REPO" config uploadpack.allowRefInWant true && git -C "$REPO" config uploadpack.allowRefInWant true &&
rm -rf local && rm -rf local &&
cp -r "$LOCAL_PRISTINE" local && cp -r "$LOCAL_PRISTINE" local &&
inconsistency master 1234567890123456789012345678901234567890 && inconsistency master $(test_oid numeric) &&
git -C local fetch && git -C local fetch &&
git -C "$REPO" rev-parse --verify master >expected && git -C "$REPO" rev-parse --verify master >expected &&