summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-10 13:24:22 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-10 13:24:22 -0800
commit963792ed277bde985ea9ff4953529d656b186571 (patch)
treece457fde106f33c0cd9c75b1c15a5169752431cb /cache.h
parentMerge branch 'sb/parse-hide-refs-config-cleanup' (diff)
parentparse_hide_refs_config: tell parse_config_key we don't want a subsection (diff)
downloadtgif-963792ed277bde985ea9ff4953529d656b186571.tar.xz
Merge branch 'jk/parse-config-key-cleanup'
The "parse_config_key()" API function has been cleaned up. * jk/parse-config-key-cleanup: parse_hide_refs_config: tell parse_config_key we don't want a subsection parse_config_key: allow matching single-level config parse_config_key: use skip_prefix instead of starts_with
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 80b6372cf7..1046dfc934 100644
--- a/cache.h
+++ b/cache.h
@@ -1863,8 +1863,11 @@ extern int git_config_include(const char *name, const char *value, void *data);
*
* (i.e., what gets handed to a config_fn_t). The caller provides the section;
* we return -1 if it does not match, 0 otherwise. The subsection and key
- * out-parameters are filled by the function (and subsection is NULL if it is
+ * out-parameters are filled by the function (and *subsection is NULL if it is
* missing).
+ *
+ * If the subsection pointer-to-pointer passed in is NULL, returns 0 only if
+ * there is no subsection at all.
*/
extern int parse_config_key(const char *var,
const char *section,