summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-28 20:52:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-28 20:52:19 (GMT)
commitc772d1bcdc058d655e6cd3518440a721433cb511 (patch)
treeb9712dd52d14728c5c23fa83a49f95dab49324f9 /refs.c
parent8f9aeb0d36c6cbfb849946bb272fa0d3c4611547 (diff)
parentad8c7cdadd96c66d0adf894250c8f4dd77bb2bee (diff)
downloadgit-c772d1bcdc058d655e6cd3518440a721433cb511.zip
git-c772d1bcdc058d655e6cd3518440a721433cb511.tar.gz
git-c772d1bcdc058d655e6cd3518440a721433cb511.tar.bz2
Merge branch 'jk/parse-config-key-cleanup' into maint
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 refs: parse_hide_refs_config to use parse_config_key
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/refs.c b/refs.c
index cd36b64..b918890 100644
--- a/refs.c
+++ b/refs.c
@@ -1034,10 +1034,10 @@ static struct string_list *hide_refs;
int parse_hide_refs_config(const char *var, const char *value, const char *section)
{
+ const char *key;
if (!strcmp("transfer.hiderefs", var) ||
- /* NEEDSWORK: use parse_config_key() once both are merged */
- (starts_with(var, section) && var[strlen(section)] == '.' &&
- !strcmp(var + strlen(section), ".hiderefs"))) {
+ (!parse_config_key(var, section, NULL, NULL, &key) &&
+ !strcmp(key, "hiderefs"))) {
char *ref;
int len;