diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-07-28 23:18:04 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-07-28 23:18:04 +0300 |
commit | 7f554a4f694dc5e9a3cb42887546a121ff9d2b93 (patch) | |
tree | 37214dbf4da7779338af9a7156dae1eb31f99be2 /builtin | |
parent | aaf113ed95f58d83a81ccdaf32e41a5d8f1d98cf (diff) | |
parent | 88617d11f9d2ee1ea726cef4527d676a9a46fa63 (diff) |
Merge branch 'tb/reverse-midx'
The code that gives an error message in "git multi-pack-index" when
no subcommand is given tried to print a NULL pointer as a strong,
which has been corrected.
* tb/reverse-midx:
multi-pack-index: fix potential segfault without sub-command
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/multi-pack-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c index 5d3ea445fd..8ff0dee2ec 100644 --- a/builtin/multi-pack-index.c +++ b/builtin/multi-pack-index.c @@ -176,8 +176,8 @@ int cmd_multi_pack_index(int argc, const char **argv, else if (!strcmp(argv[0], "expire")) return cmd_multi_pack_index_expire(argc, argv); else { -usage: error(_("unrecognized subcommand: %s"), argv[0]); +usage: usage_with_options(builtin_multi_pack_index_usage, builtin_multi_pack_index_options); } |