3 # Copyright (c) 2007 Steven Grimm
6 test_description
='git commit
8 Tests for selected commit options.'
13 expect
=commit_msg_is.expect
14 actual
=commit_msg_is.actual
16 printf "%s" "$(git log --pretty=format:%s%b -1)" >$expect &&
17 printf "%s" "$1" >$actual &&
18 test_i18ncmp
$expect $actual
21 # A sanity check to see if commit is working at all.
22 test_expect_success
'a basic commit in an empty tree should succeed' '
25 git commit -m "initial commit"
28 test_expect_success
'nonexistent template file should return error' '
29 echo changes >> foo &&
32 GIT_EDITOR="echo hello >\"\$1\"" &&
34 test_must_fail git commit --template "$PWD"/notexist
38 test_expect_success
'nonexistent template file in config should return error' '
39 test_config commit.template "$PWD"/notexist &&
41 GIT_EDITOR="echo hello >\"\$1\"" &&
43 test_must_fail git commit
47 # From now on we'll use a template file that exists.
48 TEMPLATE
="$PWD"/template
50 test_expect_success
'unedited template should not commit' '
51 echo "template line" > "$TEMPLATE" &&
52 test_must_fail git commit --template "$TEMPLATE"
55 test_expect_success
'unedited template with comments should not commit' '
56 echo "# comment in template" >> "$TEMPLATE" &&
57 test_must_fail git commit --template "$TEMPLATE"
60 test_expect_success
'a Signed-off-by line by itself should not commit' '
62 test_set_editor "$TEST_DIRECTORY"/t7500/add-signed-off &&
63 test_must_fail git commit --template "$TEMPLATE"
67 test_expect_success
'adding comments to a template should not commit' '
69 test_set_editor "$TEST_DIRECTORY"/t7500/add-comments &&
70 test_must_fail git commit --template "$TEMPLATE"
74 test_expect_success
'adding real content to a template should commit' '
76 test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
77 git commit --template "$TEMPLATE"
79 commit_msg_is "template linecommit message"
82 test_expect_success
'-t option should be short for --template' '
83 echo "short template" > "$TEMPLATE" &&
84 echo "new content" >> foo &&
87 test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
88 git commit -t "$TEMPLATE"
90 commit_msg_is "short templatecommit message"
93 test_expect_success
'config-specified template should commit' '
94 echo "new template" > "$TEMPLATE" &&
95 test_config commit.template "$TEMPLATE" &&
96 echo "more content" >> foo &&
99 test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
102 commit_msg_is "new templatecommit message"
105 test_expect_success
'explicit commit message should override template' '
106 echo "still more content" >> foo &&
108 GIT_EDITOR="$TEST_DIRECTORY"/t7500/add-content git commit --template "$TEMPLATE" \
109 -m "command line msg" &&
110 commit_msg_is "command line msg"
113 test_expect_success
'commit message from file should override template' '
114 echo "content galore" >> foo &&
116 echo "standard input msg" |
118 test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
119 git commit --template "$TEMPLATE" --file -
121 commit_msg_is "standard input msg"
124 cat >"$TEMPLATE" <<\EOF
130 test_expect_success
'commit message from template with whitespace issue' '
131 echo "content galore" >>foo &&
133 GIT_EDITOR="$TEST_DIRECTORY"/t7500/add-whitespaced-content git commit \
134 --template "$TEMPLATE" &&
135 commit_msg_is "commit message"
138 test_expect_success
'using alternate GIT_INDEX_FILE (1)' '
140 cp .git/index saved-index &&
142 echo some new content >file &&
143 GIT_INDEX_FILE=.git/another_index &&
144 export GIT_INDEX_FILE &&
146 git commit -m "commit using another index" &&
147 git diff-index --exit-code HEAD &&
148 git diff-files --exit-code
150 cmp .git/index saved-index >/dev/null
154 test_expect_success
'using alternate GIT_INDEX_FILE (2)' '
156 cp .git/index saved-index &&
158 rm -f .git/no-such-index &&
159 GIT_INDEX_FILE=.git/no-such-index &&
160 export GIT_INDEX_FILE &&
161 git commit -m "commit using nonexistent index" &&
162 test -z "$(git ls-files)" &&
163 test -z "$(git ls-tree HEAD)"
166 cmp .git/index saved-index >/dev/null
172 Signed-off-by: C O Mitter <committer@example.com>
175 test_expect_success
'--signoff' '
176 echo "yet another content *narf*" >> foo &&
177 echo "zort" | git commit -s -F - foo &&
178 git cat-file commit HEAD | sed "1,/^\$/d" > output &&
179 test_cmp expect output
182 test_expect_success
'commit message from file (1)' '
184 echo "Log in top directory" >log &&
185 echo "Log in sub directory" >subdir/log &&
188 git commit --allow-empty -F log
190 commit_msg_is "Log in sub directory"
193 test_expect_success
'commit message from file (2)' '
195 echo "Log in sub directory" >subdir/log &&
198 git commit --allow-empty -F log
200 commit_msg_is "Log in sub directory"
203 test_expect_success
'commit message from stdin' '
206 echo "Log with foo word" | git commit --allow-empty -F -
208 commit_msg_is "Log with foo word"
211 test_expect_success
'commit -F overrides -t' '
214 echo "-F log" > f.log &&
215 echo "-t template" > t.template &&
216 git commit --allow-empty -F f.log -t t.template
218 commit_msg_is "-F log"
221 test_expect_success
'Commit without message is allowed with --allow-empty-message' '
222 echo "more content" >>foo &&
225 git commit --allow-empty-message <empty &&
229 test_expect_success
'Commit without message is no-no without --allow-empty-message' '
230 echo "more content" >>foo &&
233 test_must_fail git commit <empty
236 test_expect_success
'Commit a message with --allow-empty-message' '
237 echo "even more content" >>foo &&
239 git commit --allow-empty-message -m"hello there" &&
240 commit_msg_is "hello there"
243 commit_for_rebase_autosquash_setup
() {
244 echo "first content line" >>foo
&&
247 target message subject line
249 target message body line 1
250 target message body line 2
253 echo "second content line" >>foo
&&
255 git commit
-m "intermediate commit" &&
256 echo "third content line" >>foo
&&
260 test_expect_success
'commit --fixup provides correct one-line commit message' '
261 commit_for_rebase_autosquash_setup &&
262 git commit --fixup HEAD~1 &&
263 commit_msg_is "fixup! target message subject line"
266 test_expect_success
'commit --squash works with -F' '
267 commit_for_rebase_autosquash_setup &&
268 echo "log message from file" >msgfile &&
269 git commit --squash HEAD~1 -F msgfile &&
270 commit_msg_is "squash! target message subject linelog message from file"
273 test_expect_success
'commit --squash works with -m' '
274 commit_for_rebase_autosquash_setup &&
275 git commit --squash HEAD~1 -m "foo bar\nbaz" &&
276 commit_msg_is "squash! target message subject linefoo bar\nbaz"
279 test_expect_success
'commit --squash works with -C' '
280 commit_for_rebase_autosquash_setup &&
281 git commit --squash HEAD~1 -C HEAD &&
282 commit_msg_is "squash! target message subject lineintermediate commit"
285 test_expect_success
'commit --squash works with -c' '
286 commit_for_rebase_autosquash_setup &&
287 test_set_editor "$TEST_DIRECTORY"/t7500/edit-content &&
288 git commit --squash HEAD~1 -c HEAD &&
289 commit_msg_is "squash! target message subject lineedited commit"
292 test_expect_success
'commit --squash works with -C for same commit' '
293 commit_for_rebase_autosquash_setup &&
294 git commit --squash HEAD -C HEAD &&
295 commit_msg_is "squash! intermediate commit"
298 test_expect_success
'commit --squash works with -c for same commit' '
299 commit_for_rebase_autosquash_setup &&
300 test_set_editor "$TEST_DIRECTORY"/t7500/edit-content &&
301 git commit --squash HEAD -c HEAD &&
302 commit_msg_is "squash! edited commit"
305 test_expect_success
'commit --squash works with editor' '
306 commit_for_rebase_autosquash_setup &&
307 test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
308 git commit --squash HEAD~1 &&
309 commit_msg_is "squash! target message subject linecommit message"
312 test_expect_success
'invalid message options when using --fixup' '
313 echo changes >>foo &&
314 echo "message" >log &&
316 test_must_fail git commit --fixup HEAD~1 --squash HEAD~2 &&
317 test_must_fail git commit --fixup HEAD~1 -C HEAD~2 &&
318 test_must_fail git commit --fixup HEAD~1 -c HEAD~2 &&
319 test_must_fail git commit --fixup HEAD~1 -m "cmdline message" &&
320 test_must_fail git commit --fixup HEAD~1 -F log