Junio C Hamano
17 years ago
2 changed files with 62 additions and 0 deletions
@ -0,0 +1,58 @@
@@ -0,0 +1,58 @@
|
||||
#!/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 |
Loading…
Reference in new issue