diff --git a/builtin-branch.c b/builtin-branch.c
index 9f57992062314a3d8d168b5cfb6b3c6737605033..c77f6328861a929d1564f131d38e91155bb9c858 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
return BRANCH_COLOR_LOCAL;
if (!strcasecmp(var+ofs, "current"))
return BRANCH_COLOR_CURRENT;
- die("bad config variable '%s'", var);
+ return -1;
}
static int git_branch_config(const char *var, const char *value, void *cb)
}
if (!prefixcmp(var, "color.branch.")) {
int slot = parse_branch_color_slot(var, 13);
+ if (slot < 0)
+ return 0;
if (!value)
return config_error_nonbool(var);
color_parse(value, var, branch_colors[slot]);