diff options
| -rw-r--r-- | src/clone.c | 2 | ||||
| -rw-r--r-- | tests-clar/clone/clone.c | 122 |
2 files changed, 66 insertions, 58 deletions
diff --git a/src/clone.c b/src/clone.c index 68ef22570..7ae3c1447 100644 --- a/src/clone.c +++ b/src/clone.c @@ -93,7 +93,7 @@ static int update_head_to_new_branch(git_repository *repo, git_oid *target, cons if (!create_tracking_branch(repo, target, name)) { git_reference *head; - if (!git_reference_lookup(&head, repo, "HEAD")) { + if (!git_repository_head(&head, repo)) { git_buf target = GIT_BUF_INIT; if (!git_buf_printf(&target, "refs/heads/%s", name) && !git_reference_set_target(head, git_buf_cstr(&target))) { diff --git a/tests-clar/clone/clone.c b/tests-clar/clone/clone.c index b4e9c309a..e2ce85fb1 100644 --- a/tests-clar/clone/clone.c +++ b/tests-clar/clone/clone.c @@ -7,111 +7,119 @@ static git_repository *g_repo; void test_clone_clone__initialize(void) { - g_repo = NULL; + g_repo = NULL; } void test_clone_clone__cleanup(void) { - if (g_repo) { - git_repository_free(g_repo); - g_repo = NULL; - } + if (g_repo) { + git_repository_free(g_repo); + g_repo = NULL; + } } // TODO: This is copy/pasted from network/remotelocal.c. static void build_local_file_url(git_buf *out, const char *fixture) { - const char *in_buf; + const char *in_buf; - git_buf path_buf = GIT_BUF_INIT; + git_buf path_buf = GIT_BUF_INIT; - cl_git_pass(git_path_prettify_dir(&path_buf, fixture, NULL)); - cl_git_pass(git_buf_puts(out, "file://")); + cl_git_pass(git_path_prettify_dir(&path_buf, fixture, NULL)); + cl_git_pass(git_buf_puts(out, "file://")); #ifdef GIT_WIN32 - /* - * A FILE uri matches the following format: file://[host]/path - * where "host" can be empty and "path" is an absolute path to the resource. - * - * In this test, no hostname is used, but we have to ensure the leading triple slashes: - * - * *nix: file:///usr/home/... - * Windows: file:///C:/Users/... - */ - cl_git_pass(git_buf_putc(out, '/')); + /* + * A FILE uri matches the following format: file://[host]/path + * where "host" can be empty and "path" is an absolute path to the resource. + * + * In this test, no hostname is used, but we have to ensure the leading triple slashes: + * + * *nix: file:///usr/home/... + * Windows: file:///C:/Users/... + */ + cl_git_pass(git_buf_putc(out, '/')); #endif - in_buf = git_buf_cstr(&path_buf); + in_buf = git_buf_cstr(&path_buf); - /* - * A very hacky Url encoding that only takes care of escaping the spaces - */ - while (*in_buf) { - if (*in_buf == ' ') - cl_git_pass(git_buf_puts(out, "%20")); - else - cl_git_pass(git_buf_putc(out, *in_buf)); + /* + * A very hacky Url encoding that only takes care of escaping the spaces + */ + while (*in_buf) { + if (*in_buf == ' ') + cl_git_pass(git_buf_puts(out, "%20")); + else + cl_git_pass(git_buf_putc(out, *in_buf)); - in_buf++; - } + in_buf++; + } - git_buf_free(&path_buf); + git_buf_free(&path_buf); } void test_clone_clone__bad_url(void) { - /* Clone should clean up the mess if the URL isn't a git repository */ - cl_git_fail(git_clone(&g_repo, "not_a_repo", "./foo", NULL)); - cl_assert(!git_path_exists("./foo")); - cl_git_fail(git_clone_bare(&g_repo, "not_a_repo", "./foo.git", NULL)); - cl_assert(!git_path_exists("./foo.git")); + /* Clone should clean up the mess if the URL isn't a git repository */ + cl_git_fail(git_clone(&g_repo, "not_a_repo", "./foo", NULL)); + cl_assert(!git_path_exists("./foo")); + cl_git_fail(git_clone_bare(&g_repo, "not_a_repo", "./foo.git", NULL)); + cl_assert(!git_path_exists("./foo.git")); } void test_clone_clone__local(void) { - git_buf src = GIT_BUF_INIT; - build_local_file_url(&src, cl_fixture("testrepo.git")); + git_buf src = GIT_BUF_INIT; + build_local_file_url(&src, cl_fixture("testrepo.git")); #if 0 - cl_git_pass(git_clone(&g_repo, git_buf_cstr(&src), "./local", NULL)); - git_repository_free(g_repo); - git_futils_rmdir_r("./local", GIT_DIRREMOVAL_FILES_AND_DIRS); - cl_git_pass(git_clone_bare(&g_repo, git_buf_cstr(&src), "./local.git", NULL)); - git_futils_rmdir_r("./local.git", GIT_DIRREMOVAL_FILES_AND_DIRS); + cl_git_pass(git_clone(&g_repo, git_buf_cstr(&src), "./local", NULL)); + git_repository_free(g_repo); + git_futils_rmdir_r("./local", GIT_DIRREMOVAL_FILES_AND_DIRS); + cl_git_pass(git_clone_bare(&g_repo, git_buf_cstr(&src), "./local.git", NULL)); + git_futils_rmdir_r("./local.git", GIT_DIRREMOVAL_FILES_AND_DIRS); #endif - git_buf_free(&src); + git_buf_free(&src); } void test_clone_clone__network_full(void) { #if 0 - cl_git_pass(git_clone(&g_repo, - "https://github.com/libgit2/libgit2.git", - "./libgit2", NULL)); - git_futils_rmdir_r("./libgit2", GIT_DIRREMOVAL_FILES_AND_DIRS); + git_remote *origin; + + cl_git_pass(git_clone(&g_repo, + "https://github.com/libgit2/GitForDelphi.git", + "./libgit2", NULL)); + cl_assert(!git_repository_is_bare(g_repo)); + cl_git_pass(git_remote_load(&origin, g_repo, "origin")); + git_futils_rmdir_r("./libgit2", GIT_DIRREMOVAL_FILES_AND_DIRS); #endif } void test_clone_clone__network_bare(void) { #if 0 - cl_git_pass(git_clone_bare(&g_repo, - "https://github.com/libgit2/libgit2.git", - "./libgit2.git", NULL)); - git_futils_rmdir_r("./libgit2.git", GIT_DIRREMOVAL_FILES_AND_DIRS); + git_remote *origin; + + cl_git_pass(git_clone_bare(&g_repo, + "https://github.com/libgit2/GitForDelphi.git", + "./libgit2.git", NULL)); + cl_assert(git_repository_is_bare(g_repo)); + cl_git_pass(git_remote_load(&origin, g_repo, "origin")); + git_futils_rmdir_r("./libgit2.git", GIT_DIRREMOVAL_FILES_AND_DIRS); #endif } void test_clone_clone__already_exists(void) { - mkdir("./foo", GIT_DIR_MODE); - cl_git_fail(git_clone(&g_repo, - "https://github.com/libgit2/libgit2.git", - "./foo", NULL)); - git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS); + mkdir("./foo", GIT_DIR_MODE); + cl_git_fail(git_clone(&g_repo, + "https://github.com/libgit2/libgit2.git", + "./foo", NULL)); + git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS); } |