summaryrefslogtreecommitdiff
path: root/t/t3201-branch-contains.sh
blob: f86f4bc5ebcc0e36ddb4071a6aeb855e1039faa6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
#!/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 'side: branch --merged' '
 
	git branch --merged >actual &&
	{
		echo "  master" &&
		echo "* side"
	} >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_done