summaryrefslogtreecommitdiff
path: root/t/t6200-fmt-merge-msg.sh
blob: 526d7d1c4422e342c7257e260626dac3dda36a3a (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
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
#!/bin/sh
#
# Copyright (c) 2006, Junio C Hamano
#
 
test_description='fmt-merge-msg test'
 
. ./test-lib.sh
 
datestamp=1151939923
setdate () {
	GIT_COMMITTER_DATE="$datestamp +0200"
	GIT_AUTHOR_DATE="$datestamp +0200"
	datestamp=`expr "$datestamp" + 1`
	export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
}
 
test_expect_success setup '
	echo one >one &&
	git add one &&
	setdate &&
	git commit -m "Initial" &&
 
	echo uno >one &&
	echo dos >two &&
	git add two &&
	setdate &&
	git commit -a -m "Second" &&
 
	git checkout -b left &&
 
	echo $datestamp >one &&
	setdate &&
	git commit -a -m "Common #1" &&
 
	echo $datestamp >one &&
	setdate &&
	git commit -a -m "Common #2" &&
 
	git branch right &&
 
	echo $datestamp >two &&
	setdate &&
	git commit -a -m "Left #3" &&
 
	echo $datestamp >two &&
	setdate &&
	git commit -a -m "Left #4" &&
 
	echo $datestamp >two &&
	setdate &&
	git commit -a -m "Left #5" &&
 
	git checkout right &&
 
	echo $datestamp >three &&
	git add three &&
	setdate &&
	git commit -a -m "Right #3" &&
 
	echo $datestamp >three &&
	setdate &&
	git commit -a -m "Right #4" &&
 
	echo $datestamp >three &&
	setdate &&
	git commit -a -m "Right #5" &&
 
	git show-branch
'
 
cat >expected <<\EOF
Merge branch 'left'
EOF
 
test_expect_success 'merge-msg test #1' '
 
	git checkout master &&
	git fetch . left &&
 
	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
	git diff actual expected
'
 
cat >expected <<\EOF
Merge branch 'left' of ../trash
EOF
 
test_expect_success 'merge-msg test #2' '
 
	git checkout master &&
	git fetch ../trash left &&
 
	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
	git diff actual expected
'
 
cat >expected <<\EOF
Merge branch 'left'
 
* left:
  Left #5
  Left #4
  Left #3
  Common #2
  Common #1
EOF
 
test_expect_success 'merge-msg test #3' '
 
	git config merge.summary true &&
 
	git checkout master &&
	setdate &&
	git fetch . left &&
 
	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
	git diff actual expected
'
 
cat >expected <<\EOF
Merge branches 'left' and 'right'
 
* left:
  Left #5
  Left #4
  Left #3
  Common #2
  Common #1
 
* right:
  Right #5
  Right #4
  Right #3
  Common #2
  Common #1
EOF
 
test_expect_success 'merge-msg test #4' '
 
	git config merge.summary true &&
 
	git checkout master &&
	setdate &&
	git fetch . left right &&
 
	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
	git diff actual expected
'
 
test_expect_success 'merge-msg test #5' '
 
	git config merge.summary yes &&
 
	git checkout master &&
	setdate &&
	git fetch . left right &&
 
	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
	git diff actual expected
'
 
test_done