Merge branch 'maint-1.5.4' into maint

[git.git] / builtin-config.c

diff --git a/builtin-config.c b/builtin-config.c
index 404bb449aec1e24012b390b1d76f05d4cc9c74af..c34bc8b6a6957ccee1db23a3c44c99e058384689 100644 (file)
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -169,6 +169,8 @@ static char parsed_color[COLOR_MAXLEN];
 static int git_get_color_config(const char *var, const char *value)
 {
        if (!strcmp(var, get_color_slot)) {
+               if (!value)
+                       config_error_nonbool(var);
                color_parse(value, var, parsed_color);
                get_color_found = 1;
        }
@@ -262,7 +264,7 @@ static int get_colorbool(int argc, const char **argv)
 
 int cmd_config(int argc, const char **argv, const char *prefix)
 {
-       int nongit = 0;
+       int nongit;
        char* value;
        const char *file = setup_git_directory_gently(&nongit);