hash-object: cleanup handling of command line options

diff --git a/builtin-tag.c b/builtin-tag.c
index 03e70155fc676a8dd38ca5cef800ed4a446e921a..716b4fff323f7df638f8bed0940a1119e43c2590 100644 (file)
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -236,9 +236,6 @@ static int do_sign(struct strbuf *buffer)
        if (finish_command(&gpg) || !len || len < 0)
                return error("gpg failed to sign the tag");
 
-       if (len < 0)
-               return error("could not read the entire signature from gpg.");
-
        return 0;
 }
 
@@ -258,7 +255,7 @@ static int git_tag_config(const char *var, const char *value)
 {
        if (!strcmp(var, "user.signingkey")) {
                if (!value)
-                       die("user.signingkey without value");
+                       return config_error_nonbool(value);
                set_signingkey(value);
                return 0;
        }