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

t: remove test_oid_init in tests

Browse Source 
Now that we call test_oid_init in the setup for all test scripts,
there's no point in calling it individually.  Remove all of the places
where we've done so to help keep tests tidy.

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 2020-07-29 23:14:28 +00:00 committed by Junio C Hamano
parent 4feb562fc9
commit e023ff0691
28 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
t/lib-pack.sh
View File

@ -35,8 +35,6 @@ pack_header () {
# have hardcoded some well-known objects. See the case statements below for the
# complete list.
pack_obj () {
test_oid_init
case "$1" in
# empty blob
$EMPTY_BLOB)
@ -121,7 +119,6 @@ pack_obj () {
# Compute and append pack trailer to "$1"
pack_trailer () {
test_oid_init &&
test-tool $(test_oid algo) -b <"$1" >trailer.tmp &&
cat trailer.tmp >>"$1" &&
rm -f trailer.tmp

1
t/lib-submodule-update.sh
View File

@ -196,7 +196,6 @@ test_git_directory_exists () {
# the submodule repo if it doesn't exist and configures the most problematic
# settings for diff.ignoreSubmodules.
prolog () {
test_oid_init &&
(test -d submodule_update_repo || create_lib_submodule_repo) &&
test_config_global diff.ignoreSubmodules all &&
test_config diff.ignoreSubmodules all

4
t/t0000-basic.sh
View File

@ -891,10 +891,6 @@ test_expect_success 'test_atexit is run' "
test_path_is_missing also-clean-atexit
"
test_expect_success 'test_oid setup' '
test_oid_init
'
test_expect_success 'test_oid provides sane info by default' '
test_oid zero >actual &&
grep "^00*\$" actual &&

2
t/t1006-cat-file.sh
View File

@ -140,8 +140,6 @@ test_expect_success '--batch-check without %(rest) considers whole line' '
test_cmp expect actual
'
test_oid_init
tree_sha1=$(git write-tree)
tree_size=$(($(test_oid rawsz) + 13))
tree_pretty_content="100644 blob $hello_sha1 hello"

1
t/t1050-large.sh
View File

@ -12,7 +12,6 @@ file_size () {
}
test_expect_success setup '
test_oid_init &&
# clone does not allow us to pass core.bigfilethreshold to
# new repos, so set core.bigfilethreshold globally
git config --global core.bigfilethreshold 200k &&

1
t/t1410-reflog.sh
View File

@ -54,7 +54,6 @@ check_dont_have () {
}
test_expect_success setup '
test_oid_init &&
mkdir -p A/B &&
echo rat >C &&
echo ox >A/D &&

1
t/t1450-fsck.sh
View File

@ -9,7 +9,6 @@ test_description='git fsck random collection of tests
. ./test-lib.sh
test_expect_success setup '
test_oid_init &&
git config gc.auto 0 &&
git config i18n.commitencoding ISO-8859-1 &&
test_commit A fileA one &&

1
t/t1500-rev-parse.sh
View File

@ -59,7 +59,6 @@ test_rev_parse () {
ROOT=$(pwd)
test_expect_success 'setup' '
test_oid_init &&
mkdir -p sub/dir work &&
cp -R .git repo.git
'

1
t/t3308-notes-merge.sh
View File

@ -22,7 +22,6 @@ test_expect_success setup '
# Copy notes to remote-notes
git fetch . refs/notes/*:refs/remote-notes/origin/* &&
test_oid_init &&
test_oid_cache <<-EOF
hash4a sha1:5e93d24084d32e1cb61f7070505b9d2530cca987
hash3a sha1:8366731eeee53787d2bdf8fc1eff7d94757e8da0

1
t/t3600-rm.sh
View File

@ -241,7 +241,6 @@ test_expect_success 'refresh index before checking if it is up-to-date' '
'
test_expect_success 'choking "git rm" should not let it die with cruft' '
test_oid_init &&
git reset -q --hard &&
test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
i=0 &&

1
t/t3800-mktag.sh
View File

@ -23,7 +23,6 @@ check_verify_failure () {
# first create a commit, so we have a valid object/type
# for the tag.
test_expect_success 'setup' '
test_oid_init &&
echo Hello >A &&
git update-index --add A &&
git commit -m "Initial commit" &&

2
t/t4002-diff-basic.sh
View File

@ -10,8 +10,6 @@ test_description='Test diff raw-output.
. "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
test_oid_init
test_oid_cache <<\EOF
aa_1 sha1:ccba72ad3888a3520b39efcf780b9ee64167535d
aa_1 sha256:9febfbf18197819b2735c45291f138525d2476d59470f98239647544586ba403

1
t/t4027-diff-submodule.sh
View File

@ -6,7 +6,6 @@ test_description='difference in submodules'
. "$TEST_DIRECTORY"/diff-lib.sh
test_expect_success setup '
test_oid_init &&
test_tick &&
test_create_repo sub &&
(

1
t/t4134-apply-submodule.sh
View File

@ -8,7 +8,6 @@ test_description='git apply submodule tests'
. ./test-lib.sh
test_expect_success setup '
test_oid_init &&
cat > create-sm.patch <<EOF &&
diff --git a/dir/sm b/dir/sm
new file mode 160000

1
t/t4200-rerere.sh
View File

@ -25,7 +25,6 @@ test_description='git rerere
. ./test-lib.sh
test_expect_success 'setup' '
test_oid_init &&
cat >a1 <<-\EOF &&
Some title
==========

1
t/t4211-line-log.sh
View File

@ -4,7 +4,6 @@ test_description='test log -L'
. ./test-lib.sh
test_expect_success 'setup (import history)' '
test_oid_init &&
git fast-import < "$TEST_DIRECTORY"/t4211/history.export &&
git reset --hard
'

3
t/t5300-pack-object.sh
View File

@ -12,8 +12,7 @@ TRASH=$(pwd)
test_expect_success \
'setup' \
'test_oid_init &&
rm -f .git/index* &&
'rm -f .git/index* &&
perl -e "print \"a\" x 4096;" > a &&
perl -e "print \"b\" x 4096;" > b &&
perl -e "print \"c\" x 4096;" > c &&

1
t/t5302-pack-index.sh
View File

@ -7,7 +7,6 @@ test_description='pack index with 64-bit offsets and object CRC'
. ./test-lib.sh
test_expect_success 'setup' '
test_oid_init &&
rawsz=$(test_oid rawsz) &&
rm -rf .git &&
git init &&

1
t/t5313-pack-bounds-checks.sh
View File

@ -45,7 +45,6 @@ extended_table () {
}
test_expect_success 'setup' '
test_oid_init &&
test_oid_cache <<-EOF
oid000 sha1:1485
oid000 sha256:4222

3
t/t5318-commit-graph.sh
View File

@ -10,8 +10,7 @@ test_expect_success 'setup full repo' '
cd "$TRASH_DIRECTORY/full" &&
git init &&
git config core.commitGraph true &&
objdir=".git/objects" &&
test_oid_init
objdir=".git/objects"
'
test_expect_success POSIXPERM 'tweak umask for modebit tests' '

1
t/t5319-multi-pack-index.sh
View File

@ -29,7 +29,6 @@ midx_read_expect () {
}
test_expect_success 'setup' '
test_oid_init &&
test_oid_cache <<-EOF
idxoff sha1:2999
idxoff sha256:3739

1
t/t5324-split-commit-graph.sh
View File

@ -12,7 +12,6 @@ test_expect_success 'setup repo' '
git config gc.writeCommitGraph false &&
infodir=".git/objects/info" &&
graphdir="$infodir/commit-graphs" &&
test_oid_init &&
test_oid_cache <<-EOM
shallow sha1:1760
shallow sha256:2064

1
t/t5504-fetch-receive-strict.sh
View File

@ -4,7 +4,6 @@ test_description='fetch/receive strict mode'
. ./test-lib.sh
test_expect_success 'setup and inject "corrupt or missing" object' '
test_oid_init &&
echo hello >greetings &&
git add greetings &&
git commit -m greetings &&

1
t/t5530-upload-pack-error.sh
View File

@ -14,7 +14,6 @@ corrupt_repo () {
}
test_expect_success 'setup and corrupt repository' '
test_oid_init &&
echo file >file &&
git add file &&
git rev-parse :file &&

1
t/t5562-http-backend-content-length.sh
View File

@ -46,7 +46,6 @@ ssize_b100dots() {
}
test_expect_success 'setup' '
test_oid_init &&
HTTP_CONTENT_ENCODING="identity" &&
export HTTP_CONTENT_ENCODING &&
git config http.receivepack true &&

1
t/t5702-protocol-v2.sh
View File

@ -13,7 +13,6 @@ start_git_daemon --export-all --enable=receive-pack
daemon_parent=$GIT_DAEMON_DOCUMENT_ROOT_PATH/parent
test_expect_success 'create repo to be served by git-daemon' '
test_oid_init &&
git init "$daemon_parent" &&
test_commit -C "$daemon_parent" one
'

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

@ -43,7 +43,6 @@ write_command () {
# \ | /
# a
test_expect_success 'setup repository' '
test_oid_init &&
test_commit a &&
git checkout -b o/foo &&
test_commit b &&

1
t/t6006-rev-list-format.sh
View File

@ -32,7 +32,6 @@ changed_iso88591=$(echo "$changed" | iconv -f utf-8 -t $test_encoding)
truncate_count=20
test_expect_success 'setup' '
test_oid_init &&
: >foo &&
git add foo &&
git config i18n.commitEncoding $test_encoding &&