Merge pull request #1286 from lznuaa/master Fix clone fail if repo head detached
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
diff --git a/src/clone.c b/src/clone.c
index d60977a..333bf21 100644
--- a/src/clone.c
+++ b/src/clone.c
@@ -250,8 +250,10 @@ static int update_head_to_remote(git_repository *repo, git_remote *remote)
goto cleanup;
} else {
- /* TODO: What should we do if nothing has been found?
- */
+ retcode = git_repository_set_head_detached(
+ repo,
+ &head_info.remote_head_oid);
+ goto cleanup;
}
cleanup:
diff --git a/tests-clar/clone/nonetwork.c b/tests-clar/clone/nonetwork.c
index 953f796..3d327cb 100644
--- a/tests-clar/clone/nonetwork.c
+++ b/tests-clar/clone/nonetwork.c
@@ -175,3 +175,27 @@ void test_clone_nonetwork__can_checkout_given_branch(void)
cl_assert_equal_s(git_reference_name(g_ref), "refs/heads/test");
}
+void test_clone_nonetwork__can_detached_head(void)
+{
+ git_object *commit;
+ git_repository *cloned;
+ git_reference *cloned_head;
+
+ cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options));
+
+ cl_git_pass(git_revparse_single(&commit, g_repo, "master~1"));
+ cl_git_pass(git_repository_set_head_detached(g_repo, git_object_id(commit)));
+
+ cl_git_pass(git_clone(&cloned, "./foo", "./foo1", &g_options));
+
+ cl_assert(git_repository_head_detached(cloned));
+
+ cl_git_pass(git_repository_head(&cloned_head, cloned));
+ cl_assert(!git_oid_cmp(git_object_id(commit), git_reference_target(cloned_head)));
+
+ git_commit_free((git_commit*)commit);
+ git_reference_free(cloned_head);
+ git_repository_free(cloned);
+
+ cl_fixture_cleanup("./foo1");
+}