Merge git://repo.or.cz/git-gui

diff --git a/builtin-tag.c b/builtin-tag.c
index e675206de38f0709b4c07e1667d791bf9b6704cb..3c97c696a50cb55e78774c743436cf50cad35f96 100644 (file)
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -260,7 +260,7 @@ static int git_tag_config(const char *var, const char *value, void *cb)
 {
        if (!strcmp(var, "user.signingkey")) {
                if (!value)
-                       return config_error_nonbool(value);
+                       return config_error_nonbool(var);
                set_signingkey(value);
                return 0;
        }