diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 17:29:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 17:29:08 (GMT) |
| commit | caa25f75be9ee085332208c5c1fe13644e9f0b34 (patch) | |
| tree | 6aa460a74cc8392cd0c723b47b2933b0a29c9c1e /t | |
| parent | 716c4699ce920ca4ae30da32c262c51a56e4c625 (diff) | |
| parent | f1068efefe6dd3beaa89484db5e2db730b094e0b (diff) | |
| download | git-caa25f75be9ee085332208c5c1fe13644e9f0b34.zip git-caa25f75be9ee085332208c5c1fe13644e9f0b34.tar.gz git-caa25f75be9ee085332208c5c1fe13644e9f0b34.tar.bz2 | |
Merge branch 'jk/drop-sha1-entry-pos'
Code clean-up.
* jk/drop-sha1-entry-pos:
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 9c5a876..156ae9e 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 1b6e53f..5e3ca30 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 |