submodule: Use cat instead of echo to avoid DOS line-endings
[git/dscho.git] / t / t3201-branch-contains.sh
blobf86f4bc5ebcc0e36ddb4071a6aeb855e1039faa6
1 #!/bin/sh
3 test_description='branch --contains <commit>, --merged, and --no-merged'
5 . ./test-lib.sh
7 test_expect_success setup '
9 >file &&
10 git add file &&
11 test_tick &&
12 git commit -m initial &&
13 git branch side &&
15 echo 1 >file &&
16 test_tick &&
17 git commit -a -m "second on master" &&
19 git checkout side &&
20 echo 1 >file &&
21 test_tick &&
22 git commit -a -m "second on side" &&
24 git merge master
28 test_expect_success 'branch --contains=master' '
30 git branch --contains=master >actual &&
32 echo " master" && echo "* side"
33 } >expect &&
34 test_cmp expect actual
38 test_expect_success 'branch --contains master' '
40 git branch --contains master >actual &&
42 echo " master" && echo "* side"
43 } >expect &&
44 test_cmp expect actual
48 test_expect_success 'branch --contains=side' '
50 git branch --contains=side >actual &&
52 echo "* side"
53 } >expect &&
54 test_cmp expect actual
58 test_expect_success 'side: branch --merged' '
60 git branch --merged >actual &&
62 echo " master" &&
63 echo "* side"
64 } >expect &&
65 test_cmp expect actual
69 test_expect_success 'side: branch --no-merged' '
71 git branch --no-merged >actual &&
72 >expect &&
73 test_cmp expect actual
77 test_expect_success 'master: branch --merged' '
79 git checkout master &&
80 git branch --merged >actual &&
82 echo "* master"
83 } >expect &&
84 test_cmp expect actual
88 test_expect_success 'master: branch --no-merged' '
90 git branch --no-merged >actual &&
92 echo " side"
93 } >expect &&
94 test_cmp expect actual
98 test_done