diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2013-09-17 11:50:30 +0400 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2013-09-17 11:50:30 +0400 |
| commit | 605da51a2cfd86901b6fa5f9cf71111a63ab4418 (patch) | |
| tree | dbe23d26a4cbd93d457c68fdec7b4b10605314ac /tests-clar/clone | |
| parent | c62b5ca590fb2f1743f43439b04159b168a36dda (diff) | |
No such thing as an orphan branch
Unfortunately git-core uses the term "unborn branch" and "orphan
branch" interchangeably. However, "orphan" is only really there for
the checkout command, which has the `--orphan` option so it doesn't
actually create the branch.
Branches never have parents, so the distinction of a branch with no
parents is odd to begin with. Crucially, the error messages deal with
unborn branches, so let's use that.
Diffstat (limited to 'tests-clar/clone')
| -rw-r--r-- | tests-clar/clone/empty.c | 4 | ||||
| -rw-r--r-- | tests-clar/clone/nonetwork.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests-clar/clone/empty.c b/tests-clar/clone/empty.c index f92fa6cbb..d9dc24fde 100644 --- a/tests-clar/clone/empty.c +++ b/tests-clar/clone/empty.c @@ -44,7 +44,7 @@ void test_clone_empty__can_clone_an_empty_local_repo_barely(void) g_options.bare = true; cl_git_pass(git_clone(&g_repo_cloned, "./empty_bare.git", "./empty", &g_options)); - /* Although the HEAD is orphaned... */ + /* Although the HEAD is unborn... */ cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&ref, g_repo_cloned, local_name)); /* ...one can still retrieve the name of the remote tracking reference */ @@ -59,7 +59,7 @@ void test_clone_empty__can_clone_an_empty_local_repo_barely(void) cl_assert_equal_s(expected_remote_name, buffer); - /* ...even when the remote HEAD is orphaned as well */ + /* ...even when the remote HEAD is unborn as well */ cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&ref, g_repo_cloned, expected_tracked_branch_name)); } diff --git a/tests-clar/clone/nonetwork.c b/tests-clar/clone/nonetwork.c index 339b1e70d..5b9faa645 100644 --- a/tests-clar/clone/nonetwork.c +++ b/tests-clar/clone/nonetwork.c @@ -228,7 +228,7 @@ void test_clone_nonetwork__can_checkout_given_branch(void) g_options.checkout_branch = "test"; cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); - cl_assert_equal_i(0, git_repository_head_orphan(g_repo)); + cl_assert_equal_i(0, git_repository_head_unborn(g_repo)); cl_git_pass(git_repository_head(&g_ref, g_repo)); cl_assert_equal_s(git_reference_name(g_ref), "refs/heads/test"); |