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

[git.git] / builtin-branch.c

diff --git a/builtin-branch.c b/builtin-branch.c
index c64768beb2c112fc32a65fb4070f01331ebf1540..e414c8898317736d632064d6c0545d7d128c6bc8 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -65,17 +65,20 @@ static int parse_branch_color_slot(const char *var, int ofs)
 static int git_branch_config(const char *var, const char *value)
 {
        if (!strcmp(var, "color.branch")) {
-               branch_use_color = git_config_colorbool(var, value);
+               branch_use_color = git_config_colorbool(var, value, -1);
                return 0;
        }
        if (!prefixcmp(var, "color.branch.")) {
                int slot = parse_branch_color_slot(var, 13);
+               if (!value)
+                       return config_error_nonbool(var);
                color_parse(value, var, branch_colors[slot]);
                return 0;
        }
-       if (!strcmp(var, "branch.autosetupmerge"))
-                       branch_track = git_config_bool(var, value);
-
+       if (!strcmp(var, "branch.autosetupmerge")) {
+               branch_track = git_config_bool(var, value);
+               return 0;
+       }
        return git_default_config(var, value);
 }