Resolve test failures from API changes

Author: lucasderraugh

include/git2/gitup_clone.h

@@ -15,51 +15,10 @@
  */
 GIT_BEGIN_DECL
 
-/**
- * Clone a remote repository.
- *
- * By default this creates its repository and initial remote to match
- * git's defaults. You can use the options in the callback to
- * customize how these are created.
- *
- * @param out pointer that will receive the resulting repository object
- * @param url the remote repository to clone
- * @param local_path local directory to clone to
- * @param options configuration options for the clone.  If NULL, the
- *        function works as though GIT_OPTIONS_INIT were passed.
- * @return 0 on success, any non-zero return value from a callback
- *         function, or a negative value to indicate an error (use
- *         `git_error_last` for a detailed error message)
- */
-
-/// Use `git_clone instead.
-GIT_EXTERN(int) gitup_clone_into(
-	git_repository **out,
-	const char *url,
-	const char *local_path,
-	const git_clone_options *options
-	);
-
-/// Deprecated
-/**
- * Clone a remote repository into an existing empty repository using
- * a pre-existing remote.
- *
- * @param repo the repository to clone into
- * @param remote the remote to use for cloning
- * @param fetch_opts the fetch options to use
- * @param checkout_opts the checkout options to use
- * @param branch name of the branch to checkout (NULL means use the
- *        remote's default branch)
- * @return 0 on success, any non-zero return value from a callback
- *         function, or a negative value to indicate an error
- */
-GIT_EXTERN(int) gitup_clone_into_old(
-	git_repository *repo,
-	git_remote *remote,
-	const git_fetch_options *fetch_opts,
-	const git_checkout_options *checkout_opts,
-	const char *branch);
+GIT_EXTERN(int) gitup_clone_into(git_repository *repo,
+                            git_remote *remote,
+                            const git_fetch_options *fetch_opts,
+                            const git_checkout_options *checkout_opts,
+                            const char *branch);
 
-/** @} */
 GIT_END_DECL

include/git2/sys/features.h

@@ -0,0 +1,50 @@
+#ifndef INCLUDE_features_h__
+#define INCLUDE_features_h__
+
+/* #undef GIT_DEBUG_POOL */
+/* #undef GIT_DEBUG_STRICT_ALLOC */
+/* #undef GIT_DEBUG_STRICT_OPEN */
+
+#define GIT_TRACE 1
+#define GIT_THREADS 1
+/* #undef GIT_WIN32_LEAKCHECK */
+
+#define GIT_ARCH_64 1
+/* #undef GIT_ARCH_32 */
+
+#define GIT_USE_ICONV 1
+#define GIT_USE_NSEC 1
+/* #undef GIT_USE_STAT_MTIM */
+#define GIT_USE_STAT_MTIMESPEC 1
+/* #undef GIT_USE_STAT_MTIME_NSEC */
+#define GIT_USE_FUTIMENS 1
+
+#define GIT_REGEX_REGCOMP_L
+/* #undef GIT_REGEX_REGCOMP */
+/* #undef GIT_REGEX_PCRE */
+/* #undef GIT_REGEX_PCRE2 */
+/* #undef GIT_REGEX_BUILTIN */
+
+/* #undef GIT_SSH */
+/* #undef GIT_SSH_MEMORY_CREDENTIALS */
+
+#define GIT_NTLM 1
+/* #undef GIT_GSSAPI */
+/* #undef GIT_GSSFRAMEWORK */
+
+/* #undef GIT_WINHTTP */
+#define GIT_HTTPS 1
+/* #undef GIT_OPENSSL */
+/* #undef GIT_OPENSSL_DYNAMIC */
+#define GIT_SECURE_TRANSPORT 1
+/* #undef GIT_MBEDTLS */
+
+#define GIT_SHA1_COLLISIONDETECT 1
+/* #undef GIT_SHA1_WIN32 */
+/* #undef GIT_SHA1_COMMON_CRYPTO */
+/* #undef GIT_SHA1_OPENSSL */
+/* #undef GIT_SHA1_MBEDTLS */
+
+#endif
+#define GIT_SSH_MEMORY_CREDENTIALS 1
+#define GIT_SSH 1

src/gitup_clone.c

@@ -11,23 +11,47 @@
 #include <git2/sys/refs.h>
 
 int gitup_reference_create_virtual(
-	git_reference **ref_out,
-	git_repository *repo,
-	const char *name,
-	const git_oid *id)
+    git_reference **ref_out,
+    git_repository *repo,
+    const char *name,
+    const git_oid *id)
 {
-	int force = false;
-	const char *log_message = "";
-	return git_reference_create(ref_out, repo, name, id, force, log_message);
+    int error;
+    git_refdb *refdb;
+    git_reference *ref;
+
+    assert(ref_out && repo && name && id);
+
+    if ((error = git_repository_refdb__weakptr(&refdb, repo)) < 0)
+        return error;
+
+    ref = git_reference__alloc(name, id, NULL);
+    GIT_REFCOUNT_INC(refdb);
+    ref->db = refdb;
+
+    *ref_out = ref;
+    return 0;
 }
 
 int gitup_reference_symbolic_create_virtual(
-	git_reference **ref_out,
-	git_repository *repo,
-	const char *name,
-	const char *target)
+    git_reference **ref_out,
+    git_repository *repo,
+    const char *name,
+    const char *target)
 {
-	int force = false;
-	const char *log_message = "";
-	return git_reference_symbolic_create(ref_out, repo, name, target, force, log_message);
+    int error;
+    git_refdb *refdb;
+    git_reference *ref;
+
+    assert(ref_out && repo && name && target);
+
+    if ((error = git_repository_refdb__weakptr(&refdb, repo)) < 0)
+        return error;
+
+    ref = git_reference__alloc_symbolic(name, target);
+    GIT_REFCOUNT_INC(refdb);
+    ref->db = refdb;
+
+    *ref_out = ref;
+    return 0;
 }

src/gitup_refs.c

@@ -698,6 +698,17 @@ int git_clone_options_init(git_clone_options *opts, unsigned int version)
 	return 0;
 }
 
+int gitup_clone_into(
+    git_repository *repo,
+    git_remote *remote,
+    const git_fetch_options *fetch_opts,
+    const git_checkout_options *checkout_opts,
+    const char *branch)
+{
+    assert(repo && remote && fetch_opts && checkout_opts);
+    return clone_into(repo, remote, fetch_opts, checkout_opts, branch);
+}
+
 #ifndef GIT_DEPRECATE_HARD
 int git_clone_init_options(git_clone_options *opts, unsigned int version)
 {