Merge pull request libgit2#3015 from ethomson/maint/v0.22

Additional backports

Author: carlosmn

src/checkout.c

@@ -1190,7 +1190,7 @@ static int checkout_verify_paths(
 
 	if (action & ~CHECKOUT_ACTION__REMOVE) {
 		if (!git_path_isvalid(repo, delta->new_file.path, flags)) {
-			giterr_set(GITERR_CHECKOUT, "Cannot checkout to invalid path '%s'", delta->old_file.path);
+			giterr_set(GITERR_CHECKOUT, "Cannot checkout to invalid path '%s'", delta->new_file.path);
 			return -1;
 		}
 	}

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

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"));

tests/clar_libgit2.c

@@ -533,3 +533,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
+

tests/clar_libgit2.h

@@ -160,4 +160,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

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);