]> git.ipfire.org Git - thirdparty/git.git/commitdiff
refs: parse_hide_refs_config to use parse_config_key
authorStefan Beller <sbeller@google.com>
Fri, 24 Feb 2017 20:43:35 +0000 (12:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Feb 2017 20:49:29 +0000 (12:49 -0800)
parse_config_key was introduced in 1b86bbb0ade (config: add helper
function for parsing key names, 2013-01-22), the NEEDSWORK that is removed
in this patch was introduced at daebaa7813 (upload/receive-pack: allow
hiding ref hierarchies, 2013-01-18), which is only a couple days apart,
so presumably the code replaced in this patch was only introduced due
to not wanting to wait on the proper helper function being available.

Make the condition easier to read by using parse_config_key.

Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
refs.c

diff --git a/refs.c b/refs.c
index 9bd0bc177bb8298148577ce0c3e52134452d6e51..92f800e9cd64ab9c6200b221069550cebc6be1af 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1029,10 +1029,11 @@ static struct string_list *hide_refs;
 
 int parse_hide_refs_config(const char *var, const char *value, const char *section)
 {
+       const char *subsection, *key;
+       int subsection_len;
        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, &subsection, &subsection_len, &key)
+           && !subsection && !strcmp(key, "hiderefs"))) {
                char *ref;
                int len;