mirror of
https://github.com/git/git.git
synced 2024-05-23 20:46:10 +02:00
d65aea37d9
Add missing tests for --remotes, --list and --merge-base. These are not exhaustive, but better than the nothing we have now. There were some tests for this command added inf76412ed6d([PATCH] Add 'git show-branch'., 2005-08-21) has never been properly tested, namely for the --all option in t6432-merge-recursive-space-options.sh, and some of --merge-base and --independent in t6010-merge-base.sh. This fixes a few more blind spots, but there's still a lot of behavior that's not tested for. These new tests show the odd (and possibly unintentional) behavior of --merge-base with one argument, and how its output is the same as "git merge-base" with N bases in this particular case. See the test added inf621a8454d(git-merge-base/git-show-branch --merge-base: Documentation and test, 2009-08-05) for a case where the two aren't the same. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
150 lines
4.2 KiB
Bash
Executable File
150 lines
4.2 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test show-branch'
|
|
|
|
. ./test-lib.sh
|
|
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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_done
|