mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/parse-config-slot'

Browse Source 
Code cleanup.

* jn/parse-config-slot:
  color_parse: do not mention variable name in error message
  pass config slots as pointers instead of offsets
This commit is contained in:
Junio C Hamano
2014-10-20 12:23:48 -07:00
parent b67588d018 f6c5a2968c
commit b946576839
13 changed files with 47 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/commit.c
View File

@ -1272,22 +1272,21 @@ static int dry_run_commit(int argc, const char **argv, const char *prefix,
return commitable ? 0 : 1;
}
static int parse_status_slot(const char *var, int offset)
static int parse_status_slot(const char *slot)
{
if (!strcasecmp(var+offset, "header"))
if (!strcasecmp(slot, "header"))
return WT_STATUS_HEADER;
if (!strcasecmp(var+offset, "branch"))
if (!strcasecmp(slot, "branch"))
return WT_STATUS_ONBRANCH;
if (!strcasecmp(var+offset, "updated")
|| !strcasecmp(var+offset, "added"))
if (!strcasecmp(slot, "updated") || !strcasecmp(slot, "added"))
return WT_STATUS_UPDATED;
if (!strcasecmp(var+offset, "changed"))
if (!strcasecmp(slot, "changed"))
return WT_STATUS_CHANGED;
if (!strcasecmp(var+offset, "untracked"))
if (!strcasecmp(slot, "untracked"))
return WT_STATUS_UNTRACKED;
if (!strcasecmp(var+offset, "nobranch"))
if (!strcasecmp(slot, "nobranch"))
return WT_STATUS_NOBRANCH;
if (!strcasecmp(var+offset, "unmerged"))
if (!strcasecmp(slot, "unmerged"))
return WT_STATUS_UNMERGED;
return -1;
}
@ -1327,13 +1326,12 @@ static int git_status_config(const char *k, const char *v, void *cb)
}
if (skip_prefix(k, "status.color.", &slot_name) ||
skip_prefix(k, "color.status.", &slot_name)) {
int slot = parse_status_slot(k, slot_name - k);
int slot = parse_status_slot(slot_name);
if (slot < 0)
return 0;
if (!v)
return config_error_nonbool(k);
color_parse(v, k, s->color_palette[slot]);
return 0;
return color_parse(v, s->color_palette[slot]);
}
if (!strcmp(k, "status.relativepaths")) {
s->relative_paths = git_config_bool(k, v);