mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/conditional-config-include'

Browse Source 
$GIT_DIR may in some cases be normalized with all symlinks resolved
while "gitdir" path expansion in the pattern does not receive the
same treatment, leading to incorrect mismatch.  This has been fixed.

* nd/conditional-config-include:
  config: resolve symlinks in conditional include's patterns
  path.c: and an option to call real_path() in expand_user_path()
This commit is contained in:
Junio C Hamano
2017-04-23 22:07:46 -07:00
parent 4c01f67d91 86f9515708
commit a2e2c04683
8 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cache.h
View File

@ -1164,7 +1164,7 @@ typedef int create_file_fn(const char *path, void *cb);
int raceproof_create_file(const char *path, create_file_fn fn, void *cb);
int mkdir_in_gitdir(const char *path);
extern char *expand_user_path(const char *path);
extern char *expand_user_path(const char *path, int real_home);
const char *enter_repo(const char *path, int strict);
static inline int is_absolute_path(const char *path)
{