diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2013-09-17 09:50:30 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2013-09-17 09:50:30 +0200 |
| commit | 605da51a2cfd86901b6fa5f9cf71111a63ab4418 (patch) | |
| tree | dbe23d26a4cbd93d457c68fdec7b4b10605314ac /src/remote.c | |
| parent | c62b5ca590fb2f1743f43439b04159b168a36dda (diff) | |
| download | libgit2-605da51a2cfd86901b6fa5f9cf71111a63ab4418.tar.gz | |
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 'src/remote.c')
| -rw-r--r-- | src/remote.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/remote.c b/src/remote.c index bdc8e0e67..bfcb3eb65 100644 --- a/src/remote.c +++ b/src/remote.c @@ -806,7 +806,7 @@ static int remote_head_for_ref(git_remote_head **out, git_refspec *spec, git_vec (!git_reference_is_branch(resolved_ref)) || (error = git_branch_upstream(&tracking_ref, resolved_ref)) < 0 || (error = git_refspec_transform_l(&remote_name, spec, git_reference_name(tracking_ref))) < 0) { - /* Not an error if HEAD is orphaned or no tracking branch */ + /* Not an error if HEAD is unborn or no tracking branch */ if (error == GIT_ENOTFOUND) error = 0; |