mirror of
https://github.com/git/git.git
synced 2024-12-11 10:54:21 +08:00
d3c6751b18
Change various tests that use an idiom of the form:
>expect &&
test_cmp expect actual
To instead use:
test_must_be_empty actual
The test_must_be_empty() wrapper was introduced in ca8d148daf ("test:
test_must_be_empty helper", 2013-06-09). Many of these tests have been
added after that time. This was mostly found with, and manually pruned
from:
git grep '^\s+>.*expect.* &&$' t
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
215 lines
4.2 KiB
Bash
Executable File
215 lines
4.2 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='branch --contains <commit>, --no-contains <commit> --merged, and --no-merged'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
>file &&
|
|
git add file &&
|
|
test_tick &&
|
|
git commit -m initial &&
|
|
git branch side &&
|
|
|
|
echo 1 >file &&
|
|
test_tick &&
|
|
git commit -a -m "second on master" &&
|
|
|
|
git checkout side &&
|
|
echo 1 >file &&
|
|
test_tick &&
|
|
git commit -a -m "second on side" &&
|
|
|
|
git merge master
|
|
|
|
'
|
|
|
|
test_expect_success 'branch --contains=master' '
|
|
|
|
git branch --contains=master >actual &&
|
|
{
|
|
echo " master" && echo "* side"
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
test_expect_success 'branch --contains master' '
|
|
|
|
git branch --contains master >actual &&
|
|
{
|
|
echo " master" && echo "* side"
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
test_expect_success 'branch --no-contains=master' '
|
|
|
|
git branch --no-contains=master >actual &&
|
|
test_must_be_empty actual
|
|
|
|
'
|
|
|
|
test_expect_success 'branch --no-contains master' '
|
|
|
|
git branch --no-contains master >actual &&
|
|
test_must_be_empty actual
|
|
|
|
'
|
|
|
|
test_expect_success 'branch --contains=side' '
|
|
|
|
git branch --contains=side >actual &&
|
|
{
|
|
echo "* side"
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
test_expect_success 'branch --no-contains=side' '
|
|
|
|
git branch --no-contains=side >actual &&
|
|
{
|
|
echo " master"
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
test_expect_success 'branch --contains with pattern implies --list' '
|
|
|
|
git branch --contains=master master >actual &&
|
|
{
|
|
echo " master"
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
test_expect_success 'branch --no-contains with pattern implies --list' '
|
|
|
|
git branch --no-contains=master master >actual &&
|
|
test_must_be_empty actual
|
|
|
|
'
|
|
|
|
test_expect_success 'side: branch --merged' '
|
|
|
|
git branch --merged >actual &&
|
|
{
|
|
echo " master" &&
|
|
echo "* side"
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
test_expect_success 'branch --merged with pattern implies --list' '
|
|
|
|
git branch --merged=side master >actual &&
|
|
{
|
|
echo " master"
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
test_expect_success 'side: branch --no-merged' '
|
|
|
|
git branch --no-merged >actual &&
|
|
test_must_be_empty actual
|
|
|
|
'
|
|
|
|
test_expect_success 'master: branch --merged' '
|
|
|
|
git checkout master &&
|
|
git branch --merged >actual &&
|
|
{
|
|
echo "* master"
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
test_expect_success 'master: branch --no-merged' '
|
|
|
|
git branch --no-merged >actual &&
|
|
{
|
|
echo " side"
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
test_expect_success 'branch --no-merged with pattern implies --list' '
|
|
|
|
git branch --no-merged=master master >actual &&
|
|
test_must_be_empty actual
|
|
|
|
'
|
|
|
|
test_expect_success 'implicit --list conflicts with modification options' '
|
|
|
|
test_must_fail git branch --contains=master -d &&
|
|
test_must_fail git branch --contains=master -m foo &&
|
|
test_must_fail git branch --no-contains=master -d &&
|
|
test_must_fail git branch --no-contains=master -m foo
|
|
|
|
'
|
|
|
|
test_expect_success 'Assert that --contains only works on commits, not trees & blobs' '
|
|
test_must_fail git branch --contains master^{tree} &&
|
|
blob=$(git hash-object -w --stdin <<-\EOF
|
|
Some blob
|
|
EOF
|
|
) &&
|
|
test_must_fail git branch --contains $blob &&
|
|
test_must_fail git branch --no-contains $blob
|
|
'
|
|
|
|
# We want to set up a case where the walk for the tracking info
|
|
# of one branch crosses the tip of another branch (and make sure
|
|
# that the latter walk does not mess up our flag to see if it was
|
|
# merged).
|
|
#
|
|
# Here "topic" tracks "master" with one extra commit, and "zzz" points to the
|
|
# same tip as master The name "zzz" must come alphabetically after "topic"
|
|
# as we process them in that order.
|
|
test_expect_success 'branch --merged with --verbose' '
|
|
git branch --track topic master &&
|
|
git branch zzz topic &&
|
|
git checkout topic &&
|
|
test_commit foo &&
|
|
git branch --merged topic >actual &&
|
|
cat >expect <<-\EOF &&
|
|
master
|
|
* topic
|
|
zzz
|
|
EOF
|
|
test_cmp expect actual &&
|
|
git branch --verbose --merged topic >actual &&
|
|
cat >expect <<-\EOF &&
|
|
master c77a0a9 second on master
|
|
* topic 2c939f4 [ahead 1] foo
|
|
zzz c77a0a9 second on master
|
|
EOF
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
test_expect_success 'branch --contains combined with --no-contains' '
|
|
git branch --contains zzz --no-contains topic >actual &&
|
|
cat >expect <<-\EOF &&
|
|
master
|
|
side
|
|
zzz
|
|
EOF
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
test_done
|