[PATCH v3 6/6] notes-util.c: replace `git_config()` with `git_config_get_value()`
- From
Tanay Abhra <tanayabh@gmail.com>
- Date
- Jul 21, 2014, 11:12 UTC
- Message-ID
- <1405941145-12120-7-git-send-email-tanayabh@gmail.com>
- In-Reply-To
- <1405941145-12120-1-git-send-email-tanayabh@gmail.com>
Use `git_config_get_value()` instead of `git_config()` to take advantage of the config-set API which provides a cleaner control flow. The function now raises an error instead of dying when a NULL value is found for key "notes.rewritemode".
Signed-off-by: Tanay Abhra <tanayabh@gmail.com> --- notes-utils.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/notes-utils.c b/notes-utils.c index b64dc1b..ffa2b70 100644 --- a/notes-utils.c +++ b/notes-utils.c @@ -69,22 +69,24 @@ static combine_notes_fn parse_combine_notes_fn(const char *v) return NULL; } -static int notes_rewrite_config(const char *k, const char *v, void *cb) +static void notes_rewrite_config(struct notes_rewrite_cfg *c) { - struct notes_rewrite_cfg *c = cb; - if (starts_with(k, "notes.rewrite.") && !strcmp(k+14, c->cmd)) { - c->enabled = git_config_bool(k, v); - return 0; - } else if (!c->mode_from_env && !strcmp(k, "notes.rewritemode")) { + const char *v; + struct strbuf key = STRBUF_INIT; + strbuf_addf(&key, "notes.rewrite.%s", c->cmd); + git_config_get_bool(key.buf, &c->enabled); + strbuf_release(&key); + + if (!c->mode_from_env && !git_config_get_value("notes.rewritemode", &v)) { if (!v) - return config_error_nonbool(k); - c->combine = parse_combine_notes_fn(v); - if (!c->combine) { - error(_("Bad notes.rewriteMode value: '%s'"), v); - return 1; + config_error_nonbool("notes.rewritemode"); + else { + c->combine = parse_combine_notes_fn(v); + if (!c->combine) + error(_("Bad notes.rewriteMode value: '%s'"), v); } - return 0; - } else if (!c->refs_from_env && !strcmp(k, "notes.rewriteref")) { + } + if (!c->refs_from_env && !git_config_get_value("notes.rewriteref", &v)) { /* note that a refs/ prefix is implied in the * underlying for_each_glob_ref */ if (starts_with(v, "refs/notes/")) @@ -92,10 +94,7 @@ static int notes_rewrite_config(const char *k, const char *v, void *cb) else warning(_("Refusing to rewrite notes in %s" " (outside of refs/notes/)"), v); - return 0; } - - return 0; } @@ -124,7 +123,7 @@ struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd) c->refs_from_env = 1; string_list_add_refs_from_colon_sep(c->refs, rewrite_refs_env); } - git_config(notes_rewrite_config, c); + notes_rewrite_config(c); if (!c->enabled || !c->refs->nr) { string_list_clear(c->refs, 0); free(c->refs);
-- 1.9.0.GIT