OpenCOR: allow cloning in a non-empty directory.

Author: agarny

include/git2/clone.h

@@ -202,7 +202,8 @@ GIT_EXTERN(int) git_clone(
 	git_repository **out,
 	const char *url,
 	const char *local_path,
-	const git_clone_options *options);
+	const git_clone_options *options,
+	int use_existing);
 
 /** @} */
 GIT_END_DECL

src/CMakeLists.txt

@@ -207,11 +207,6 @@ IF(USE_BUNDLED_ZLIB STREQUAL "OFF")
 	IF(ZLIB_FOUND)
 		LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${ZLIB_INCLUDE_DIRS})
 		LIST(APPEND LIBGIT2_LIBS ${ZLIB_LIBRARIES})
-		IF(APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-			LIST(APPEND LIBGIT2_PC_LIBS "-lz")
-		ELSE()
-			LIST(APPEND LIBGIT2_PC_REQUIRES "zlib")
-		ENDIF()
 		ADD_FEATURE_INFO(zlib ON "using system zlib")
 	ELSE()
 		MESSAGE(STATUS "zlib was not found; using bundled 3rd-party sources." )

src/clone.c

@@ -530,9 +530,10 @@ int git_clone(
 	git_repository **out,
 	const char *url,
 	const char *local_path,
-	const git_clone_options *_options)
+	const git_clone_options *_options,
+	int use_existing)
 {
-	return git__clone(out, url, local_path, _options, 0);
+	return git__clone(out, url, local_path, _options, use_existing);
 }
 
 int git_clone__submodule(

src/submodule.c

@@ -1377,7 +1377,7 @@ int git_submodule_update(git_submodule *sm, int init, git_submodule_update_optio
 		 */
 		clone_options.checkout_opts.checkout_strategy = GIT_CHECKOUT_NONE;
 
-		if ((error = git_clone(&sub_repo, submodule_url, sm->path, &clone_options)) < 0 ||
+		if ((error = git_clone(&sub_repo, submodule_url, sm->path, &clone_options, 0)) < 0 ||
 			(error = git_repository_set_head_detached(sub_repo, git_submodule_index_id(sm))) < 0 ||
 			(error = git_checkout_head(sub_repo, &update_options.checkout_opts)) != 0)
 			goto done;