diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 20:38:36 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 20:38:36 +0200 |
| commit | 56bee6420c08705de1c1017558190cccd5389bca (patch) | |
| tree | e0d1712ed5d4148a7146ec17b6d0cfb955f81ed5 /config.c | |
| parent | Merge branch 'rs/merge-tree-simplify' (diff) | |
| parent | config: simplify git_config_include() (diff) | |
| download | git-56bee6420c08705de1c1017558190cccd5389bca.tar.xz git-56bee6420c08705de1c1017558190cccd5389bca.zip | |
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.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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; } |