Merge branch 'rs/simplify-config-include'

Code clean-up.

* rs/simplify-config-include:
  config: simplify git_config_include()
This commit is contained in:
Junio C Hamano 2014-09-19 11:38:36 -07:00
commit 56bee6420c

View File

@ -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;
}