diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-14 21:39:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-14 21:39:44 (GMT) |
| commit | 4b1e5e5d8c54b39e35150c044afb02aaeaa38184 (patch) | |
| tree | a364445007fbdf48f9fb3a1bb47b1d2a5c593e28 /t | |
| parent | 0498840b3517b8dcc1376a05b92c10c9e5b2e4ad (diff) | |
| parent | b928e488bd40a30797bb7b87733864b39dd32c36 (diff) | |
| download | git-4b1e5e5d8c54b39e35150c044afb02aaeaa38184.zip git-4b1e5e5d8c54b39e35150c044afb02aaeaa38184.tar.gz git-4b1e5e5d8c54b39e35150c044afb02aaeaa38184.tar.bz2 | |
Merge branch 'ds/bloom-cleanup'
Code cleanup and typofixes
* ds/bloom-cleanup:
completion: offer '--(no-)patch' among 'git log' options
bloom: use num_changes not nr for limit detection
bloom: de-duplicate directory entries
Documentation: changed-path Bloom filters use byte words
bloom: parse commit before computing filters
test-bloom: fix usage typo
bloom: fix whitespace around tab length
Diffstat (limited to 't')
| -rw-r--r-- | t/helper/test-bloom.c | 2 | ||||
| -rwxr-xr-x | t/t0095-bloom.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/t/helper/test-bloom.c b/t/helper/test-bloom.c index 456f5ea..f0aa80b 100644 --- a/t/helper/test-bloom.c +++ b/t/helper/test-bloom.c @@ -44,7 +44,7 @@ static void get_bloom_filter_for_commit(const struct object_id *commit_oid) } static const char *bloom_usage = "\n" -" test-tool bloom get_murmer3 <string>\n" +" test-tool bloom get_murmur3 <string>\n" " test-tool bloom generate_filter <string> [<string>...]\n" " test-tool get_filter_for_commit <commit-hex>\n"; diff --git a/t/t0095-bloom.sh b/t/t0095-bloom.sh index 809ec7b..232ba2c 100755 --- a/t/t0095-bloom.sh +++ b/t/t0095-bloom.sh @@ -89,8 +89,8 @@ test_expect_success 'get bloom filter for commit with 10 changes' ' git add smallDir && git commit -m "commit with 10 changes" && cat >expect <<-\EOF && - Filter_Length:25 - Filter_Data:82|a0|65|47|0c|92|90|c0|a1|40|02|a0|e2|40|e0|04|0a|9a|66|cf|80|19|85|42|23| + Filter_Length:14 + Filter_Data:02|b3|c4|a0|34|e7|fe|eb|cb|47|fe|a0|e8|72| EOF test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual && test_cmp expect actual @@ -100,7 +100,7 @@ test_expect_success EXPENSIVE 'get bloom filter for commit with 513 changes' ' rm actual && rm expect && mkdir bigDir && - for i in $(test_seq 0 512) + for i in $(test_seq 0 511) do echo $i >bigDir/$i done && |