diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-16 22:09:31 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-16 23:47:15 +0300 |
| commit | a1bb8f45f1590f812badceea0b7c120074ec3e85 (patch) | |
| tree | 3ce41a927bcca4baa26680cc33c79aa15fdc4795 /builtin-branch.c | |
| parent | e25e2b4201716a912b29397515a858238497dbdd (diff) | |
| parent | 527b9d704d929a2fff2f9bf1c5e2856725c1416d (diff) | |
Merge branch 'maint' to sync with 1.6.5.7
* maint:
Git 1.6.5.7
worktree: don't segfault with an absolute pathspec without a work tree
ignore unknown color configuration
help.autocorrect: do not run a command if the command given is junk
Illustrate "filter" attribute with an example
Diffstat (limited to 'builtin-branch.c')
| -rw-r--r-- | builtin-branch.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index 05e876e285..c87e63b02d 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -65,7 +65,7 @@ static int parse_branch_color_slot(const char *var, int ofs) 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) @@ -76,6 +76,8 @@ 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]); |