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 /src/submodule.c | |
| 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 'src/submodule.c')
| -rw-r--r-- | src/submodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/submodule.c b/src/submodule.c index 40bda9a41..121383b9c 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -1557,7 +1557,7 @@ static void submodule_get_wd_status( if (ign == GIT_SUBMODULE_IGNORE_NONE) opt.flags |= GIT_DIFF_INCLUDE_UNTRACKED; - /* if we don't have an orphaned head, check diff with index */ + /* if we don't have an unborn head, check diff with index */ if (git_repository_head_tree(&sm_head, sm_repo) < 0) giterr_clear(); else { |