summaryrefslogtreecommitdiff
path: root/src/notes.c
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-11-25 14:21:34 -0800
committerRussell Belfer <rb@github.com>2013-12-11 10:57:49 -0800
commit9f77b3f6f5ce6944ec49dfc666ef6b8df0af0c6b (patch)
tree1c5405663a7bcc505f098b375c7ff5dc872af3ea /src/notes.c
parent0eedacb06ae07fd0d784066ad41383276e05d92e (diff)
downloadlibgit2-9f77b3f6f5ce6944ec49dfc666ef6b8df0af0c6b.tar.gz
Add config read fns with controlled error behavior
This adds `git_config__lookup_entry` which will look up a key in a config and return either the entry or NULL if the key was not present. Optionally, it can either suppress all errors or can return them (although not finding the key is not an error for this function). Unlike other accessors, this does not normalize the config key string, so it must only be used when the key is known to be in normalized form (i.e. all lower-case before the first dot and after the last dot, with no invalid characters). This also adds three high-level helper functions to look up config values with no errors and a fallback value. The three functions are for string, bool, and int values, and will resort to the fallback value for any error that arises. They are: * `git_config__get_string_force` * `git_config__get_bool_force` * `git_config__get_int_force` None of them normalize the config `key` either, so they can only be used for internal cases where the key is known to be in normal format.
Diffstat (limited to 'src/notes.c')
-rw-r--r--src/notes.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/notes.c b/src/notes.c
index beace1b50..d8ed32f82 100644
--- a/src/notes.c
+++ b/src/notes.c
@@ -378,20 +378,11 @@ cleanup:
static int note_get_default_ref(const char **out, git_repository *repo)
{
- int ret;
git_config *cfg;
+ int ret = git_repository_config__weakptr(&cfg, repo);
- *out = NULL;
-
- if (git_repository_config__weakptr(&cfg, repo) < 0)
- return -1;
-
- ret = git_config_get_string(out, cfg, "core.notesRef");
- if (ret == GIT_ENOTFOUND) {
- giterr_clear();
- *out = GIT_NOTES_DEFAULT_REF;
- return 0;
- }
+ *out = (ret != 0) ? NULL : git_config__get_string_force(
+ cfg, "core.notesref", GIT_NOTES_DEFAULT_REF);
return ret;
}