diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2015-02-05 09:19:46 -0500 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-02-05 09:19:46 -0500 |
commit | 9bf5bd7cd89502826cc0223ec43aba15ad30fac7 (patch) | |
tree | e08c6a79f497aa4e9849ab338a9d5e6776103548 | |
parent | 3dc92940c8606b55c1ed35552ab6fa3b113dd2bd (diff) | |
parent | 07c989e98d013132168326eb7fd6fdf91a2399b9 (diff) | |
download | libgit2-9bf5bd7cd89502826cc0223ec43aba15ad30fac7.tar.gz |
Merge pull request #2867 from ethomson/8dot3
Handle 8dot3 filenames being disabled on Win32
-rw-r--r-- | src/repository.c | 3 | ||||
-rw-r--r-- | tests/checkout/nasty.c | 3 | ||||
-rw-r--r-- | tests/clar_libgit2.c | 22 | ||||
-rw-r--r-- | tests/clar_libgit2.h | 4 | ||||
-rw-r--r-- | tests/path/win32.c | 3 |
5 files changed, 34 insertions, 1 deletions
diff --git a/src/repository.c b/src/repository.c index d87ce730a..433754489 100644 --- a/src/repository.c +++ b/src/repository.c @@ -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 diff --git a/tests/checkout/nasty.c b/tests/checkout/nasty.c index bc25a3b52..952a6a112 100644 --- a/tests/checkout/nasty.c +++ b/tests/checkout/nasty.c @@ -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")); diff --git a/tests/clar_libgit2.c b/tests/clar_libgit2.c index a8a8ba6ab..6087c2a67 100644 --- a/tests/clar_libgit2.c +++ b/tests/clar_libgit2.c @@ -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 + diff --git a/tests/clar_libgit2.h b/tests/clar_libgit2.h index e1d62c820..86c90b049 100644 --- a/tests/clar_libgit2.h +++ b/tests/clar_libgit2.h @@ -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 diff --git a/tests/path/win32.c b/tests/path/win32.c index 22742f82d..4ff039738 100644 --- a/tests/path/win32.c +++ b/tests/path/win32.c @@ -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); |