proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-06 23:44:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2867 from ethomson/8dot3

Browse Source 
Handle 8dot3 filenames being disabled on Win32
This commit is contained in:
Edward Thomson 2015-02-05 09:19:46 -05:00
commit 9bf5bd7cd8
5 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/repository.c
View File

@ -808,7 +808,8 @@ const char *git_repository__8dot3_name(git_repository *repo)
/* We anticipate the 8.3 name is "GIT~1", so use a static for
* easy testing in the common case */
if (strcasecmp(repo->name_8dot3, git_repository__8dot3_default) == 0)
if (repo->name_8dot3 &&
strcasecmp(repo->name_8dot3, git_repository__8dot3_default) == 0)
repo->has_8dot3_default = 1;
}
#endif

3
tests/checkout/nasty.c
View File

@ -217,6 +217,9 @@ void test_checkout_nasty__git_tilde1(void)
void test_checkout_nasty__git_custom_shortname(void)
{
#ifdef GIT_WIN32
if (!cl_sandbox_supports_8dot3())
clar__skip();
cl_must_pass(p_rename("nasty/.git", "nasty/_temp"));
cl_git_write2file("nasty/git~1", "", 0, O_RDWR|O_CREAT, 0666);
cl_must_pass(p_rename("nasty/_temp", "nasty/.git"));

22
tests/clar_libgit2.c
View File

@ -538,3 +538,25 @@ void cl_sandbox_set_search_path_defaults(void)
GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, sandbox_path);
}
#ifdef GIT_WIN32
bool cl_sandbox_supports_8dot3(void)
{
git_buf longpath = GIT_BUF_INIT;
char *shortname;
bool supported;
cl_git_pass(
git_buf_joinpath(&longpath, clar_sandbox_path(), "longer_than_8dot3"));
cl_git_write2file(longpath.ptr, "", 0, O_RDWR|O_CREAT, 0666);
shortname = git_win32_path_8dot3_name(longpath.ptr);
supported = (shortname != NULL);
git__free(shortname);
git_buf_free(&longpath);
return supported;
}
#endif

4
tests/clar_libgit2.h
View File

@ -161,4 +161,8 @@ void cl_fake_home_cleanup(void *);
void cl_sandbox_set_search_path_defaults(void);
#ifdef GIT_WIN32
bool cl_sandbox_supports_8dot3(void);
#endif
#endif

3
tests/path/win32.c
View File

@ -194,6 +194,9 @@ void test_path_win32__8dot3_name(void)
#ifdef GIT_WIN32
char *shortname;
if (!cl_sandbox_supports_8dot3())
clar__skip();
/* Some guaranteed short names */
cl_assert_equal_s("PROGRA~1", (shortname = git_win32_path_8dot3_name("C:\\Program Files")));
git__free(shortname);