3 # Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>
6 # FIXME: Test the various index usages, -i and -o, test reflog,
9 test_description
='git commit'
16 "echo 'bongo bongo' >file &&
19 test_expect_success C_LOCALE_OUTPUT \
20 "Constructing initial commit" \
21 "git status | grep 'Initial commit'"
24 "fail initial amend" \
25 "test_must_fail git commit --amend"
29 "git commit -m initial"
33 "test_must_fail git commit -m foo -m bar -F file"
37 "test_must_fail git commit -C HEAD -m illegal"
40 "using paths with -a" \
41 "echo King of the bongo >file &&
42 test_must_fail git commit -m foo -a file"
44 test_expect_success PERL
'can use paths with --interactive' '
45 echo bong-o-bong >file &&
46 # 2: update, 1:st path, that is all, 7: quit
47 ( echo 2; echo 1; echo; echo 7 ) |
48 git commit -m foo --interactive file &&
49 git reset --hard HEAD^
53 "using invalid commit with -C" \
54 "test_must_fail git commit -C bogus"
57 "testing nothing to commit" \
58 "test_must_fail git commit -m initial"
62 "echo 'bongo bongo bongo' >file \
63 git commit -m next -a"
66 "commit message from non-existing file" \
67 "echo 'more bongo: bongo bongo bongo bongo' >file && \
68 test_must_fail git commit -F gah -a"
70 # Empty except stray tabs and spaces on a few lines.
71 sed -e 's/@$//' >msg
<<EOF
78 "empty commit message" \
79 "test_must_fail git commit -F msg -a"
82 "commit message from file" \
83 "echo 'this is the commit message, coming from a file' >msg && \
88 sed -e "s/a file/an amend commit/g" < "$1" > "$1-"
95 "EDITOR=./editor git commit --amend"
99 "echo 'enough with the bongos' >file && \
100 test_must_fail git commit -F msg -m amending ."
102 test_expect_success \
103 "using message from other commit" \
104 "git commit -C HEAD^ ."
108 sed -e "s/amend/older/g" < "$1" > "$1-"
113 test_expect_success \
114 "editing message from other commit" \
115 "echo 'hula hula' >file && \
116 EDITOR=./editor git commit -c HEAD^ -a"
118 test_expect_success \
119 "message from stdin" \
120 "echo 'silly new contents' >file && \
121 echo commit message from stdin | git commit -F - -a"
123 test_expect_success \
124 "overriding author from command line" \
125 "echo 'gak' >file && \
126 git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a >output 2>&1"
128 test_expect_success \
129 "commit --author output mentions author" \
130 "grep Rubber.Duck output"
132 test_expect_success PERL \
134 "echo 7 | git commit --interactive | grep 'What now'"
136 test_expect_success \
137 "showing committed revisions" \
138 "git rev-list HEAD >current"
142 sed -e "s/good/bad/g" < "$1" > "$1-"
148 A good commit message.
151 test_expect_success \
152 'editor not invoked if -F is given' '
154 EDITOR=./editor git commit -a -F msg &&
155 git show -s --pretty=format:"%s" | grep -q good &&
156 echo "quack" >file &&
157 echo "Another good message." | EDITOR=./editor git commit -a -F - &&
158 git show -s --pretty=format:"%s" | grep -q good
160 # We could just check the head sha1, but checking each commit makes it
161 # easier to isolate bugs.
164 72c0dc9855b0c9dadcbfd5a31cab072e0cb774ca
165 9b88fc14ce6b32e3d9ee021531a54f18a5cf38a2
166 3536bbb352c3a1ef9a420f5b4242d48578b92aa7
167 d381ac431806e53f3dd7ac2f1ae0534f36d738b9
168 4fd44095ad6334f3ef72e4c5ec8ddf108174b54a
169 402702b49136e7587daa9280e91e4bb7cb2179f7
172 test_expect_success \
173 'validate git rev-list output.' \
174 'test_cmp expected current'
176 test_expect_success
'partial commit that involves removal (1)' '
178 git rm --cached file &&
181 git commit -m "Partial: add elif" elif &&
182 git diff-tree --name-status HEAD^ HEAD >current &&
183 echo "A elif" >expected &&
184 test_cmp expected current
188 test_expect_success
'partial commit that involves removal (2)' '
190 git commit -m "Partial: remove file" file &&
191 git diff-tree --name-status HEAD^ HEAD >current &&
192 echo "D file" >expected &&
193 test_cmp expected current
197 test_expect_success
'partial commit that involves removal (3)' '
199 git rm --cached elif &&
201 git commit -m "Partial: modify elif" elif &&
202 git diff-tree --name-status HEAD^ HEAD >current &&
203 echo "M elif" >expected &&
204 test_cmp expected current
208 author
="The Real Author <someguy@his.email.org>"
209 test_expect_success
'amend commit to fix author' '
211 oldtick=$GIT_AUTHOR_DATE &&
214 git cat-file -p HEAD |
215 sed -e "s/author.*/author $author $oldtick/" \
216 -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
218 git commit --amend --author="$author" &&
219 git cat-file -p HEAD > current &&
220 test_cmp expected current
224 test_expect_success
'amend commit to fix date' '
227 newtick=$GIT_AUTHOR_DATE &&
229 git cat-file -p HEAD |
230 sed -e "s/author.*/author $author $newtick/" \
231 -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
233 git commit --amend --date="$newtick" &&
234 git cat-file -p HEAD > current &&
235 test_cmp expected current
239 test_expect_success
'commit complains about bogus date' '
240 test_must_fail git commit --amend --date=10.11.2010
243 test_expect_success
'sign off (1)' '
247 git commit -s -m "thank you" &&
248 git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
252 git var GIT_COMMITTER_IDENT |
253 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
255 test_cmp expected actual
259 test_expect_success
'sign off (2)' '
263 existing="Signed-off-by: Watch This <watchthis@example.com>" &&
264 git commit -s -m "thank you
267 git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
272 git var GIT_COMMITTER_IDENT |
273 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
275 test_cmp expected actual
279 test_expect_success
'signoff gap' '
283 alt="Alt-RFC-822-Header: Value" &&
284 git commit -s -m "welcome
287 git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
292 git var GIT_COMMITTER_IDENT |
293 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
295 test_cmp expected actual
298 test_expect_success
'signoff gap 2' '
303 git commit -s -m "welcome
307 git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
314 git var GIT_COMMITTER_IDENT |
315 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
317 test_cmp expected actual
320 test_expect_success
'multiple -m' '
324 git commit -m "one" -m "two" -m "three" &&
325 git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
333 test_cmp expected actual
337 author
="The Real Author <someguy@his.email.org>"
338 test_expect_success
'amend commit to fix author' '
340 oldtick=$GIT_AUTHOR_DATE &&
343 git cat-file -p HEAD |
344 sed -e "s/author.*/author $author $oldtick/" \
345 -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
347 git commit --amend --author="$author" &&
348 git cat-file -p HEAD > current &&
349 test_cmp expected current
353 test_expect_success
'git commit <file> with dirty index' '
354 echo tacocat > elif &&
355 echo tehlulz > chz &&
357 git commit elif -m "tacocat is a palindrome" &&
358 git show --stat | grep elif &&
359 git diff --cached | grep chz
362 test_expect_success
'same tree (single parent)' '
366 if git commit -m empty
368 echo oops -- should have complained
376 test_expect_success
'same tree (single parent) --allow-empty' '
378 git commit --allow-empty -m "forced empty" &&
379 git cat-file commit HEAD | grep forced
383 test_expect_success
'same tree (merge and amend merge)' '
385 git checkout -b side HEAD^ &&
388 git commit -m "add zero" &&
389 git checkout master &&
391 git merge -s ours side -m "empty ok" &&
392 git diff HEAD^ HEAD >actual &&
394 test_cmp expected actual &&
396 git commit --amend -m "empty really ok" &&
397 git diff HEAD^ HEAD >actual &&
399 test_cmp expected actual
403 test_expect_success
'amend using the message from another commit' '
407 git commit --allow-empty -m "old commit" &&
408 old=$(git rev-parse --verify HEAD) &&
410 git commit --allow-empty -m "new commit" &&
411 new=$(git rev-parse --verify HEAD) &&
413 git commit --allow-empty --amend -C "$old" &&
414 git show --pretty="format:%ad %s" "$old" >expected &&
415 git show --pretty="format:%ad %s" HEAD >actual &&
416 test_cmp expected actual
420 test_expect_success
'amend using the message from a commit named with tag' '
424 git commit --allow-empty -m "old commit" &&
425 old=$(git rev-parse --verify HEAD) &&
426 git tag -a -m "tag on old" tagged-old HEAD &&
428 git commit --allow-empty -m "new commit" &&
429 new=$(git rev-parse --verify HEAD) &&
431 git commit --allow-empty --amend -C tagged-old &&
432 git show --pretty="format:%ad %s" "$old" >expected &&
433 git show --pretty="format:%ad %s" HEAD >actual &&
434 test_cmp expected actual
438 test_expect_success
'amend can copy notes' '
440 git config notes.rewrite.amend true &&
441 git config notes.rewriteRef "refs/notes/*" &&
443 git notes add -m"a note" &&
445 git commit --amend -m"new foo" &&
446 test "$(git notes show)" = "a note"