diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-03 00:51:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-03 00:51:30 +0300 |
| commit | 601b1571e8e61e7dc1473a6d5049261a9524f381 (patch) | |
| tree | ae5d81d26e499b97c0c4b87b70ae7ea635d7884e /t | |
| parent | cce4778520b6ade4bc839fe054500253f7d22570 (diff) | |
| parent | d44b517137ab0d869c81bd532163c3e3e85481e6 (diff) | |
Merge branch 'jc/orphan-unborn'
Doc updates to clarify what an "unborn branch" means.
* jc/orphan-unborn:
orphan/unborn: fix use of 'orphan' in end-user facing messages
orphan/unborn: add to the glossary and use them consistently
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2400-worktree-add.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh index b7b667270a..3742971105 100755 --- a/t/t2400-worktree-add.sh +++ b/t/t2400-worktree-add.sh @@ -437,7 +437,7 @@ test_wt_add_orphan_hint () { git -C repo switch --orphan noref && test_must_fail git -C repo worktree add $opts foobar/ 2>actual && ! grep "error: unknown switch" actual && - grep "hint: If you meant to create a worktree containing a new orphan branch" actual && + grep "hint: If you meant to create a worktree containing a new unborn branch" actual && if [ $use_branch -eq 1 ] then grep -E "^hint: +git worktree add --orphan -b [^ ]+ [^ ]+$" actual @@ -458,7 +458,7 @@ test_expect_success "'worktree add' doesn't show orphan hint in bad/orphan HEAD (cd repo && test_commit commit) && test_must_fail git -C repo worktree add --quiet foobar_branch foobar/ 2>actual && ! grep "error: unknown switch" actual && - ! grep "hint: If you meant to create a worktree containing a new orphan branch" actual + ! grep "hint: If you meant to create a worktree containing a new unborn branch" actual ' test_expect_success 'local clone from linked checkout' ' @@ -731,7 +731,7 @@ test_expect_success 'git worktree --no-guess-remote option overrides config' ' test_dwim_orphan () { local info_text="No possible source branch, inferring '--orphan'" && local fetch_error_text="fatal: No local or remote refs exist despite at least one remote" && - local orphan_hint="hint: If you meant to create a worktree containing a new orphan branch" && + local orphan_hint="hint: If you meant to create a worktree containing a new unborn branch" && local invalid_ref_regex="^fatal: invalid reference: " && local bad_combo_regex="^fatal: options '[-a-z]*' and '[-a-z]*' cannot be used together" && |