mirror of
https://github.com/git/git.git
synced 2024-11-15 05:33:04 +01:00
59 lines
875 B
Bash
59 lines
875 B
Bash
|
#!/bin/sh
|
||
|
|
||
|
test_description='branch --contains <commit>'
|
||
|
|
||
|
. ./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 &&
|
||
|
diff -u expect actual
|
||
|
|
||
|
'
|
||
|
|
||
|
test_expect_success 'branch --contains master' '
|
||
|
|
||
|
git branch --contains master >actual &&
|
||
|
{
|
||
|
echo " master" && echo "* side"
|
||
|
} >expect &&
|
||
|
diff -u expect actual
|
||
|
|
||
|
'
|
||
|
|
||
|
test_expect_success 'branch --contains=side' '
|
||
|
|
||
|
git branch --contains=side >actual &&
|
||
|
{
|
||
|
echo "* side"
|
||
|
} >expect &&
|
||
|
diff -u expect actual
|
||
|
|
||
|
'
|
||
|
|
||
|
test_done
|