diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:06 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:06 +0900 |
| commit | 7c9375db0e3063cf2f20970ff9e36e720f823181 (patch) | |
| tree | 390e022d3cf81b5c6a250b065b9f4adf24bcdb37 /t | |
| parent | d9e85860567cdbf867a9af20997735f06db12ec5 (diff) | |
| parent | 39b00fa4d41d0fae458d03df0ebc0bf7dfde6ac8 (diff) | |
| download | git-7c9375db0e3063cf2f20970ff9e36e720f823181.tar.gz | |
Merge branch 'jk/drop-sha1-entry-pos' into maint
Code clean-up.
* jk/drop-sha1-entry-pos:
sha1-lookup: remove sha1_entry_pos() from header file
sha1_file: drop experimental GIT_USE_LOOKUP search
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5308-pack-detect-duplicates.sh | 11 | ||||
| -rw-r--r-- | t/test-lib.sh | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/t/t5308-pack-detect-duplicates.sh b/t/t5308-pack-detect-duplicates.sh index 9c5a8766ab..156ae9e9d3 100755 --- a/t/t5308-pack-detect-duplicates.sh +++ b/t/t5308-pack-detect-duplicates.sh @@ -56,20 +56,11 @@ test_expect_success 'create batch-check test vectors' ' EOF ' -test_expect_success 'lookup in duplicated pack (binary search)' ' +test_expect_success 'lookup in duplicated pack' ' git cat-file --batch-check <input >actual && test_cmp expect actual ' -test_expect_success 'lookup in duplicated pack (GIT_USE_LOOKUP)' ' - ( - GIT_USE_LOOKUP=1 && - export GIT_USE_LOOKUP && - git cat-file --batch-check <input >actual - ) && - test_cmp expect actual -' - test_expect_success 'index-pack can reject packs with duplicates' ' clear_packs && create_pack dups.pack 2 && diff --git a/t/test-lib.sh b/t/test-lib.sh index 51f52dcd4e..5fbd8d4a90 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -99,7 +99,6 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e ' my $ok = join("|", qw( TRACE DEBUG - USE_LOOKUP TEST .*_TEST PROVE |