From 209e34fa7068615b96324a4243a49b030b0c7156 Mon Sep 17 00:00:00 2001 From: nulltoken Date: Sat, 20 Oct 2012 10:44:01 +0200 Subject: [PATCH 1/4] tests: leverage git_repository_detach_head() --- tests-clar/refs/branches/delete.c | 12 +++++++----- tests-clar/repo/head.c | 13 +++++-------- tests-clar/reset/soft.c | 13 +------------ 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/tests-clar/refs/branches/delete.c b/tests-clar/refs/branches/delete.c index 99af44ef4..656a6188d 100644 --- a/tests-clar/refs/branches/delete.c +++ b/tests-clar/refs/branches/delete.c @@ -64,13 +64,15 @@ void test_refs_branches_delete__can_delete_a_branch_when_HEAD_is_orphaned(void) void test_refs_branches_delete__can_delete_a_branch_pointed_at_by_detached_HEAD(void) { - git_reference *master, *head, *branch; + git_reference *head, *branch; + + cl_git_pass(git_reference_lookup(&head, repo, GIT_HEAD_FILE)); + cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); + cl_assert_equal_s("refs/heads/master", git_reference_target(head)); + git_reference_free(head); /* Detach HEAD and make it target the commit that "master" points to */ - cl_git_pass(git_reference_lookup(&master, repo, "refs/heads/master")); - cl_git_pass(git_reference_create_oid(&head, repo, "HEAD", git_reference_oid(master), 1)); - git_reference_free(head); - git_reference_free(master); + git_repository_detach_head(repo); cl_git_pass(git_branch_lookup(&branch, repo, "master", GIT_BRANCH_LOCAL)); cl_git_pass(git_branch_delete(branch)); diff --git a/tests-clar/repo/head.c b/tests-clar/repo/head.c index 4113289f0..34f3f8951 100644 --- a/tests-clar/repo/head.c +++ b/tests-clar/repo/head.c @@ -16,21 +16,18 @@ void test_repo_head__cleanup(void) void test_repo_head__head_detached(void) { git_reference *ref; - git_oid oid; cl_assert(git_repository_head_detached(repo) == 0); - /* detach the HEAD */ - git_oid_fromstr(&oid, "c47800c7266a2be04c571c04d5a6614691ea99bd"); - cl_git_pass(git_reference_create_oid(&ref, repo, "HEAD", &oid, 1)); - cl_assert(git_repository_head_detached(repo) == 1); - git_reference_free(ref); + git_repository_detach_head(repo); + + cl_assert_equal_i(true, git_repository_head_detached(repo)); /* take the reop back to it's original state */ cl_git_pass(git_reference_create_symbolic(&ref, repo, "HEAD", "refs/heads/master", 1)); - cl_assert(git_repository_head_detached(repo) == 0); - git_reference_free(ref); + + cl_assert_equal_i(false, git_repository_head_detached(repo)); } static void make_head_orphaned(void) diff --git a/tests-clar/reset/soft.c b/tests-clar/reset/soft.c index 3200c1591..3c678ad73 100644 --- a/tests-clar/reset/soft.c +++ b/tests-clar/reset/soft.c @@ -39,20 +39,9 @@ void test_reset_soft__can_reset_the_non_detached_Head_to_the_specified_commit(vo assert_reset_soft(false); } -static void detach_head(void) -{ - git_reference *head; - git_oid oid; - - cl_git_pass(git_reference_name_to_oid(&oid, repo, "HEAD")); - - cl_git_pass(git_reference_create_oid(&head, repo, "HEAD", &oid, true)); - git_reference_free(head); -} - void test_reset_soft__can_reset_the_detached_Head_to_the_specified_commit(void) { - detach_head(); + git_repository_detach_head(repo); assert_reset_soft(true); } From cd1ef82253b5f4242ed9aed5e9abf7bceb33ec04 Mon Sep 17 00:00:00 2001 From: nulltoken Date: Sat, 20 Oct 2012 12:07:53 +0200 Subject: [PATCH 2/4] test: extract make_head_orphaned() logic --- tests-clar/checkout/head.c | 6 ++---- tests-clar/refs/branches/delete.c | 6 ++---- tests-clar/refs/branches/ishead.c | 11 ++--------- tests-clar/repo/head.c | 15 ++++----------- tests-clar/repo/repo_helpers.c | 11 +++++++++++ tests-clar/repo/repo_helpers.h | 5 +++++ 6 files changed, 26 insertions(+), 28 deletions(-) create mode 100644 tests-clar/repo/repo_helpers.c create mode 100644 tests-clar/repo/repo_helpers.h diff --git a/tests-clar/checkout/head.c b/tests-clar/checkout/head.c index f2f81e5e2..d36034c52 100644 --- a/tests-clar/checkout/head.c +++ b/tests-clar/checkout/head.c @@ -1,5 +1,6 @@ #include "clar_libgit2.h" #include "refs.h" +#include "repo/repo_helpers.h" static git_repository *g_repo; @@ -15,10 +16,7 @@ void test_checkout_head__cleanup(void) void test_checkout_head__checking_out_an_orphaned_head_returns_GIT_EORPHANEDHEAD(void) { - git_reference *head; - - cl_git_pass(git_reference_create_symbolic(&head, g_repo, GIT_HEAD_FILE, "refs/heads/hide/and/seek", 1)); - git_reference_free(head); + make_head_orphaned(g_repo, NON_EXISTING_HEAD); cl_assert_equal_i(GIT_EORPHANEDHEAD, git_checkout_head(g_repo, NULL, NULL)); } diff --git a/tests-clar/refs/branches/delete.c b/tests-clar/refs/branches/delete.c index 656a6188d..4e9c70904 100644 --- a/tests-clar/refs/branches/delete.c +++ b/tests-clar/refs/branches/delete.c @@ -1,5 +1,6 @@ #include "clar_libgit2.h" #include "refs.h" +#include "repo/repo_helpers.h" static git_repository *repo; static git_reference *fake_remote; @@ -52,11 +53,9 @@ void test_refs_branches_delete__can_delete_a_branch_even_if_HEAD_is_missing(void void test_refs_branches_delete__can_delete_a_branch_when_HEAD_is_orphaned(void) { - git_reference *head; git_reference *branch; - cl_git_pass(git_reference_create_symbolic(&head, repo, GIT_HEAD_FILE, "refs/heads/hide/and/seek", 1)); - git_reference_free(head); + make_head_orphaned(repo, NON_EXISTING_HEAD); cl_git_pass(git_branch_lookup(&branch, repo, "br2", GIT_BRANCH_LOCAL)); cl_git_pass(git_branch_delete(branch)); @@ -91,4 +90,3 @@ void test_refs_branches_delete__can_delete_a_remote_branch(void) cl_git_pass(git_branch_lookup(&branch, repo, "nulltoken/master", GIT_BRANCH_REMOTE)); cl_git_pass(git_branch_delete(branch)); } - diff --git a/tests-clar/refs/branches/ishead.c b/tests-clar/refs/branches/ishead.c index 0d57f00a3..ab17482b8 100644 --- a/tests-clar/refs/branches/ishead.c +++ b/tests-clar/refs/branches/ishead.c @@ -1,5 +1,6 @@ #include "clar_libgit2.h" #include "refs.h" +#include "repo/repo_helpers.h" static git_repository *repo; static git_reference *branch; @@ -22,21 +23,13 @@ void test_refs_branches_ishead__can_tell_if_a_branch_is_pointed_at_by_HEAD(void) cl_assert_equal_i(true, git_branch_is_head(branch)); } -static void make_head_orphaned(void) -{ - git_reference *head; - - cl_git_pass(git_reference_create_symbolic(&head, repo, GIT_HEAD_FILE, "refs/heads/hide/and/seek", 1)); - git_reference_free(head); -} - void test_refs_branches_ishead__can_properly_handle_orphaned_HEAD(void) { git_repository_free(repo); repo = cl_git_sandbox_init("testrepo.git"); - make_head_orphaned(); + make_head_orphaned(repo, NON_EXISTING_HEAD); cl_git_pass(git_reference_lookup(&branch, repo, "refs/heads/master")); diff --git a/tests-clar/repo/head.c b/tests-clar/repo/head.c index 34f3f8951..30377dc15 100644 --- a/tests-clar/repo/head.c +++ b/tests-clar/repo/head.c @@ -1,5 +1,6 @@ #include "clar_libgit2.h" #include "refs.h" +#include "repo_helpers.h" git_repository *repo; @@ -30,21 +31,13 @@ void test_repo_head__head_detached(void) cl_assert_equal_i(false, git_repository_head_detached(repo)); } -static void make_head_orphaned(void) -{ - git_reference *head; - - cl_git_pass(git_reference_create_symbolic(&head, repo, GIT_HEAD_FILE, "refs/heads/hide/and/seek", 1)); - git_reference_free(head); -} - void test_repo_head__head_orphan(void) { git_reference *ref; cl_assert(git_repository_head_orphan(repo) == 0); - make_head_orphaned(); + make_head_orphaned(repo, NON_EXISTING_HEAD); cl_assert(git_repository_head_orphan(repo) == 1); @@ -171,7 +164,7 @@ void test_repo_head__detach_head_Fails_if_HEAD_and_point_to_a_non_commitish(void void test_repo_head__detaching_an_orphaned_head_returns_GIT_EORPHANEDHEAD(void) { - make_head_orphaned(); + make_head_orphaned(repo, NON_EXISTING_HEAD); cl_assert_equal_i(GIT_EORPHANEDHEAD, git_repository_detach_head(repo)); } @@ -180,7 +173,7 @@ void test_repo_head__retrieving_an_orphaned_head_returns_GIT_EORPHANEDHEAD(void) { git_reference *head; - make_head_orphaned(); + make_head_orphaned(repo, NON_EXISTING_HEAD); cl_assert_equal_i(GIT_EORPHANEDHEAD, git_repository_head(&head, repo)); } diff --git a/tests-clar/repo/repo_helpers.c b/tests-clar/repo/repo_helpers.c new file mode 100644 index 000000000..35271feaa --- /dev/null +++ b/tests-clar/repo/repo_helpers.c @@ -0,0 +1,11 @@ +#include "clar_libgit2.h" +#include "refs.h" +#include "repo_helpers.h" + +void make_head_orphaned(git_repository* repo, const char *target) +{ + git_reference *head; + + cl_git_pass(git_reference_create_symbolic(&head, repo, GIT_HEAD_FILE, target, 1)); + git_reference_free(head); +} diff --git a/tests-clar/repo/repo_helpers.h b/tests-clar/repo/repo_helpers.h new file mode 100644 index 000000000..e6aeb4873 --- /dev/null +++ b/tests-clar/repo/repo_helpers.h @@ -0,0 +1,5 @@ +#include "common.h" + +#define NON_EXISTING_HEAD "refs/heads/hide/and/seek" + +extern void make_head_orphaned(git_repository* repo, const char *target); From c436ed26e08fde69579d5d0ac31e775cfbd06290 Mon Sep 17 00:00:00 2001 From: nulltoken Date: Sat, 20 Oct 2012 12:09:02 +0200 Subject: [PATCH 3/4] reset: make git_reset() cope with an orphaned HEAD --- src/reset.c | 46 +++++++++++++++++++++++++++++++++++------ tests-clar/reset/soft.c | 21 +++++++++++++++++++ 2 files changed, 61 insertions(+), 6 deletions(-) diff --git a/src/reset.c b/src/reset.c index dfa095be4..560ae17b1 100644 --- a/src/reset.c +++ b/src/reset.c @@ -19,6 +19,45 @@ static int reset_error_invalid(const char *msg) return -1; } +static int update_head(git_repository *repo, git_object *commit) +{ + int error; + git_reference *head = NULL, *target = NULL; + + error = git_repository_head(&head, repo); + + if (error < 0 && error != GIT_EORPHANEDHEAD) + return error; + + if (error == GIT_EORPHANEDHEAD) { + giterr_clear(); + + /* + * TODO: This is a bit weak as this doesn't support chained + * symbolic references. yet. + */ + if ((error = git_reference_lookup(&head, repo, GIT_HEAD_FILE)) < 0) + goto cleanup; + + if ((error = git_reference_create_oid( + &target, + repo, + git_reference_target(head), + git_object_id(commit), 0)) < 0) + goto cleanup; + } else { + if ((error = git_reference_set_oid(head, git_object_id(commit))) < 0) + goto cleanup; + } + + error = 0; + +cleanup: + git_reference_free(head); + git_reference_free(target); + return error; +} + int git_reset( git_repository *repo, git_object *target, @@ -29,7 +68,6 @@ int git_reset( git_tree *tree = NULL; int error = -1; git_checkout_opts opts; - git_reference *head = NULL; assert(repo && target); assert(reset_type == GIT_RESET_SOFT @@ -52,10 +90,7 @@ int git_reset( //TODO: Check for unmerged entries - if (git_repository_head(&head, repo) < 0) - goto cleanup; - - if (git_reference_set_oid(head, git_object_id(commit)) < 0) + if (update_head(repo, commit) < 0) goto cleanup; if (reset_type == GIT_RESET_SOFT) { @@ -102,7 +137,6 @@ int git_reset( error = 0; cleanup: - git_reference_free(head); git_object_free(commit); git_index_free(index); git_tree_free(tree); diff --git a/tests-clar/reset/soft.c b/tests-clar/reset/soft.c index 3c678ad73..1872baf3b 100644 --- a/tests-clar/reset/soft.c +++ b/tests-clar/reset/soft.c @@ -1,5 +1,6 @@ #include "clar_libgit2.h" #include "reset_helpers.h" +#include "repo/repo_helpers.h" static git_repository *repo; static git_object *target; @@ -89,3 +90,23 @@ void test_reset_soft__cannot_reset_to_a_tag_not_pointing_at_a_commit(void) retrieve_target_from_oid(&target, repo, "521d87c1ec3aef9824daf6d96cc0ae3710766d91"); cl_git_fail(git_reset(repo, target, GIT_RESET_SOFT)); } + +void test_reset_soft__resetting_against_an_orphaned_head_repo_makes_the_head_no_longer_orphaned(void) +{ + git_reference *head; + + retrieve_target_from_oid(&target, repo, KNOWN_COMMIT_IN_BARE_REPO); + + make_head_orphaned(repo, NON_EXISTING_HEAD); + + cl_assert_equal_i(true, git_repository_head_orphan(repo)); + + cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT)); + + cl_assert_equal_i(false, git_repository_head_orphan(repo)); + + cl_git_pass(git_reference_lookup(&head, repo, NON_EXISTING_HEAD)); + cl_assert_equal_i(0, git_oid_streq(git_reference_oid(head), KNOWN_COMMIT_IN_BARE_REPO)); + + git_reference_free(head); +} From f36fb761dce7c0f6c6924d9ce30c9cad72dc1318 Mon Sep 17 00:00:00 2001 From: nulltoken Date: Sat, 20 Oct 2012 19:23:04 +0200 Subject: [PATCH 4/4] tests: more git_repository_head_detached() coverage --- tests-clar/repo/head.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests-clar/repo/head.c b/tests-clar/repo/head.c index 30377dc15..22947168e 100644 --- a/tests-clar/repo/head.c +++ b/tests-clar/repo/head.c @@ -177,3 +177,12 @@ void test_repo_head__retrieving_an_orphaned_head_returns_GIT_EORPHANEDHEAD(void) cl_assert_equal_i(GIT_EORPHANEDHEAD, git_repository_head(&head, repo)); } + +void test_repo_head__can_tell_if_an_orphaned_head_is_detached(void) +{ + git_reference *head; + + make_head_orphaned(repo, NON_EXISTING_HEAD); + + cl_assert_equal_i(false, git_repository_head_detached(repo)); +}