diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:10 -0800 |
| commit | 974c9369aa98037b0059e4257144f01af62fae71 (patch) | |
| tree | 6b639a81629ed0f3908c35735ce084c754dfc377 /t | |
| parent | Merge branch 'la/trailer-cleanups' into maint-2.43 (diff) | |
| parent | orphan/unborn: fix use of 'orphan' in end-user facing messages (diff) | |
| download | git-974c9369aa98037b0059e4257144f01af62fae71.tar.gz git-974c9369aa98037b0059e4257144f01af62fae71.zip | |
Merge branch 'jc/orphan-unborn' into maint-2.43
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 245656b53a..4b7627e852 100755 --- a/t/t2400-worktree-add.sh +++ b/t/t2400-worktree-add.sh @@ -415,7 +415,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 @@ -436,7 +436,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' ' @@ -709,7 +709,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" && |