diff options
author | Vicent Martà <vicent@github.com> | 2013-09-17 03:45:35 -0700 |
---|---|---|
committer | Vicent Martà <vicent@github.com> | 2013-09-17 03:45:35 -0700 |
commit | efc9e6700fabc91ea490fcc5ea034b51648c9e88 (patch) | |
tree | 08f13e7c4f17a3e35f7342d51363441833ac59f4 /tests-clar/reset/soft.c | |
parent | 38fba8371e4c6c0042645a8bf2ba4aa2f2cdf730 (diff) | |
parent | 605da51a2cfd86901b6fa5f9cf71111a63ab4418 (diff) | |
download | libgit2-efc9e6700fabc91ea490fcc5ea034b51648c9e88.tar.gz |
Merge pull request #1856 from libgit2/cmn/no-orphans
No such thing as an orphan branch
Diffstat (limited to 'tests-clar/reset/soft.c')
-rw-r--r-- | tests-clar/reset/soft.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests-clar/reset/soft.c b/tests-clar/reset/soft.c index 884697c91..bd6fcc205 100644 --- a/tests-clar/reset/soft.c +++ b/tests-clar/reset/soft.c @@ -95,19 +95,19 @@ void test_reset_soft__cannot_reset_to_a_tag_not_pointing_at_a_commit(void) 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) +void test_reset_soft__resetting_against_an_unborn_head_repo_makes_the_head_no_longer_unborn(void) { git_reference *head; retrieve_target_from_oid(&target, repo, KNOWN_COMMIT_IN_BARE_REPO); - make_head_orphaned(repo, NON_EXISTING_HEAD); + make_head_unborn(repo, NON_EXISTING_HEAD); - cl_assert_equal_i(true, git_repository_head_orphan(repo)); + cl_assert_equal_i(true, git_repository_head_unborn(repo)); cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT)); - cl_assert_equal_i(false, git_repository_head_orphan(repo)); + cl_assert_equal_i(false, git_repository_head_unborn(repo)); cl_git_pass(git_reference_lookup(&head, repo, NON_EXISTING_HEAD)); cl_assert_equal_i(0, git_oid_streq(git_reference_target(head), KNOWN_COMMIT_IN_BARE_REPO)); |