summaryrefslogtreecommitdiff
path: root/t/t7604-merge-custom-message.sh
blob: 9114785ef7c850ae2d393bed3565e13f11339ba0 (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
#!/bin/sh
 
test_description='git merge
 
Testing merge when using a custom message for the merge commit.'
 
. ./test-lib.sh
 
create_merge_msgs() {
	echo >exp.subject "custom message"
 
	cp exp.subject exp.log &&
	echo >>exp.log "" &&
	echo >>exp.log "* commit 'c2':" &&
	echo >>exp.log "  c2"
}
 
test_expect_success 'setup' '
	echo c0 > c0.c &&
	git add c0.c &&
	git commit -m c0 &&
	git tag c0 &&
	echo c1 > c1.c &&
	git add c1.c &&
	git commit -m c1 &&
	git tag c1 &&
	git reset --hard c0 &&
	echo c2 > c2.c &&
	git add c2.c &&
	git commit -m c2 &&
	git tag c2 &&
	create_merge_msgs
'
 
 
test_expect_success 'merge c2 with a custom message' '
	git reset --hard c1 &&
	git merge -m "$(cat exp.subject)" c2 &&
	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
	test_cmp exp.subject actual
'
 
test_expect_success 'merge --log appends to custom message' '
	git reset --hard c1 &&
	git merge --log -m "$(cat exp.subject)" c2 &&
	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
	test_cmp exp.log actual
'
 
test_done