Merge branch 'rt/rebase-p-no-merge-summary'

diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 986789f706911d122e24b0d784ab193e2ec3b74b..9cdf332333b95b3ab2ea6e133f345105bd67d019 100644 (file)
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -14,7 +14,7 @@
 #include "gpg-interface.h"
 
 static const char * const verify_tag_usage[] = {
-               "git verify-tag [-v|--verbose] <tag>...",
+               N_("git verify-tag [-v|--verbose] <tag>..."),
                NULL
 };
 
@@ -29,7 +29,7 @@ static int run_gpg_verify(const char *buf, unsigned long size, int verbose)
        if (size == len)
                return error("no signature found");
 
-       return verify_signed_buffer(buf, len, buf + len, size - len, NULL);
+       return verify_signed_buffer(buf, len, buf + len, size - len, NULL, NULL);
 }
 
 static int verify_tag(const char *name, int verbose)
@@ -70,7 +70,7 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)
 {
        int i = 1, verbose = 0, had_error = 0;
        const struct option verify_tag_options[] = {
-               OPT__VERBOSE(&verbose, "print tag contents"),
+               OPT__VERBOSE(&verbose, N_("print tag contents")),
                OPT_END()
        };