Merge branch 'cc/test-helper-bloom-usage-fix'

Usage message fix for a test helper.

* cc/test-helper-bloom-usage-fix:
  test-bloom: fix missing 'bloom' from usage string

diff --combined t/helper/test-bloom.c
index 2a1ae3dae6ab173399a6749b646c05a8e1be1969,bfabf9c5f45428483ac002d828ae8377e2914d6f..ad3ef1cd77ae1b98db3c46980d1439f1ca5f56e7
--- 1/t/helper/test-bloom.c
--- 2/t/helper/test-bloom.c
+++ b/t/helper/test-bloom.c
@@@ -3,7 -3,7 +3,7 @@@
  #include "test-tool.h"
  #include "commit.h"
  
 -struct bloom_filter_settings settings = DEFAULT_BLOOM_FILTER_SETTINGS;
 +static struct bloom_filter_settings settings = DEFAULT_BLOOM_FILTER_SETTINGS;
  
  static void add_string_to_filter(const char *data, struct bloom_filter *filter) {
                struct bloom_key key;
@@@ -39,21 -39,17 +39,21 @@@ static void get_bloom_filter_for_commit
        struct bloom_filter *filter;
        setup_git_directory();
        c = lookup_commit(the_repository, commit_oid);
 -      filter = get_bloom_filter(the_repository, c, 1);
 +      filter = get_or_compute_bloom_filter(the_repository, c, 1,
 +                                           &settings,
 +                                           NULL);
        print_bloom_filter(filter);
  }
  
  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";
+ "  test-tool bloom get_filter_for_commit <commit-hex>\n";
  
  int cmd__bloom(int argc, const char **argv)
  {
 +      setup_git_directory();
 +
        if (argc < 2)
                usage(bloom_usage);
  
@@@ -69,7 -65,7 +69,7 @@@
                struct bloom_filter filter;
                int i = 2;
                filter.len =  (settings.bits_per_entry + BITS_PER_WORD - 1) / BITS_PER_WORD;
 -              filter.data = xcalloc(filter.len, sizeof(unsigned char));
 +              CALLOC_ARRAY(filter.data, filter.len);
  
                if (argc - 1 < i)
                        usage(bloom_usage);