summaryrefslogtreecommitdiff
path: root/t/t4014-format-patch.sh
blob: 0a6fe53375bb26e5c3a69d503f6f13833a2020fa (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
#!/bin/sh
#
# Copyright (c) 2006 Junio C Hamano
#
 
test_description='Format-patch skipping already incorporated patches'
 
. ./test-lib.sh
 
test_expect_success setup '
 
	for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
	cat file >elif &&
	git add file elif &&
	git commit -m Initial &&
	git checkout -b side &&
 
	for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file &&
	chmod +x elif &&
	git update-index file elif &&
	git update-index --chmod=+x elif &&
	git commit -m "Side changes #1" &&
 
	for i in D E F; do echo "$i"; done >>file &&
	git update-index file &&
	git commit -m "Side changes #2" &&
	git tag C2 &&
 
	for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
	git update-index file &&
	git commit -m "Side changes #3 with \\n backslash-n in it." &&
 
	git checkout master &&
	git diff-tree -p C2 | git apply --index &&
	git commit -m "Master accepts moral equivalent of #2"
 
'
 
test_expect_success "format-patch --ignore-if-in-upstream" '
 
	git format-patch --stdout master..side >patch0 &&
	cnt=`grep "^From " patch0 | wc -l` &&
	test $cnt = 3
 
'
 
test_expect_success "format-patch --ignore-if-in-upstream" '
 
	git format-patch --stdout \
		--ignore-if-in-upstream master..side >patch1 &&
	cnt=`grep "^From " patch1 | wc -l` &&
	test $cnt = 2
 
'
 
test_expect_success "format-patch result applies" '
 
	git checkout -b rebuild-0 master &&
	git am -3 patch0 &&
	cnt=`git rev-list master.. | wc -l` &&
	test $cnt = 2
'
 
test_expect_success "format-patch --ignore-if-in-upstream result applies" '
 
	git checkout -b rebuild-1 master &&
	git am -3 patch1 &&
	cnt=`git rev-list master.. | wc -l` &&
	test $cnt = 2
'
 
test_expect_success 'commit did not screw up the log message' '
 
	git cat-file commit side | grep "^Side .* with .* backslash-n"
 
'
 
test_expect_success 'format-patch did not screw up the log message' '
 
	grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
	grep "^Subject: .*Side changes #3 with .* backslash-n" patch1
 
'
 
test_expect_success 'replay did not screw up the log message' '
 
	git cat-file commit rebuild-1 | grep "^Side .* with .* backslash-n"
 
'
 
test_done