builtin-branch.c: guard config parser from value=NULL
color.branch.* configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Feb 11, 2008 at 10:45 UTC
5768c98ab8892ee0ca46e23ed46c4d94e0503e72
1 file changed
+6
-3
builtin-branch.c
+6
-3
@@ -70,12 +70,15 @@ static int git_branch_config(const char *var, const char *value)
70
}
71
if (!prefixcmp(var, "color.branch.")) {
72
int slot = parse_branch_color_slot(var, 13);
73
+ if (!value)
74
+ return config_error_nonbool(var);
75
color_parse(value, var, branch_colors[slot]);
76
return 0;
77
}
76
- if (!strcmp(var, "branch.autosetupmerge"))
77
- branch_track = git_config_bool(var, value);
78
-
78
+ if (!strcmp(var, "branch.autosetupmerge")) {
79
+ branch_track = git_config_bool(var, value);
80
+ return 0;
81
+ }
82
return git_default_config(var, value);
83
}
84