mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
config: add 'origin_type' to config_source struct
Use the config origin_type to print more detailed error messages that inform the user about the origin of a config error (file, stdin, blob). Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7454ee3c62
commit
473166b990
6
cache.h
6
cache.h
|
@ -1485,8 +1485,8 @@ struct git_config_source {
|
|||
typedef int (*config_fn_t)(const char *, const char *, void *);
|
||||
extern int git_default_config(const char *, const char *, void *);
|
||||
extern int git_config_from_file(config_fn_t fn, const char *, void *);
|
||||
extern int git_config_from_mem(config_fn_t fn, const char *name,
|
||||
const char *buf, size_t len, void *data);
|
||||
extern int git_config_from_mem(config_fn_t fn, const char *origin_type,
|
||||
const char *name, const char *buf, size_t len, void *data);
|
||||
extern void git_config_push_parameter(const char *text);
|
||||
extern int git_config_from_parameters(config_fn_t fn, void *data);
|
||||
extern void git_config(config_fn_t fn, void *);
|
||||
|
@ -1525,6 +1525,8 @@ extern const char *get_log_output_encoding(void);
|
|||
extern const char *get_commit_output_encoding(void);
|
||||
|
||||
extern int git_config_parse_parameter(const char *, config_fn_t fn, void *data);
|
||||
extern const char *current_config_origin_type(void);
|
||||
extern const char *current_config_name(void);
|
||||
|
||||
struct config_include_data {
|
||||
int depth;
|
||||
|
|
36
config.c
36
config.c
|
@ -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_mem(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_mem(fn, name, buf, size, data);
|
||||
ret = git_config_from_mem(fn, "blob", name, buf, size, data);
|
||||
free(buf);
|
||||
|
||||
return ret;
|
||||
|
@ -2385,3 +2389,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 : "";
|
||||
}
|
||||
|
|
|
@ -427,8 +427,8 @@ static const struct submodule *config_from(struct submodule_cache *cache,
|
|||
parameter.commit_sha1 = commit_sha1;
|
||||
parameter.gitmodules_sha1 = sha1;
|
||||
parameter.overwrite = 0;
|
||||
git_config_from_mem(parse_config, rev.buf, config, config_size,
|
||||
¶meter);
|
||||
git_config_from_mem(parse_config, "submodule-blob", rev.buf,
|
||||
config, config_size, ¶meter);
|
||||
free(config);
|
||||
|
||||
switch (lookup_type) {
|
||||
|
|
|
@ -700,12 +700,18 @@ test_expect_success 'invalid unit' '
|
|||
git config aninvalid.unit >actual &&
|
||||
test_cmp expect actual &&
|
||||
cat >expect <<-\EOF &&
|
||||
fatal: bad numeric config value '\''1auto'\'' for '\''aninvalid.unit'\'' in .git/config: invalid unit
|
||||
fatal: bad numeric config value '\''1auto'\'' for '\''aninvalid.unit'\'' in file .git/config: invalid unit
|
||||
EOF
|
||||
test_must_fail git config --int --get aninvalid.unit 2>actual &&
|
||||
test_i18ncmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'invalid stdin config' '
|
||||
echo "fatal: bad config line 1 in standard input " >expect &&
|
||||
echo "[broken" | test_must_fail git config --list --file - >output 2>&1 &&
|
||||
test_cmp expect output
|
||||
'
|
||||
|
||||
cat > expect << EOF
|
||||
true
|
||||
false
|
||||
|
|
|
@ -195,14 +195,14 @@ test_expect_success 'proper error on error in default config files' '
|
|||
cp .git/config .git/config.old &&
|
||||
test_when_finished "mv .git/config.old .git/config" &&
|
||||
echo "[" >>.git/config &&
|
||||
echo "fatal: bad config file line 34 in .git/config" >expect &&
|
||||
echo "fatal: bad config line 34 in file .git/config" >expect &&
|
||||
test_expect_code 128 test-config get_value foo.bar 2>actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'proper error on error in custom config files' '
|
||||
echo "[" >>syntax-error &&
|
||||
echo "fatal: bad config file line 1 in syntax-error" >expect &&
|
||||
echo "fatal: bad config line 1 in file syntax-error" >expect &&
|
||||
test_expect_code 128 test-config configset_get_value foo.bar syntax-error 2>actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
|
Loading…
Reference in a new issue