summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-19 18:38:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-19 18:38:36 (GMT)
commit56bee6420c08705de1c1017558190cccd5389bca (patch)
treee0d1712ed5d4148a7146ec17b6d0cfb955f81ed5 /config.c
parent7669461459aaee1587bac77c4a446e9365b582c7 (diff)
parent37007c3a87f3d78f533533f96a0d49bd0d520671 (diff)
downloadgit-56bee6420c08705de1c1017558190cccd5389bca.zip
git-56bee6420c08705de1c1017558190cccd5389bca.tar.gz
git-56bee6420c08705de1c1017558190cccd5389bca.tar.bz2
Merge branch 'rs/simplify-config-include'
Code clean-up. * rs/simplify-config-include: config: simplify git_config_include()
Diffstat (limited to 'config.c')
-rw-r--r--config.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/config.c b/config.c
index 83c913a..179b681 100644
--- a/config.c
+++ b/config.c
@@ -136,7 +136,6 @@ static int handle_path_include(const char *path, struct config_include_data *inc
int git_config_include(const char *var, const char *value, void *data)
{
struct config_include_data *inc = data;
- const char *type;
int ret;
/*
@@ -147,10 +146,7 @@ int git_config_include(const char *var, const char *value, void *data)
if (ret < 0)
return ret;
- if (!skip_prefix(var, "include.", &type))
- return ret;
-
- if (!strcmp(type, "path"))
+ if (!strcmp(var, "include.path"))
ret = handle_path_include(value, inc);
return ret;
}