7a6ccdfb4e
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>
243 lines
7.2 KiB
Bash
Executable File
243 lines
7.2 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test show-branch'
|
|
|
|
. ./test-lib.sh
|
|
|
|
# arbitrary reference time: 2009-08-30 19:20:00
|
|
GIT_TEST_DATE_NOW=1251660000; export GIT_TEST_DATE_NOW
|
|
|
|
test_expect_success 'error descriptions on empty repository' '
|
|
current=$(git branch --show-current) &&
|
|
cat >expect <<-EOF &&
|
|
error: No commit on branch '\''$current'\'' yet.
|
|
EOF
|
|
test_must_fail git branch --edit-description 2>actual &&
|
|
test_cmp expect actual &&
|
|
test_must_fail git branch --edit-description $current 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'fatal descriptions on empty repository' '
|
|
current=$(git branch --show-current) &&
|
|
cat >expect <<-EOF &&
|
|
fatal: No commit on branch '\''$current'\'' yet.
|
|
EOF
|
|
test_must_fail git branch --set-upstream-to=non-existent 2>actual &&
|
|
test_cmp expect actual &&
|
|
test_must_fail git branch -c new-branch 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit initial &&
|
|
for i in $(test_seq 1 10)
|
|
do
|
|
git checkout -b branch$i initial &&
|
|
test_commit --no-tag branch$i || return 1
|
|
done &&
|
|
git for-each-ref \
|
|
--sort=version:refname \
|
|
--format="%(refname:strip=2)" \
|
|
"refs/heads/branch*" >branches.sorted &&
|
|
sed "s/^> //" >expect <<-\EOF
|
|
> ! [branch1] branch1
|
|
> ! [branch2] branch2
|
|
> ! [branch3] branch3
|
|
> ! [branch4] branch4
|
|
> ! [branch5] branch5
|
|
> ! [branch6] branch6
|
|
> ! [branch7] branch7
|
|
> ! [branch8] branch8
|
|
> ! [branch9] branch9
|
|
> * [branch10] branch10
|
|
> ----------
|
|
> * [branch10] branch10
|
|
> + [branch9] branch9
|
|
> + [branch8] branch8
|
|
> + [branch7] branch7
|
|
> + [branch6] branch6
|
|
> + [branch5] branch5
|
|
> + [branch4] branch4
|
|
> + [branch3] branch3
|
|
> + [branch2] branch2
|
|
> + [branch1] branch1
|
|
> +++++++++* [branch10^] initial
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'show-branch with more than 8 branches' '
|
|
git show-branch $(cat branches.sorted) >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'show-branch with showbranch.default' '
|
|
for branch in $(cat branches.sorted)
|
|
do
|
|
test_config showbranch.default $branch --add || return 1
|
|
done &&
|
|
git show-branch >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'show-branch --color output' '
|
|
sed "s/^> //" >expect <<-\EOF &&
|
|
> <RED>!<RESET> [branch1] branch1
|
|
> <GREEN>!<RESET> [branch2] branch2
|
|
> <YELLOW>!<RESET> [branch3] branch3
|
|
> <BLUE>!<RESET> [branch4] branch4
|
|
> <MAGENTA>!<RESET> [branch5] branch5
|
|
> <CYAN>!<RESET> [branch6] branch6
|
|
> <BOLD;RED>!<RESET> [branch7] branch7
|
|
> <BOLD;GREEN>!<RESET> [branch8] branch8
|
|
> <BOLD;YELLOW>!<RESET> [branch9] branch9
|
|
> <BOLD;BLUE>*<RESET> [branch10] branch10
|
|
> ----------
|
|
> <BOLD;BLUE>*<RESET> [branch10] branch10
|
|
> <BOLD;YELLOW>+<RESET> [branch9] branch9
|
|
> <BOLD;GREEN>+<RESET> [branch8] branch8
|
|
> <BOLD;RED>+<RESET> [branch7] branch7
|
|
> <CYAN>+<RESET> [branch6] branch6
|
|
> <MAGENTA>+<RESET> [branch5] branch5
|
|
> <BLUE>+<RESET> [branch4] branch4
|
|
> <YELLOW>+<RESET> [branch3] branch3
|
|
> <GREEN>+<RESET> [branch2] branch2
|
|
> <RED>+<RESET> [branch1] branch1
|
|
> <RED>+<RESET><GREEN>+<RESET><YELLOW>+<RESET><BLUE>+<RESET><MAGENTA>+<RESET><CYAN>+<RESET><BOLD;RED>+<RESET><BOLD;GREEN>+<RESET><BOLD;YELLOW>+<RESET><BOLD;BLUE>*<RESET> [branch10^] initial
|
|
EOF
|
|
git show-branch --color=always $(cat branches.sorted) >actual.raw &&
|
|
test_decode_color <actual.raw >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'show branch --remotes' '
|
|
cat >expect.err <<-\EOF &&
|
|
No revs to be shown.
|
|
EOF
|
|
git show-branch -r 2>actual.err >actual.out &&
|
|
test_cmp expect.err actual.err &&
|
|
test_must_be_empty actual.out
|
|
'
|
|
|
|
test_expect_success 'setup show branch --list' '
|
|
sed "s/^> //" >expect <<-\EOF
|
|
> [branch1] branch1
|
|
> [branch2] branch2
|
|
> [branch3] branch3
|
|
> [branch4] branch4
|
|
> [branch5] branch5
|
|
> [branch6] branch6
|
|
> [branch7] branch7
|
|
> [branch8] branch8
|
|
> [branch9] branch9
|
|
> * [branch10] branch10
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'show branch --list' '
|
|
git show-branch --list $(cat branches.sorted) >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'show branch --list has no --color output' '
|
|
git show-branch --color=always --list $(cat branches.sorted) >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'show branch --merge-base with one argument' '
|
|
for branch in $(cat branches.sorted)
|
|
do
|
|
git rev-parse $branch >expect &&
|
|
git show-branch --merge-base $branch >actual &&
|
|
test_cmp expect actual || return 1
|
|
done
|
|
'
|
|
|
|
test_expect_success 'show branch --merge-base with two arguments' '
|
|
for branch in $(cat branches.sorted)
|
|
do
|
|
git rev-parse initial >expect &&
|
|
git show-branch --merge-base initial $branch >actual &&
|
|
test_cmp expect actual || return 1
|
|
done
|
|
'
|
|
|
|
test_expect_success 'show branch --merge-base with N arguments' '
|
|
git rev-parse initial >expect &&
|
|
git show-branch --merge-base $(cat branches.sorted) >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
git merge-base $(cat branches.sorted) >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'show branch --reflog=2' '
|
|
sed "s/^> //" >expect <<-\EOF &&
|
|
> ! [refs/heads/branch10@{0}] (4 years, 5 months ago) commit: branch10
|
|
> ! [refs/heads/branch10@{1}] (4 years, 5 months ago) commit: branch10
|
|
> --
|
|
> + [refs/heads/branch10@{0}] branch10
|
|
> ++ [refs/heads/branch10@{1}] initial
|
|
EOF
|
|
git show-branch --reflog=2 >actual &&
|
|
test_cmp actual expect
|
|
'
|
|
|
|
# incompatible options
|
|
while read combo
|
|
do
|
|
test_expect_success "show-branch $combo (should fail)" '
|
|
test_must_fail git show-branch $combo 2>error &&
|
|
grep -e "cannot be used together" -e "usage:" error
|
|
'
|
|
done <<\EOF
|
|
--all --reflog
|
|
--merge-base --reflog
|
|
--list --merge-base
|
|
--reflog --current
|
|
EOF
|
|
|
|
test_expect_success 'error descriptions on non-existent branch' '
|
|
cat >expect <<-EOF &&
|
|
error: No branch named '\''non-existent'\'.'
|
|
EOF
|
|
test_must_fail git branch --edit-description non-existent 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'fatal descriptions on non-existent branch' '
|
|
cat >expect <<-EOF &&
|
|
fatal: branch '\''non-existent'\'' does not exist
|
|
EOF
|
|
test_must_fail git branch --set-upstream-to=non-existent non-existent 2>actual &&
|
|
test_cmp expect actual &&
|
|
|
|
cat >expect <<-EOF &&
|
|
fatal: No branch named '\''non-existent'\''.
|
|
EOF
|
|
test_must_fail git branch -c non-existent new-branch 2>actual &&
|
|
test_cmp expect actual &&
|
|
test_must_fail git branch -m non-existent new-branch 2>actual &&
|
|
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
|