You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
133 lines
2.2 KiB
133 lines
2.2 KiB
#!/bin/sh |
|
|
|
test_description='branch --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 --contains=side' ' |
|
|
|
git branch --contains=side >actual && |
|
{ |
|
echo "* side" |
|
} >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 '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 && |
|
>expect && |
|
test_cmp expect 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 && |
|
>expect && |
|
test_cmp expect 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_done
|
|
|