summaryrefslogtreecommitdiff
path: root/builtin-commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-16 11:09:31 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-16 12:47:15 -0800
commita1bb8f45f1590f812badceea0b7c120074ec3e85 (patch)
tree3ce41a927bcca4baa26680cc33c79aa15fdc4795 /builtin-commit.c
parente25e2b4201716a912b29397515a858238497dbdd (diff)
parent527b9d704d929a2fff2f9bf1c5e2856725c1416d (diff)
downloadgit-a1bb8f45f1590f812badceea0b7c120074ec3e85.tar.gz
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-commit.c')
-rw-r--r--builtin-commit.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c
index e93a647c59..f54772f74a 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -890,7 +890,7 @@ static int parse_status_slot(const char *var, int offset)
return WT_STATUS_NOBRANCH;
if (!strcasecmp(var+offset, "unmerged"))
return WT_STATUS_UNMERGED;
- die("bad config variable '%s'", var);
+ return -1;
}
static int git_status_config(const char *k, const char *v, void *cb)
@@ -910,6 +910,8 @@ static int git_status_config(const char *k, const char *v, void *cb)
}
if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) {
int slot = parse_status_slot(k, 13);
+ if (slot < 0)
+ return 0;
if (!v)
return config_error_nonbool(k);
color_parse(v, k, s->color_palette[slot]);