Commit 301dc26a by Sim Domingo Committed by Edward Thomson

fix error when including a missing config file relative to the home directory

parent 047fe29c
......@@ -1254,8 +1254,16 @@ static int strip_comments(char *line, int in_quotes)
static int included_path(git_buf *out, const char *dir, const char *path)
{
/* From the user's home */
if (path[0] == '~' && path[1] == '/')
return git_sysdir_find_global_file(out, &path[1]);
int result;
if (path[0] == '~' && path[1] == '/') {
result = git_sysdir_find_global_file(out, &path[1]);
if (result == GIT_ENOTFOUND) {
git_buf_sets(out, &path[1]);
return 0;
}
return result;
}
return git_path_join_unrooted(out, path, dir, NULL);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment