From 28c3beaa59f4b83bb3fa82e806579be9e2d8b73b Mon Sep 17 00:00:00 2001 From: Frank Li Date: Sun, 27 Jan 2013 15:02:06 +0800 Subject: [PATCH 1/2] Fix fail clone local repo which head detatched Set head detach if can't found branch after download Signed-off-by: Frank Li --- src/clone.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/clone.c b/src/clone.c index d60977a3f..333bf2148 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: From aa928de02a85810b0fd62a35e1af68768e0dab78 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Tue, 29 Jan 2013 17:26:42 +0800 Subject: [PATCH 2/2] Add test case for clone head detached repo Signed-off-by: Frank Li Signed-off-by: nulltoken --- tests-clar/clone/nonetwork.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests-clar/clone/nonetwork.c b/tests-clar/clone/nonetwork.c index 953f79659..3d327cb1e 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"); +}