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
"Constructing initial commit" '
21 test_i18ngrep "Initial commit" actual
25 "fail initial amend" \
26 "test_must_fail git commit --amend"
30 "git commit -m initial"
34 "test_must_fail git commit -m foo -m bar -F file"
38 "test_must_fail git commit -C HEAD -m illegal"
41 "using paths with -a" \
42 "echo King of the bongo >file &&
43 test_must_fail git commit -m foo -a file"
45 test_expect_success PERL
'can use paths with --interactive' '
46 echo bong-o-bong >file &&
47 # 2: update, 1:st path, that is all, 7: quit
48 ( echo 2; echo 1; echo; echo 7 ) |
49 git commit -m foo --interactive file &&
50 git reset --hard HEAD^
54 "using invalid commit with -C" \
55 "test_must_fail git commit -C bogus"
58 "testing nothing to commit" \
59 "test_must_fail git commit -m initial"
63 "echo 'bongo bongo bongo' >file \
64 git commit -m next -a"
67 "commit message from non-existing file" \
68 "echo 'more bongo: bongo bongo bongo bongo' >file && \
69 test_must_fail git commit -F gah -a"
71 # Empty except stray tabs and spaces on a few lines.
72 sed -e 's/@$//' >msg
<<EOF
79 "empty commit message" \
80 "test_must_fail git commit -F msg -a"
83 "commit message from file" \
84 "echo 'this is the commit message, coming from a file' >msg && \
89 sed -e "s/a file/an amend commit/g" < "$1" > "$1-"
96 "EDITOR=./editor git commit --amend"
100 "echo 'enough with the bongos' >file && \
101 test_must_fail git commit -F msg -m amending ."
103 test_expect_success \
104 "using message from other commit" \
105 "git commit -C HEAD^ ."
109 sed -e "s/amend/older/g" < "$1" > "$1-"
114 test_expect_success \
115 "editing message from other commit" \
116 "echo 'hula hula' >file && \
117 EDITOR=./editor git commit -c HEAD^ -a"
119 test_expect_success \
120 "message from stdin" \
121 "echo 'silly new contents' >file && \
122 echo commit message from stdin | git commit -F - -a"
124 test_expect_success \
125 "overriding author from command line" \
126 "echo 'gak' >file && \
127 git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a >output 2>&1"
129 test_expect_success \
130 "commit --author output mentions author" \
131 "grep Rubber.Duck output"
133 test_expect_success PERL \
135 "echo 7 | git commit --interactive | grep 'What now'"
137 test_expect_success PERL \
138 "commit --interactive doesn't change index if editor aborts" \
140 test_must_fail git diff --exit-code >diff1 &&
141 (echo u ; echo '*' ; echo q) |
142 (EDITOR=: && export EDITOR &&
143 test_must_fail git commit --interactive) &&
145 test_cmp diff1 diff2"
147 test_expect_success \
148 "showing committed revisions" \
149 "git rev-list HEAD >current"
153 sed -e "s/good/bad/g" < "$1" > "$1-"
159 A good commit message.
162 test_expect_success \
163 'editor not invoked if -F is given' '
165 EDITOR=./editor git commit -a -F msg &&
166 git show -s --pretty=format:"%s" | grep -q good &&
167 echo "quack" >file &&
168 echo "Another good message." | EDITOR=./editor git commit -a -F - &&
169 git show -s --pretty=format:"%s" | grep -q good
171 # We could just check the head sha1, but checking each commit makes it
172 # easier to isolate bugs.
175 72c0dc9855b0c9dadcbfd5a31cab072e0cb774ca
176 9b88fc14ce6b32e3d9ee021531a54f18a5cf38a2
177 3536bbb352c3a1ef9a420f5b4242d48578b92aa7
178 d381ac431806e53f3dd7ac2f1ae0534f36d738b9
179 4fd44095ad6334f3ef72e4c5ec8ddf108174b54a
180 402702b49136e7587daa9280e91e4bb7cb2179f7
183 test_expect_success \
184 'validate git rev-list output.' \
185 'test_cmp expected current'
187 test_expect_success
'partial commit that involves removal (1)' '
189 git rm --cached file &&
192 git commit -m "Partial: add elif" elif &&
193 git diff-tree --name-status HEAD^ HEAD >current &&
194 echo "A elif" >expected &&
195 test_cmp expected current
199 test_expect_success
'partial commit that involves removal (2)' '
201 git commit -m "Partial: remove file" file &&
202 git diff-tree --name-status HEAD^ HEAD >current &&
203 echo "D file" >expected &&
204 test_cmp expected current
208 test_expect_success
'partial commit that involves removal (3)' '
210 git rm --cached elif &&
212 git commit -m "Partial: modify elif" elif &&
213 git diff-tree --name-status HEAD^ HEAD >current &&
214 echo "M elif" >expected &&
215 test_cmp expected current
219 author
="The Real Author <someguy@his.email.org>"
220 test_expect_success
'amend commit to fix author' '
222 oldtick=$GIT_AUTHOR_DATE &&
225 git cat-file -p HEAD |
226 sed -e "s/author.*/author $author $oldtick/" \
227 -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
229 git commit --amend --author="$author" &&
230 git cat-file -p HEAD > current &&
231 test_cmp expected current
235 test_expect_success
'amend commit to fix date' '
238 newtick=$GIT_AUTHOR_DATE &&
240 git cat-file -p HEAD |
241 sed -e "s/author.*/author $author $newtick/" \
242 -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
244 git commit --amend --date="$newtick" &&
245 git cat-file -p HEAD > current &&
246 test_cmp expected current
250 test_expect_success
'commit complains about bogus date' '
251 test_must_fail git commit --amend --date=10.11.2010
254 test_expect_success
'sign off (1)' '
258 git commit -s -m "thank you" &&
259 git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
263 git var GIT_COMMITTER_IDENT |
264 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
266 test_cmp expected actual
270 test_expect_success
'sign off (2)' '
274 existing="Signed-off-by: Watch This <watchthis@example.com>" &&
275 git commit -s -m "thank you
278 git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
283 git var GIT_COMMITTER_IDENT |
284 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
286 test_cmp expected actual
290 test_expect_success
'signoff gap' '
294 alt="Alt-RFC-822-Header: Value" &&
295 git commit -s -m "welcome
298 git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
303 git var GIT_COMMITTER_IDENT |
304 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
306 test_cmp expected actual
309 test_expect_success
'signoff gap 2' '
314 git commit -s -m "welcome
318 git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
325 git var GIT_COMMITTER_IDENT |
326 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
328 test_cmp expected actual
331 test_expect_success
'multiple -m' '
335 git commit -m "one" -m "two" -m "three" &&
336 git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
344 test_cmp expected actual
348 author
="The Real Author <someguy@his.email.org>"
349 test_expect_success
'amend commit to fix author' '
351 oldtick=$GIT_AUTHOR_DATE &&
354 git cat-file -p HEAD |
355 sed -e "s/author.*/author $author $oldtick/" \
356 -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
358 git commit --amend --author="$author" &&
359 git cat-file -p HEAD > current &&
360 test_cmp expected current
364 test_expect_success
'git commit <file> with dirty index' '
365 echo tacocat > elif &&
366 echo tehlulz > chz &&
368 git commit elif -m "tacocat is a palindrome" &&
369 git show --stat | grep elif &&
370 git diff --cached | grep chz
373 test_expect_success
'same tree (single parent)' '
377 if git commit -m empty
379 echo oops -- should have complained
387 test_expect_success
'same tree (single parent) --allow-empty' '
389 git commit --allow-empty -m "forced empty" &&
390 git cat-file commit HEAD | grep forced
394 test_expect_success
'same tree (merge and amend merge)' '
396 git checkout -b side HEAD^ &&
399 git commit -m "add zero" &&
400 git checkout master &&
402 git merge -s ours side -m "empty ok" &&
403 git diff HEAD^ HEAD >actual &&
405 test_cmp expected actual &&
407 git commit --amend -m "empty really ok" &&
408 git diff HEAD^ HEAD >actual &&
410 test_cmp expected actual
414 test_expect_success
'amend using the message from another commit' '
418 git commit --allow-empty -m "old commit" &&
419 old=$(git rev-parse --verify HEAD) &&
421 git commit --allow-empty -m "new commit" &&
422 new=$(git rev-parse --verify HEAD) &&
424 git commit --allow-empty --amend -C "$old" &&
425 git show --pretty="format:%ad %s" "$old" >expected &&
426 git show --pretty="format:%ad %s" HEAD >actual &&
427 test_cmp expected actual
431 test_expect_success
'amend using the message from a commit named with tag' '
435 git commit --allow-empty -m "old commit" &&
436 old=$(git rev-parse --verify HEAD) &&
437 git tag -a -m "tag on old" tagged-old HEAD &&
439 git commit --allow-empty -m "new commit" &&
440 new=$(git rev-parse --verify HEAD) &&
442 git commit --allow-empty --amend -C tagged-old &&
443 git show --pretty="format:%ad %s" "$old" >expected &&
444 git show --pretty="format:%ad %s" HEAD >actual &&
445 test_cmp expected actual
449 test_expect_success
'amend can copy notes' '
451 git config notes.rewrite.amend true &&
452 git config notes.rewriteRef "refs/notes/*" &&
454 git notes add -m"a note" &&
456 git commit --amend -m"new foo" &&
457 test "$(git notes show)" = "a note"
461 test_expect_success
'commit a file whose name is a dash' '
469 git commit -m "add dash" >output </dev/null &&
470 test_i18ngrep " changed, 5 insertions" output