From: Junio C Hamano Date: Fri, 9 Feb 2024 00:22:09 +0000 (-0800) Subject: Merge branch 'jc/orphan-unborn' into maint-2.43 X-Git-Tag: v2.43.1~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=974c9369aa98037b0059e4257144f01af62fae71;p=thirdparty%2Fgit.git 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 --- 974c9369aa98037b0059e4257144f01af62fae71 diff --cc t/t2400-worktree-add.sh index 245656b53a,cbad2bd22b..4b7627e852 --- a/t/t2400-worktree-add.sh +++ b/t/t2400-worktree-add.sh @@@ -709,9 -709,9 +709,9 @@@ test_expect_success 'git worktree --no- 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: '[-a-z]*' and '[-a-z]*' cannot be used together" && + local bad_combo_regex="^fatal: options '[-a-z]*' and '[-a-z]*' cannot be used together" && local git_ns="repo" && local dashc_args="-C $git_ns" &&