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

Merge branch 'ls/config-origin'

Browse Source 
The configuration system has been taught to phrase where it found a
bad configuration variable in a better way in its error messages.
"git config" learnt a new "--show-origin" option to indicate where
the values come from.

* ls/config-origin:
  config: add '--show-origin' option to print the origin of a config value
  config: add 'origin_type' to config_source struct
  rename git_config_from_buf to git_config_from_mem
  t: do not hide Git's exit code in tests using 'nul_to_q'
This commit is contained in:
Junio C Hamano
2016-02-26 13:37:17 -08:00
parent 11529ecec9 70bd879ab6
commit dd0f567f10
8 changed files with 237 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
config.c
View File

@ -24,6 +24,7 @@ struct config_source {
size_t pos;
} buf;
} u;
const char *origin_type;
const char *name;
const char *path;
int die_on_error;
@ -471,9 +472,9 @@ static int git_parse_source(config_fn_t fn, void *data)
break;
}
if (cf->die_on_error)
die(_("bad config file line %d in %s"), cf->linenr, cf->name);
die(_("bad config line %d in %s %s"), cf->linenr, cf->origin_type, cf->name);
else
return error(_("bad config file line %d in %s"), cf->linenr, cf->name);
return error(_("bad config line %d in %s %s"), cf->linenr, cf->origin_type, cf->name);
}
static int parse_unit_factor(const char *end, uintmax_t *val)
@ -588,9 +589,9 @@ static void die_bad_number(const char *name, const char *value)
if (!value)
value = "";
if (cf && cf->name)
die(_("bad numeric config value '%s' for '%s' in %s: %s"),
value, name, cf->name, reason);
if (cf && cf->origin_type && cf->name)
die(_("bad numeric config value '%s' for '%s' in %s %s: %s"),
value, name, cf->origin_type, cf->name, reason);
die(_("bad numeric config value '%s' for '%s': %s"), value, name, reason);
}
@ -1061,11 +1062,13 @@ static int do_config_from(struct config_source *top, config_fn_t fn, void *data)
}
static int do_config_from_file(config_fn_t fn,
const char *name, const char *path, FILE *f, void *data)
const char *origin_type, const char *name, const char *path, FILE *f,
void *data)
{
struct config_source top;
top.u.file = f;
top.origin_type = origin_type;
top.name = name;
top.path = path;
top.die_on_error = 1;
@ -1078,7 +1081,7 @@ static int do_config_from_file(config_fn_t fn,
static int git_config_from_stdin(config_fn_t fn, void *data)
{
return do_config_from_file(fn, "<stdin>", NULL, stdin, data);
return do_config_from_file(fn, "standard input", "", NULL, stdin, data);
}
int git_config_from_file(config_fn_t fn, const char *filename, void *data)
@ -1089,21 +1092,22 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data)
f = fopen(filename, "r");
if (f) {
flockfile(f);
ret = do_config_from_file(fn, filename, filename, f, data);
ret = do_config_from_file(fn, "file", filename, filename, f, data);
funlockfile(f);
fclose(f);
}
return ret;
}
int git_config_from_buf(config_fn_t fn, const char *name, const char *buf,
size_t len, void *data)
int git_config_from_mem(config_fn_t fn, const char *origin_type,
const char *name, const char *buf, size_t len, void *data)
{
struct config_source top;
top.u.buf.buf = buf;
top.u.buf.len = len;
top.u.buf.pos = 0;
top.origin_type = origin_type;
top.name = name;
top.path = NULL;
top.die_on_error = 0;
@ -1132,7 +1136,7 @@ static int git_config_from_blob_sha1(config_fn_t fn,
return error("reference '%s' does not point to a blob", name);
}
ret = git_config_from_buf(fn, name, buf, size, data);
ret = git_config_from_mem(fn, "blob", name, buf, size, data);
free(buf);
return ret;
@ -2407,3 +2411,13 @@ int parse_config_key(const char *var,
return 0;
}
const char *current_config_origin_type(void)
{
return cf && cf->origin_type ? cf->origin_type : "command line";
}
const char *current_config_name(void)
{
return cf && cf->name ? cf->name : "";
}