Merge tag 'v2.12.4' into maint

This commit is contained in:
Junio C Hamano
2017-08-01 12:27:31 -07:00
13 changed files with 126 additions and 2 deletions

5
path.c
View File

@ -1241,6 +1241,11 @@ int is_ntfs_dotgit(const char *name)
}
}
int looks_like_command_line_option(const char *str)
{
return str && str[0] == '-';
}
char *xdg_config_home(const char *filename)
{
const char *home, *config_home;