]>
Commit | Line | Data |
---|---|---|
12ace0b2 KH |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com> | |
4 | # | |
5 | ||
6 | # FIXME: Test the various index usages, -i and -o, test reflog, | |
264474f2 | 7 | # signoff |
12ace0b2 | 8 | |
47a528ad | 9 | test_description='git commit' |
12ace0b2 KH |
10 | . ./test-lib.sh |
11 | ||
12 | test_tick | |
13 | ||
14 | test_expect_success \ | |
15 | "initial status" \ | |
16 | "echo 'bongo bongo' >file && | |
47a528ad NS |
17 | git add file && \ |
18 | git status | grep 'Initial commit'" | |
12ace0b2 | 19 | |
41ac414e | 20 | test_expect_success \ |
12ace0b2 | 21 | "fail initial amend" \ |
47a528ad | 22 | "test_must_fail git commit --amend" |
12ace0b2 KH |
23 | |
24 | test_expect_success \ | |
25 | "initial commit" \ | |
47a528ad | 26 | "git commit -m initial" |
12ace0b2 | 27 | |
41ac414e | 28 | test_expect_success \ |
12ace0b2 | 29 | "invalid options 1" \ |
47a528ad | 30 | "test_must_fail git commit -m foo -m bar -F file" |
12ace0b2 | 31 | |
41ac414e | 32 | test_expect_success \ |
12ace0b2 | 33 | "invalid options 2" \ |
47a528ad | 34 | "test_must_fail git commit -C HEAD -m illegal" |
12ace0b2 | 35 | |
41ac414e | 36 | test_expect_success \ |
9d87442f BS |
37 | "using paths with -a" \ |
38 | "echo King of the bongo >file && | |
47a528ad | 39 | test_must_fail git commit -m foo -a file" |
9d87442f | 40 | |
1b19ccd2 | 41 | test_expect_success PERL \ |
9d87442f BS |
42 | "using paths with --interactive" \ |
43 | "echo bong-o-bong >file && | |
47a528ad | 44 | ! (echo 7 | git commit -m foo --interactive file)" |
9d87442f | 45 | |
41ac414e | 46 | test_expect_success \ |
12ace0b2 | 47 | "using invalid commit with -C" \ |
47a528ad | 48 | "test_must_fail git commit -C bogus" |
12ace0b2 | 49 | |
41ac414e | 50 | test_expect_success \ |
12ace0b2 | 51 | "testing nothing to commit" \ |
47a528ad | 52 | "test_must_fail git commit -m initial" |
12ace0b2 KH |
53 | |
54 | test_expect_success \ | |
55 | "next commit" \ | |
56 | "echo 'bongo bongo bongo' >file \ | |
47a528ad | 57 | git commit -m next -a" |
12ace0b2 | 58 | |
41ac414e | 59 | test_expect_success \ |
12ace0b2 KH |
60 | "commit message from non-existing file" \ |
61 | "echo 'more bongo: bongo bongo bongo bongo' >file && \ | |
47a528ad | 62 | test_must_fail git commit -F gah -a" |
12ace0b2 KH |
63 | |
64 | # Empty except stray tabs and spaces on a few lines. | |
65 | sed -e 's/@$//' >msg <<EOF | |
66 | @ | |
67 | ||
68 | @ | |
69 | Signed-off-by: hula | |
70 | EOF | |
41ac414e | 71 | test_expect_success \ |
12ace0b2 | 72 | "empty commit message" \ |
47a528ad | 73 | "test_must_fail git commit -F msg -a" |
12ace0b2 KH |
74 | |
75 | test_expect_success \ | |
76 | "commit message from file" \ | |
77 | "echo 'this is the commit message, coming from a file' >msg && \ | |
47a528ad | 78 | git commit -F msg -a" |
12ace0b2 KH |
79 | |
80 | cat >editor <<\EOF | |
81 | #!/bin/sh | |
f69e836f BD |
82 | sed -e "s/a file/an amend commit/g" < "$1" > "$1-" |
83 | mv "$1-" "$1" | |
12ace0b2 KH |
84 | EOF |
85 | chmod 755 editor | |
86 | ||
87 | test_expect_success \ | |
88 | "amend commit" \ | |
d33738d7 | 89 | "EDITOR=./editor git commit --amend" |
12ace0b2 | 90 | |
41ac414e | 91 | test_expect_success \ |
6d4bbebd | 92 | "passing -m and -F" \ |
12ace0b2 | 93 | "echo 'enough with the bongos' >file && \ |
47a528ad | 94 | test_must_fail git commit -F msg -m amending ." |
12ace0b2 KH |
95 | |
96 | test_expect_success \ | |
97 | "using message from other commit" \ | |
47a528ad | 98 | "git commit -C HEAD^ ." |
12ace0b2 KH |
99 | |
100 | cat >editor <<\EOF | |
101 | #!/bin/sh | |
f69e836f BD |
102 | sed -e "s/amend/older/g" < "$1" > "$1-" |
103 | mv "$1-" "$1" | |
12ace0b2 KH |
104 | EOF |
105 | chmod 755 editor | |
106 | ||
107 | test_expect_success \ | |
108 | "editing message from other commit" \ | |
109 | "echo 'hula hula' >file && \ | |
d33738d7 | 110 | EDITOR=./editor git commit -c HEAD^ -a" |
12ace0b2 KH |
111 | |
112 | test_expect_success \ | |
113 | "message from stdin" \ | |
114 | "echo 'silly new contents' >file && \ | |
47a528ad | 115 | echo commit message from stdin | git commit -F - -a" |
12ace0b2 KH |
116 | |
117 | test_expect_success \ | |
118 | "overriding author from command line" \ | |
119 | "echo 'gak' >file && \ | |
49ff9a7a JK |
120 | git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a >output 2>&1" |
121 | ||
122 | test_expect_success \ | |
123 | "commit --author output mentions author" \ | |
124 | "grep Rubber.Duck output" | |
12ace0b2 | 125 | |
1b19ccd2 | 126 | test_expect_success PERL \ |
12ace0b2 | 127 | "interactive add" \ |
47a528ad | 128 | "echo 7 | git commit --interactive | grep 'What now'" |
12ace0b2 KH |
129 | |
130 | test_expect_success \ | |
131 | "showing committed revisions" \ | |
47a528ad | 132 | "git rev-list HEAD >current" |
12ace0b2 | 133 | |
7eb5bbdb AS |
134 | cat >editor <<\EOF |
135 | #!/bin/sh | |
136 | sed -e "s/good/bad/g" < "$1" > "$1-" | |
137 | mv "$1-" "$1" | |
138 | EOF | |
139 | chmod 755 editor | |
140 | ||
141 | cat >msg <<EOF | |
142 | A good commit message. | |
143 | EOF | |
144 | ||
145 | test_expect_success \ | |
146 | 'editor not invoked if -F is given' ' | |
147 | echo "moo" >file && | |
d33738d7 | 148 | EDITOR=./editor git commit -a -F msg && |
7eb5bbdb AS |
149 | git show -s --pretty=format:"%s" | grep -q good && |
150 | echo "quack" >file && | |
d33738d7 | 151 | echo "Another good message." | EDITOR=./editor git commit -a -F - && |
7eb5bbdb AS |
152 | git show -s --pretty=format:"%s" | grep -q good |
153 | ' | |
12ace0b2 KH |
154 | # We could just check the head sha1, but checking each commit makes it |
155 | # easier to isolate bugs. | |
156 | ||
157 | cat >expected <<\EOF | |
158 | 72c0dc9855b0c9dadcbfd5a31cab072e0cb774ca | |
159 | 9b88fc14ce6b32e3d9ee021531a54f18a5cf38a2 | |
160 | 3536bbb352c3a1ef9a420f5b4242d48578b92aa7 | |
161 | d381ac431806e53f3dd7ac2f1ae0534f36d738b9 | |
162 | 4fd44095ad6334f3ef72e4c5ec8ddf108174b54a | |
163 | 402702b49136e7587daa9280e91e4bb7cb2179f7 | |
164 | EOF | |
165 | ||
166 | test_expect_success \ | |
47a528ad | 167 | 'validate git rev-list output.' \ |
1e368681 | 168 | 'test_cmp expected current' |
12ace0b2 | 169 | |
db33af0a | 170 | test_expect_success 'partial commit that involves removal (1)' ' |
80bffaf7 JH |
171 | |
172 | git rm --cached file && | |
173 | mv file elif && | |
174 | git add elif && | |
175 | git commit -m "Partial: add elif" elif && | |
176 | git diff-tree --name-status HEAD^ HEAD >current && | |
177 | echo "A elif" >expected && | |
1e368681 | 178 | test_cmp expected current |
80bffaf7 JH |
179 | |
180 | ' | |
181 | ||
db33af0a | 182 | test_expect_success 'partial commit that involves removal (2)' ' |
80bffaf7 JH |
183 | |
184 | git commit -m "Partial: remove file" file && | |
185 | git diff-tree --name-status HEAD^ HEAD >current && | |
186 | echo "D file" >expected && | |
1e368681 | 187 | test_cmp expected current |
80bffaf7 JH |
188 | |
189 | ' | |
190 | ||
db33af0a JH |
191 | test_expect_success 'partial commit that involves removal (3)' ' |
192 | ||
193 | git rm --cached elif && | |
194 | echo elif >elif && | |
195 | git commit -m "Partial: modify elif" elif && | |
196 | git diff-tree --name-status HEAD^ HEAD >current && | |
197 | echo "M elif" >expected && | |
1e368681 | 198 | test_cmp expected current |
db33af0a JH |
199 | |
200 | ' | |
201 | ||
5aa5cd46 JH |
202 | author="The Real Author <someguy@his.email.org>" |
203 | test_expect_success 'amend commit to fix author' ' | |
204 | ||
205 | oldtick=$GIT_AUTHOR_DATE && | |
206 | test_tick && | |
207 | git reset --hard && | |
208 | git cat-file -p HEAD | | |
209 | sed -e "s/author.*/author $author $oldtick/" \ | |
210 | -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \ | |
211 | expected && | |
212 | git commit --amend --author="$author" && | |
213 | git cat-file -p HEAD > current && | |
1e368681 | 214 | test_cmp expected current |
5aa5cd46 JH |
215 | |
216 | ' | |
217 | ||
02b47cd7 MV |
218 | test_expect_success 'amend commit to fix date' ' |
219 | ||
220 | test_tick && | |
221 | newtick=$GIT_AUTHOR_DATE && | |
222 | git reset --hard && | |
223 | git cat-file -p HEAD | | |
224 | sed -e "s/author.*/author $author $newtick/" \ | |
225 | -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \ | |
226 | expected && | |
227 | git commit --amend --date="$newtick" && | |
228 | git cat-file -p HEAD > current && | |
229 | test_cmp expected current | |
230 | ||
231 | ' | |
232 | ||
5aa5cd46 JH |
233 | test_expect_success 'sign off (1)' ' |
234 | ||
235 | echo 1 >positive && | |
236 | git add positive && | |
237 | git commit -s -m "thank you" && | |
238 | git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && | |
239 | ( | |
240 | echo thank you | |
241 | echo | |
242 | git var GIT_COMMITTER_IDENT | | |
243 | sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" | |
244 | ) >expected && | |
82ebb0b6 | 245 | test_cmp expected actual |
5aa5cd46 JH |
246 | |
247 | ' | |
248 | ||
249 | test_expect_success 'sign off (2)' ' | |
250 | ||
251 | echo 2 >positive && | |
252 | git add positive && | |
253 | existing="Signed-off-by: Watch This <watchthis@example.com>" && | |
254 | git commit -s -m "thank you | |
255 | ||
256 | $existing" && | |
257 | git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && | |
258 | ( | |
259 | echo thank you | |
260 | echo | |
261 | echo $existing | |
262 | git var GIT_COMMITTER_IDENT | | |
263 | sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" | |
264 | ) >expected && | |
82ebb0b6 | 265 | test_cmp expected actual |
5aa5cd46 JH |
266 | |
267 | ' | |
268 | ||
c1e01b0c DB |
269 | test_expect_success 'signoff gap' ' |
270 | ||
271 | echo 3 >positive && | |
272 | git add positive && | |
273 | alt="Alt-RFC-822-Header: Value" && | |
274 | git commit -s -m "welcome | |
275 | ||
276 | $alt" && | |
277 | git cat-file commit HEAD | sed -e "1,/^\$/d" > actual && | |
278 | ( | |
279 | echo welcome | |
280 | echo | |
281 | echo $alt | |
282 | git var GIT_COMMITTER_IDENT | | |
283 | sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" | |
284 | ) >expected && | |
285 | test_cmp expected actual | |
286 | ' | |
287 | ||
288 | test_expect_success 'signoff gap 2' ' | |
289 | ||
290 | echo 4 >positive && | |
291 | git add positive && | |
292 | alt="fixed: 34" && | |
293 | git commit -s -m "welcome | |
294 | ||
295 | We have now | |
296 | $alt" && | |
297 | git cat-file commit HEAD | sed -e "1,/^\$/d" > actual && | |
298 | ( | |
299 | echo welcome | |
300 | echo | |
301 | echo We have now | |
302 | echo $alt | |
303 | echo | |
304 | git var GIT_COMMITTER_IDENT | | |
305 | sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" | |
306 | ) >expected && | |
307 | test_cmp expected actual | |
308 | ' | |
309 | ||
5aa5cd46 JH |
310 | test_expect_success 'multiple -m' ' |
311 | ||
312 | >negative && | |
313 | git add negative && | |
314 | git commit -m "one" -m "two" -m "three" && | |
315 | git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && | |
316 | ( | |
317 | echo one | |
318 | echo | |
319 | echo two | |
320 | echo | |
321 | echo three | |
322 | ) >expected && | |
82ebb0b6 | 323 | test_cmp expected actual |
5aa5cd46 JH |
324 | |
325 | ' | |
326 | ||
d63c2fd1 KH |
327 | author="The Real Author <someguy@his.email.org>" |
328 | test_expect_success 'amend commit to fix author' ' | |
329 | ||
330 | oldtick=$GIT_AUTHOR_DATE && | |
331 | test_tick && | |
332 | git reset --hard && | |
333 | git cat-file -p HEAD | | |
334 | sed -e "s/author.*/author $author $oldtick/" \ | |
335 | -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \ | |
336 | expected && | |
337 | git commit --amend --author="$author" && | |
338 | git cat-file -p HEAD > current && | |
1e368681 | 339 | test_cmp expected current |
d63c2fd1 KH |
340 | |
341 | ' | |
1200993a KH |
342 | |
343 | test_expect_success 'git commit <file> with dirty index' ' | |
344 | echo tacocat > elif && | |
345 | echo tehlulz > chz && | |
346 | git add chz && | |
347 | git commit elif -m "tacocat is a palindrome" && | |
348 | git show --stat | grep elif && | |
349 | git diff --cached | grep chz | |
350 | ' | |
351 | ||
13aba1e5 JS |
352 | test_expect_success 'same tree (single parent)' ' |
353 | ||
31cbb5d9 JH |
354 | git reset --hard |
355 | ||
13aba1e5 JS |
356 | if git commit -m empty |
357 | then | |
358 | echo oops -- should have complained | |
359 | false | |
360 | else | |
361 | : happy | |
362 | fi | |
363 | ||
364 | ' | |
365 | ||
36863af1 JH |
366 | test_expect_success 'same tree (single parent) --allow-empty' ' |
367 | ||
368 | git commit --allow-empty -m "forced empty" && | |
369 | git cat-file commit HEAD | grep forced | |
370 | ||
371 | ' | |
372 | ||
13aba1e5 JS |
373 | test_expect_success 'same tree (merge and amend merge)' ' |
374 | ||
375 | git checkout -b side HEAD^ && | |
376 | echo zero >zero && | |
377 | git add zero && | |
378 | git commit -m "add zero" && | |
379 | git checkout master && | |
380 | ||
381 | git merge -s ours side -m "empty ok" && | |
382 | git diff HEAD^ HEAD >actual && | |
383 | : >expected && | |
82ebb0b6 | 384 | test_cmp expected actual && |
13aba1e5 JS |
385 | |
386 | git commit --amend -m "empty really ok" && | |
387 | git diff HEAD^ HEAD >actual && | |
388 | : >expected && | |
82ebb0b6 | 389 | test_cmp expected actual |
13aba1e5 JS |
390 | |
391 | ' | |
392 | ||
1eb1e9ee JH |
393 | test_expect_success 'amend using the message from another commit' ' |
394 | ||
395 | git reset --hard && | |
396 | test_tick && | |
397 | git commit --allow-empty -m "old commit" && | |
398 | old=$(git rev-parse --verify HEAD) && | |
399 | test_tick && | |
400 | git commit --allow-empty -m "new commit" && | |
401 | new=$(git rev-parse --verify HEAD) && | |
402 | test_tick && | |
403 | git commit --allow-empty --amend -C "$old" && | |
404 | git show --pretty="format:%ad %s" "$old" >expected && | |
405 | git show --pretty="format:%ad %s" HEAD >actual && | |
82ebb0b6 | 406 | test_cmp expected actual |
1eb1e9ee JH |
407 | |
408 | ' | |
409 | ||
8a2f8733 JH |
410 | test_expect_success 'amend using the message from a commit named with tag' ' |
411 | ||
412 | git reset --hard && | |
413 | test_tick && | |
414 | git commit --allow-empty -m "old commit" && | |
415 | old=$(git rev-parse --verify HEAD) && | |
416 | git tag -a -m "tag on old" tagged-old HEAD && | |
417 | test_tick && | |
418 | git commit --allow-empty -m "new commit" && | |
419 | new=$(git rev-parse --verify HEAD) && | |
420 | test_tick && | |
421 | git commit --allow-empty --amend -C tagged-old && | |
422 | git show --pretty="format:%ad %s" "$old" >expected && | |
423 | git show --pretty="format:%ad %s" HEAD >actual && | |
82ebb0b6 | 424 | test_cmp expected actual |
8a2f8733 JH |
425 | |
426 | ' | |
427 | ||
6360d343 TR |
428 | test_expect_success 'amend can copy notes' ' |
429 | ||
430 | git config notes.rewrite.amend true && | |
431 | git config notes.rewriteRef "refs/notes/*" && | |
432 | test_commit foo && | |
433 | git notes add -m"a note" && | |
434 | test_tick && | |
435 | git commit --amend -m"new foo" && | |
436 | test "$(git notes show)" = "a note" | |
437 | ||
438 | ' | |
439 | ||
12ace0b2 | 440 | test_done |