cmd_fetch_pack(): return early if finish_connect() fails

diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 28c21743381db95f6ddb4b185ec34cdbff686866..a8eee886a5281965a0660308df9e94d14c1cb2b8 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
 };
 
@@ -58,15 +58,23 @@ static int verify_tag(const char *name, int verbose)
        return ret;
 }
 
+static int git_verify_tag_config(const char *var, const char *value, void *cb)
+{
+       int status = git_gpg_config(var, value, cb);
+       if (status)
+               return status;
+       return git_default_config(var, value, cb);
+}
+
 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()
        };
 
-       git_config(git_default_config, NULL);
+       git_config(git_verify_tag_config, NULL);
 
        argc = parse_options(argc, argv, prefix, verify_tag_options,
                             verify_tag_usage, PARSE_OPT_KEEP_ARGV0);