Skip to content

Commit

Permalink
Merge branch 'rs/simplify-config-include'
Browse files Browse the repository at this point in the history
Code clean-up.

* rs/simplify-config-include:
  config: simplify git_config_include()
  • Loading branch information
Junio C Hamano committed Sep 19, 2014
2 parents 7669461 + 37007c3 commit 56bee64
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand All @@ -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;
}
Expand Down

0 comments on commit 56bee64

Please sign in to comment.