diff options
| author | joshaber <joshaber@gmail.com> | 2015-07-22 11:33:18 -0400 |
|---|---|---|
| committer | joshaber <joshaber@gmail.com> | 2015-07-22 11:33:18 -0400 |
| commit | 9830fbba05ef66325f929a09407abc45ab85847d (patch) | |
| tree | dac363428f4705a632719e03b8b77f2d32ce2bb3 /src/repository.c | |
| parent | cf198fdf2a044d2e2f0675c2c6b1cd9cdbcf4fcf (diff) | |
| parent | 42156d561723e92ffe597885719aa63abfe0795c (diff) | |
| download | libgit2-fix-init-ordering.tar.gz | |
Merge branch 'master' into fix-init-orderingfix-init-ordering
Diffstat (limited to 'src/repository.c')
| -rw-r--r-- | src/repository.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/repository.c b/src/repository.c index 82d998124..08f4baa20 100644 --- a/src/repository.c +++ b/src/repository.c @@ -867,7 +867,9 @@ static int reserved_names_add8dot3(git_repository *repo, const char *path) { char *name = git_win32_path_8dot3_name(path); const char *def = GIT_DIR_SHORTNAME; + const char *def_dot_git = DOT_GIT; size_t name_len, def_len = CONST_STRLEN(GIT_DIR_SHORTNAME); + size_t def_dot_git_len = CONST_STRLEN(DOT_GIT); git_buf *buf; if (!name) @@ -875,7 +877,8 @@ static int reserved_names_add8dot3(git_repository *repo, const char *path) name_len = strlen(name); - if (name_len == def_len && memcmp(name, def, def_len) == 0) { + if ((name_len == def_len && memcmp(name, def, def_len) == 0) || + (name_len == def_dot_git_len && memcmp(name, def_dot_git, def_dot_git_len) == 0)) { git__free(name); return 0; } |