Merge branch 'ta/config-set-2'

diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c
index e841b4a38d2b47c39d95683a5747cbc19da1f48b..972579f33c4b0adfb2240ef90b22980dc042c70a 100644 (file)
--- a/builtin/verify-pack.c
+++ b/builtin/verify-pack.c
@@ -27,10 +27,9 @@ static int verify_one_pack(const char *path, unsigned int flags)
         * normalize these forms to "foo.pack" for "index-pack --verify".
         */
        strbuf_addstr(&arg, path);
-       if (has_extension(arg.buf, ".idx"))
-               strbuf_splice(&arg, arg.len - 3, 3, "pack", 4);
-       else if (!has_extension(arg.buf, ".pack"))
-               strbuf_add(&arg, ".pack", 5);
+       if (strbuf_strip_suffix(&arg, ".idx") ||
+           !ends_with(arg.buf, ".pack"))
+               strbuf_addstr(&arg, ".pack");
        argv[2] = arg.buf;
 
        memset(&index_pack, 0, sizeof(index_pack));
@@ -53,7 +52,7 @@ static int verify_one_pack(const char *path, unsigned int flags)
 }
 
 static const char * const verify_pack_usage[] = {
-       "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>...",
+       N_("git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."),
        NULL
 };
 
@@ -63,9 +62,9 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix)
        unsigned int flags = 0;
        int i;
        const struct option verify_pack_options[] = {
-               OPT_BIT('v', "verbose", &flags, "verbose",
+               OPT_BIT('v', "verbose", &flags, N_("verbose"),
                        VERIFY_PACK_VERBOSE),
-               OPT_BIT('s', "stat-only", &flags, "show statistics only",
+               OPT_BIT('s', "stat-only", &flags, N_("show statistics only"),
                        VERIFY_PACK_STAT_ONLY),
                OPT_END()
        };