branch: description for orphan branch errors
Inbcfc82bd48(branch: description for non-existent branch errors, 2022-10-08) we checked the HEAD in the current worktree to detect if the branch to operate with is an orphan branch, so as to avoid the confusing error: "No branch named...". If we are asked to operate with an orphan branch in a different working tree than the current one, we need to check the HEAD in that different working tree. Let's extend the check we did inbcfc82bd48, to check the HEADs in all worktrees linked to the current repository, using the helper introduced in31ad6b61bd(branch: add branch_checked_out() helper, 2022-06-15). The helper, branch_checked_out(), does its work obtaining internally a list of worktrees linked to the current repository. Obtaining that list is not a lightweight work because it implies disk access. In copy_or_rename_branch() we already have a list of worktrees. Let's use that already obtained list, and avoid using here the helper. Signed-off-by: Rubén Justo <rjusto@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
d7f4ca61b5
commit
7a6ccdfb4e
@@ -221,4 +221,22 @@ test_expect_success 'fatal descriptions on non-existent branch' '
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'error descriptions on orphan branch' '
|
||||
test_when_finished git worktree remove -f wt &&
|
||||
git worktree add wt --detach &&
|
||||
git -C wt checkout --orphan orphan-branch &&
|
||||
test_branch_op_in_wt() {
|
||||
test_orphan_error() {
|
||||
test_must_fail git $* 2>actual &&
|
||||
test_i18ngrep "No commit on branch .orphan-branch. yet.$" actual
|
||||
} &&
|
||||
test_orphan_error -C wt branch $1 $2 && # implicit branch
|
||||
test_orphan_error -C wt branch $1 orphan-branch $2 && # explicit branch
|
||||
test_orphan_error branch $1 orphan-branch $2 # different worktree
|
||||
} &&
|
||||
test_branch_op_in_wt --edit-description &&
|
||||
test_branch_op_in_wt --set-upstream-to=ne &&
|
||||
test_branch_op_in_wt -c new-branch
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
Reference in New Issue
Block a user