[thirdparty/git.git] / t / t7502-commit.sh

#!/bin/sh

test_description='git commit porcelain-ish'

. ./test-lib.sh

# Arguments: [<prefix] [<commit message>] [<commit options>]
check_summary_oneline() {
	test_tick &&
	git commit ${3+"$3"} -m "$2" | head -1 > act &&

	# branch name
	SUMMARY_PREFIX="$(git name-rev --name-only HEAD)" &&

	# append the "special" prefix, like "root-commit", "detached HEAD"
	if test -n "$1"
	then
		SUMMARY_PREFIX="$SUMMARY_PREFIX ($1)"
	fi

	# abbrev SHA-1
	SUMMARY_POSTFIX="$(git log -1 --pretty='format:%h')"
	echo "[$SUMMARY_PREFIX $SUMMARY_POSTFIX] $2" >exp &&

	test_i18ncmp exp act
}

test_expect_success 'output summary format' '

	echo new >file1 &&
	git add file1 &&
	check_summary_oneline "root-commit" "initial" &&

	echo change >>file1 &&
	git add file1
'

test_expect_success 'output summary format: root-commit' '
	check_summary_oneline "" "a change"
'

test_expect_success 'output summary format for commit with an empty diff' '

	check_summary_oneline "" "empty" "--allow-empty"
'

test_expect_success 'output summary format for merges' '

	git checkout -b recursive-base &&
	test_commit base file1 &&

	git checkout -b recursive-a recursive-base &&
	test_commit commit-a file1 &&

	git checkout -b recursive-b recursive-base &&
	test_commit commit-b file1 &&

	# conflict
	git checkout recursive-a &&
	test_must_fail git merge recursive-b &&
	# resolve the conflict
	echo commit-a > file1 &&
	git add file1 &&
	check_summary_oneline "" "Merge"
'

output_tests_cleanup() {
	# this is needed for "do not fire editor in the presence of conflicts"
	git checkout master &&

	# this is needed for the "partial removal" test to pass
	git rm file1 &&
	git commit -m "cleanup"
}

test_expect_success 'the basics' '

	output_tests_cleanup &&

	echo doing partial >"commit is" &&
	mkdir not &&
	echo very much encouraged but we should >not/forbid &&
	git add "commit is" not &&
	echo update added "commit is" file >"commit is" &&
	echo also update another >not/forbid &&
	test_tick &&
	git commit -a -m "initial with -a" &&

	git cat-file blob HEAD:"commit is" >current.1 &&
	git cat-file blob HEAD:not/forbid >current.2 &&

	cmp current.1 "commit is" &&
	cmp current.2 not/forbid

'

test_expect_success 'partial' '

	echo another >"commit is" &&
	echo another >not/forbid &&
	test_tick &&
	git commit -m "partial commit to handle a file" "commit is" &&

	changed=$(git diff-tree --name-only HEAD^ HEAD) &&
	test "$changed" = "commit is"

'

test_expect_success 'partial modification in a subdirectory' '

	test_tick &&
	git commit -m "partial commit to subdirectory" not &&

	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
	test "$changed" = "not/forbid"

'

test_expect_success 'partial removal' '

	git rm not/forbid &&
	git commit -m "partial commit to remove not/forbid" not &&

	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
	test "$changed" = "not/forbid" &&
	remain=$(git ls-tree -r --name-only HEAD) &&
	test "$remain" = "commit is"

'

test_expect_success 'sign off' '

	>positive &&
	git add positive &&
	git commit -s -m "thank you" &&
	actual=$(git cat-file commit HEAD | sed -ne "s/Signed-off-by: //p") &&
	expected=$(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/") &&
	test "z$actual" = "z$expected"

'

test_expect_success 'multiple -m' '

	>negative &&
	git add negative &&
	git commit -m "one" -m "two" -m "three" &&
	actual=$(git cat-file commit HEAD | sed -e "1,/^\$/d") &&
	expected=$(echo one; echo; echo two; echo; echo three) &&
	test "z$actual" = "z$expected"

'

test_expect_success 'verbose' '

	echo minus >negative &&
	git add negative &&
	git status -v | sed -ne "/^diff --git /p" >actual &&
	echo "diff --git a/negative b/negative" >expect &&
	test_cmp expect actual

'

test_expect_success 'verbose respects diff config' '

	git config color.diff always &&
	git status -v >actual &&
	grep "\[1mdiff --git" actual &&
	git config --unset color.diff
'

test_expect_success 'cleanup commit messages (verbatim,-t)' '

	echo >>negative &&
	{ echo;echo "# text";echo; } >expect &&
	git commit --cleanup=verbatim -t expect -a &&
	git cat-file -p HEAD |sed -e "1,/^\$/d" |head -n 3 >actual &&
	test_cmp expect actual

'

test_expect_success 'cleanup commit messages (verbatim,-F)' '

	echo >>negative &&
	git commit --cleanup=verbatim -F expect -a &&
	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
	test_cmp expect actual

'

test_expect_success 'cleanup commit messages (verbatim,-m)' '

	echo >>negative &&
	git commit --cleanup=verbatim -m "$(cat expect)" -a &&
	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
	test_cmp expect actual

'

test_expect_success 'cleanup commit messages (whitespace,-F)' '

	echo >>negative &&
	{ echo;echo "# text";echo; } >text &&
	echo "# text" >expect &&
	git commit --cleanup=whitespace -F text -a &&
	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
	test_cmp expect actual

'

test_expect_success 'cleanup commit messages (strip,-F)' '

	echo >>negative &&
	{ echo;echo "# text";echo sample;echo; } >text &&
	echo sample >expect &&
	git commit --cleanup=strip -F text -a &&
	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
	test_cmp expect actual

'

test_expect_success 'cleanup commit messages (strip,-F,-e)' '

	echo >>negative &&
	{ echo;echo sample;echo; } >text &&
	git commit -e -F text -a &&
	head -n 4 .git/COMMIT_EDITMSG >actual
'

echo "sample

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit." >expect

test_expect_success 'cleanup commit messages (strip,-F,-e): output' '
	test_i18ncmp expect actual
'

echo "#
# Author:    $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
#" >> expect

test_expect_success 'author different from committer' '
	echo >>negative &&
	test_might_fail git commit -e -m "sample" &&
	head -n 7 .git/COMMIT_EDITMSG >actual &&
	test_i18ncmp expect actual
'

mv expect expect.tmp
sed '$d' < expect.tmp > expect
rm -f expect.tmp
echo "# Committer:
#" >> expect

test_expect_success 'committer is automatic' '

	echo >>negative &&
	(
		sane_unset GIT_COMMITTER_EMAIL &&
		sane_unset GIT_COMMITTER_NAME &&
		# must fail because there is no change
		test_must_fail git commit -e -m "sample"
	) &&
	head -n 8 .git/COMMIT_EDITMSG |	\
	sed "s/^# Committer: .*/# Committer:/" >actual
	test_i18ncmp expect actual
'

write_script .git/FAKE_EDITOR <<EOF
echo editor started > "$(pwd)/.git/result"
exit 0
EOF

test_expect_success 'do not fire editor in the presence of conflicts' '

	git clean -f &&
	echo f >g &&
	git add g &&
	git commit -m "add g" &&
	git branch second &&
	echo master >g &&
	echo g >h &&
	git add g h &&
	git commit -m "modify g and add h" &&
	git checkout second &&
	echo second >g &&
	git add g &&
	git commit -m second &&
	# Must fail due to conflict
	test_must_fail git cherry-pick -n master &&
	echo "editor not started" >.git/result &&
	(
		GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
		export GIT_EDITOR &&
		test_must_fail git commit
	) &&
	test "$(cat .git/result)" = "editor not started"
'

write_script .git/FAKE_EDITOR <<EOF
# kill -TERM command added below.
EOF

test_expect_success EXECKEEPSPID 'a SIGTERM should break locks' '
	echo >>negative &&
	! "$SHELL_PATH" -c '\''
	  echo kill -TERM $$ >> .git/FAKE_EDITOR
	  GIT_EDITOR=.git/FAKE_EDITOR
	  export GIT_EDITOR
	  exec git commit -a'\'' &&
	test ! -f .git/index.lock
'

rm -f .git/MERGE_MSG .git/COMMIT_EDITMSG
git reset -q --hard

test_expect_success 'Hand committing of a redundant merge removes dups' '

	git rev-parse second master >expect &&
	test_must_fail git merge second master &&
	git checkout master g &&
	EDITOR=: git commit -a &&
	git cat-file commit HEAD | sed -n -e "s/^parent //p" -e "/^$/q" >actual &&
	test_cmp expect actual

'

test_expect_success 'A single-liner subject with a token plus colon is not a footer' '

	git reset --hard &&
	git commit -s -m "hello: kitty" --allow-empty &&
	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
	test_line_count = 3 actual

'

write_script .git/FAKE_EDITOR <<\EOF
mv "$1" "$1.orig"
(
	echo message
	cat "$1.orig"
) >"$1"
EOF

echo '## Custom template' >template

clear_config () {
	(
		git config --unset-all "$1"
		case $? in
		0|5)	exit 0 ;;
		*)	exit 1 ;;
		esac
	)
}

try_commit () {
	git reset --hard &&
	echo >>negative &&
	GIT_EDITOR=.git/FAKE_EDITOR git commit -a $* $use_template &&
	case "$use_template" in
	'')
		test_i18ngrep ! "^## Custom template" .git/COMMIT_EDITMSG ;;
	*)
		test_i18ngrep "^## Custom template" .git/COMMIT_EDITMSG ;;
	esac
}

try_commit_status_combo () {

	test_expect_success 'commit' '
		clear_config commit.status &&
		try_commit "" &&
		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
	'

	test_expect_success 'commit' '
		clear_config commit.status &&
		try_commit "" &&
		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
	'

	test_expect_success 'commit --status' '
		clear_config commit.status &&
		try_commit --status &&
		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
	'

	test_expect_success 'commit --no-status' '
		clear_config commit.status &&
		try_commit --no-status &&
		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
	'

	test_expect_success 'commit with commit.status = yes' '
		clear_config commit.status &&
		git config commit.status yes &&
		try_commit "" &&
		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
	'

	test_expect_success 'commit with commit.status = no' '
		clear_config commit.status &&
		git config commit.status no &&
		try_commit "" &&
		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
	'

	test_expect_success 'commit --status with commit.status = yes' '
		clear_config commit.status &&
		git config commit.status yes &&
		try_commit --status &&
		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
	'

	test_expect_success 'commit --no-status with commit.status = yes' '
		clear_config commit.status &&
		git config commit.status yes &&
		try_commit --no-status &&
		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
	'

	test_expect_success 'commit --status with commit.status = no' '
		clear_config commit.status &&
		git config commit.status no &&
		try_commit --status &&
		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
	'

	test_expect_success 'commit --no-status with commit.status = no' '
		clear_config commit.status &&
		git config commit.status no &&
		try_commit --no-status &&
		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
	'

}

try_commit_status_combo

use_template="-t template"

try_commit_status_combo

test_done
Commit	Line	Data
b468f0ce JH	1	#!/bin/sh
	2
	3	test_description='git commit porcelain-ish'
	4
	5	. ./test-lib.sh
	6
cee9f2b3	7	# Arguments: [<prefix] [<commit message>] [<commit options>]
fc6fa0d0 TRC	8	check_summary_oneline() {
fc6fa0d0 TRC	9	test_tick &&
cee9f2b3	10	git commit ${3+"$3"} -m "$2" \| head -1 > act &&
fc6fa0d0 TRC	11
	12	# branch name
	13	SUMMARY_PREFIX="$(git name-rev --name-only HEAD)" &&
	14
	15	# append the "special" prefix, like "root-commit", "detached HEAD"
	16	if test -n "$1"
	17	then
	18	SUMMARY_PREFIX="$SUMMARY_PREFIX ($1)"
	19	fi
	20
	21	# abbrev SHA-1
	22	SUMMARY_POSTFIX="$(git log -1 --pretty='format:%h')"
	23	echo "[$SUMMARY_PREFIX $SUMMARY_POSTFIX] $2" >exp &&
	24
f79ce8db	25	test_i18ncmp exp act
fc6fa0d0 TRC	26	}
	27
	28	test_expect_success 'output summary format' '
	29
	30	echo new >file1 &&
	31	git add file1 &&
	32	check_summary_oneline "root-commit" "initial" &&
	33
	34	echo change >>file1 &&
7f5673d7 ÆAB	35	git add file1
	36	'
	37
	38	test_expect_success 'output summary format: root-commit' '
fc6fa0d0 TRC	39	check_summary_oneline "" "a change"
	40	'
	41
a45e1a87	42	test_expect_success 'output summary format for commit with an empty diff' '
cee9f2b3 TRC	43
	44	check_summary_oneline "" "empty" "--allow-empty"
	45	'
	46
a45e1a87	47	test_expect_success 'output summary format for merges' '
cee9f2b3 TRC	48
	49	git checkout -b recursive-base &&
	50	test_commit base file1 &&
	51
	52	git checkout -b recursive-a recursive-base &&
	53	test_commit commit-a file1 &&
	54
	55	git checkout -b recursive-b recursive-base &&
	56	test_commit commit-b file1 &&
	57
	58	# conflict
	59	git checkout recursive-a &&
	60	test_must_fail git merge recursive-b &&
	61	# resolve the conflict
	62	echo commit-a > file1 &&
	63	git add file1 &&
	64	check_summary_oneline "" "Merge"
	65	'
	66
fc6fa0d0 TRC	67	output_tests_cleanup() {
	68	# this is needed for "do not fire editor in the presence of conflicts"
	69	git checkout master &&
	70
	71	# this is needed for the "partial removal" test to pass
	72	git rm file1 &&
	73	git commit -m "cleanup"
	74	}
	75
b468f0ce JH	76	test_expect_success 'the basics' '
b468f0ce JH	77
fc6fa0d0 TRC	78	output_tests_cleanup &&
fc6fa0d0 TRC	79
b468f0ce JH	80	echo doing partial >"commit is" &&
	81	mkdir not &&
	82	echo very much encouraged but we should >not/forbid &&
	83	git add "commit is" not &&
	84	echo update added "commit is" file >"commit is" &&
	85	echo also update another >not/forbid &&
	86	test_tick &&
	87	git commit -a -m "initial with -a" &&
	88
	89	git cat-file blob HEAD:"commit is" >current.1 &&
	90	git cat-file blob HEAD:not/forbid >current.2 &&
	91
	92	cmp current.1 "commit is" &&
	93	cmp current.2 not/forbid
	94
	95	'
	96
	97	test_expect_success 'partial' '
	98
	99	echo another >"commit is" &&
	100	echo another >not/forbid &&
	101	test_tick &&
	102	git commit -m "partial commit to handle a file" "commit is" &&
	103
	104	changed=$(git diff-tree --name-only HEAD^ HEAD) &&
	105	test "$changed" = "commit is"
	106
	107	'
	108
e8f30160	109	test_expect_success 'partial modification in a subdirectory' '
b468f0ce JH	110
	111	test_tick &&
	112	git commit -m "partial commit to subdirectory" not &&
	113
	114	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
	115	test "$changed" = "not/forbid"
	116
	117	'
	118
	119	test_expect_success 'partial removal' '
	120
	121	git rm not/forbid &&
	122	git commit -m "partial commit to remove not/forbid" not &&
	123
	124	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
	125	test "$changed" = "not/forbid" &&
	126	remain=$(git ls-tree -r --name-only HEAD) &&
	127	test "$remain" = "commit is"
	128
	129	'
	130
	131	test_expect_success 'sign off' '
	132
	133	>positive &&
	134	git add positive &&
	135	git commit -s -m "thank you" &&
	136	actual=$(git cat-file commit HEAD \| sed -ne "s/Signed-off-by: //p") &&
	137	expected=$(git var GIT_COMMITTER_IDENT \| sed -e "s/>.*/>/") &&
	138	test "z$actual" = "z$expected"
	139
	140	'
	141
	142	test_expect_success 'multiple -m' '
	143
	144	>negative &&
	145	git add negative &&
	146	git commit -m "one" -m "two" -m "three" &&
	147	actual=$(git cat-file commit HEAD \| sed -e "1,/^\$/d") &&
	148	expected=$(echo one; echo; echo two; echo; echo three) &&
	149	test "z$actual" = "z$expected"
	150
	151	'
	152
	153	test_expect_success 'verbose' '
	154
	155	echo minus >negative &&
	156	git add negative &&
	157	git status -v \| sed -ne "/^diff --git /p" >actual &&
	158	echo "diff --git a/negative b/negative" >expect &&
82ebb0b6	159	test_cmp expect actual
b468f0ce JH	160
	161	'
	162
4f672ad6 JK	163	test_expect_success 'verbose respects diff config' '
	164
	165	git config color.diff always &&
	166	git status -v >actual &&
	167	grep "\[1mdiff --git" actual &&
	168	git config --unset color.diff
	169	'
	170
5f065737 AR	171	test_expect_success 'cleanup commit messages (verbatim,-t)' '
	172
	173	echo >>negative &&
	174	{ echo;echo "# text";echo; } >expect &&
	175	git commit --cleanup=verbatim -t expect -a &&
	176	git cat-file -p HEAD \|sed -e "1,/^\$/d" \|head -n 3 >actual &&
82ebb0b6	177	test_cmp expect actual
5f065737 AR	178
	179	'
	180
	181	test_expect_success 'cleanup commit messages (verbatim,-F)' '
	182
	183	echo >>negative &&
	184	git commit --cleanup=verbatim -F expect -a &&
	185	git cat-file -p HEAD \|sed -e "1,/^\$/d">actual &&
82ebb0b6	186	test_cmp expect actual
5f065737 AR	187
	188	'
	189
	190	test_expect_success 'cleanup commit messages (verbatim,-m)' '
	191
	192	echo >>negative &&
	193	git commit --cleanup=verbatim -m "$(cat expect)" -a &&
	194	git cat-file -p HEAD \|sed -e "1,/^\$/d">actual &&
82ebb0b6	195	test_cmp expect actual
5f065737 AR	196
	197	'
	198
	199	test_expect_success 'cleanup commit messages (whitespace,-F)' '
	200
	201	echo >>negative &&
	202	{ echo;echo "# text";echo; } >text &&
	203	echo "# text" >expect &&
	204	git commit --cleanup=whitespace -F text -a &&
	205	git cat-file -p HEAD \|sed -e "1,/^\$/d">actual &&
82ebb0b6	206	test_cmp expect actual
5f065737 AR	207
	208	'
	209
	210	test_expect_success 'cleanup commit messages (strip,-F)' '
	211
	212	echo >>negative &&
	213	{ echo;echo "# text";echo sample;echo; } >text &&
	214	echo sample >expect &&
	215	git commit --cleanup=strip -F text -a &&
	216	git cat-file -p HEAD \|sed -e "1,/^\$/d">actual &&
82ebb0b6	217	test_cmp expect actual
5f065737 AR	218
	219	'
	220
5f065737 AR	221	test_expect_success 'cleanup commit messages (strip,-F,-e)' '
	222
	223	echo >>negative &&
	224	{ echo;echo sample;echo; } >text &&
	225	git commit -e -F text -a &&
0b430a17 ÆAB	226	head -n 4 .git/COMMIT_EDITMSG >actual
	227	'
	228
	229	echo "sample
5f065737	230
0b430a17 ÆAB	231	# Please enter the commit message for your changes. Lines starting
	232	# with '#' will be ignored, and an empty message aborts the commit." >expect
	233
f79ce8db JH	234	test_expect_success 'cleanup commit messages (strip,-F,-e): output' '
f79ce8db JH	235	test_i18ncmp expect actual
5f065737 AR	236	'
5f065737 AR	237
e83dbe80 SB	238	echo "#
	239	# Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
	240	#" >> expect
	241
f79ce8db	242	test_expect_success 'author different from committer' '
e83dbe80	243	echo >>negative &&
f79ce8db JH	244	test_might_fail git commit -e -m "sample" &&
	245	head -n 7 .git/COMMIT_EDITMSG >actual &&
	246	test_i18ncmp expect actual
e83dbe80 SB	247	'
e83dbe80 SB	248
d16d5cdf MK	249	mv expect expect.tmp
	250	sed '$d' < expect.tmp > expect
	251	rm -f expect.tmp
bb1ae3f6 SB	252	echo "# Committer:
bb1ae3f6 SB	253	#" >> expect
bb1ae3f6	254
f79ce8db	255	test_expect_success 'committer is automatic' '
bb1ae3f6 SB	256
bb1ae3f6 SB	257	echo >>negative &&
7845944c	258	(
00648ba0 EN	259	sane_unset GIT_COMMITTER_EMAIL &&
00648ba0 EN	260	sane_unset GIT_COMMITTER_NAME &&
7845944c JH	261	# must fail because there is no change
	262	test_must_fail git commit -e -m "sample"
	263	) &&
fdc7c811	264	head -n 8 .git/COMMIT_EDITMSG \| \
0b430a17	265	sed "s/^# Committer: .*/# Committer:/" >actual
f79ce8db	266	test_i18ncmp expect actual
bb1ae3f6 SB	267	'
bb1ae3f6 SB	268
a9ebc43b JK	269	write_script .git/FAKE_EDITOR <<EOF
a9ebc43b JK	270	echo editor started > "$(pwd)/.git/result"
ec84bd00 PB	271	exit 0
ec84bd00 PB	272	EOF
ec84bd00 PB	273
	274	test_expect_success 'do not fire editor in the presence of conflicts' '
	275
a3c91e08 JH	276	git clean -f &&
	277	echo f >g &&
	278	git add g &&
	279	git commit -m "add g" &&
	280	git branch second &&
	281	echo master >g &&
	282	echo g >h &&
	283	git add g h &&
	284	git commit -m "modify g and add h" &&
	285	git checkout second &&
	286	echo second >g &&
	287	git add g &&
	288	git commit -m second &&
	289	# Must fail due to conflict
	290	test_must_fail git cherry-pick -n master &&
	291	echo "editor not started" >.git/result &&
e2007832	292	(
34565f27	293	GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
e2007832 BC	294	export GIT_EDITOR &&
	295	test_must_fail git commit
	296	) &&
a3c91e08	297	test "$(cat .git/result)" = "editor not started"
ec84bd00 PB	298	'
ec84bd00 PB	299
a9ebc43b	300	write_script .git/FAKE_EDITOR <<EOF
ad5fa3cc PB	301	# kill -TERM command added below.
	302	EOF
	303
fb9a2bea	304	test_expect_success EXECKEEPSPID 'a SIGTERM should break locks' '
ad5fa3cc	305	echo >>negative &&
09b78bc1	306	! "$SHELL_PATH" -c '\''
ad5fa3cc	307	echo kill -TERM $$ >> .git/FAKE_EDITOR
09b78bc1 BC	308	GIT_EDITOR=.git/FAKE_EDITOR
	309	export GIT_EDITOR
	310	exec git commit -a'\'' &&
	311	test ! -f .git/index.lock
ad5fa3cc PB	312	'
ad5fa3cc PB	313
67bfc030 JH	314	rm -f .git/MERGE_MSG .git/COMMIT_EDITMSG
	315	git reset -q --hard
	316
	317	test_expect_success 'Hand committing of a redundant merge removes dups' '
	318
	319	git rev-parse second master >expect &&
	320	test_must_fail git merge second master &&
	321	git checkout master g &&
	322	EDITOR=: git commit -a &&
	323	git cat-file commit HEAD \| sed -n -e "s/^parent //p" -e "/^$/q" >actual &&
	324	test_cmp expect actual
	325
	326	'
	327
e5138436 JH	328	test_expect_success 'A single-liner subject with a token plus colon is not a footer' '
	329
	330	git reset --hard &&
	331	git commit -s -m "hello: kitty" --allow-empty &&
	332	git cat-file commit HEAD \| sed -e "1,/^$/d" >actual &&
3fb0459b	333	test_line_count = 3 actual
e5138436 JH	334
	335	'
	336
a9ebc43b JK	337	write_script .git/FAKE_EDITOR <<\EOF
a9ebc43b JK	338	mv "$1" "$1.orig"
f9c01817 JH	339	(
f9c01817 JH	340	echo message
a9ebc43b JK	341	cat "$1.orig"
a9ebc43b JK	342	) >"$1"
f9c01817 JH	343	EOF
	344
	345	echo '## Custom template' >template
	346
	347	clear_config () {
	348	(
	349	git config --unset-all "$1"
	350	case $? in
	351	0\|5) exit 0 ;;
	352	*) exit 1 ;;
	353	esac
	354	)
	355	}
	356
	357	try_commit () {
	358	git reset --hard &&
	359	echo >>negative &&
	360	GIT_EDITOR=.git/FAKE_EDITOR git commit -a $* $use_template &&
	361	case "$use_template" in
	362	'')
f79ce8db	363	test_i18ngrep ! "^## Custom template" .git/COMMIT_EDITMSG ;;
f9c01817	364	*)
f79ce8db	365	test_i18ngrep "^## Custom template" .git/COMMIT_EDITMSG ;;
f9c01817 JH	366	esac
	367	}
	368
	369	try_commit_status_combo () {
	370
f79ce8db	371	test_expect_success 'commit' '
f9c01817 JH	372	clear_config commit.status &&
f9c01817 JH	373	try_commit "" &&
f79ce8db	374	test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
f9c01817 JH	375	'
f9c01817 JH	376
f79ce8db	377	test_expect_success 'commit' '
f9c01817 JH	378	clear_config commit.status &&
f9c01817 JH	379	try_commit "" &&
f79ce8db	380	test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
f9c01817 JH	381	'
f9c01817 JH	382
f79ce8db	383	test_expect_success 'commit --status' '
f9c01817 JH	384	clear_config commit.status &&
f9c01817 JH	385	try_commit --status &&
f79ce8db	386	test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
f9c01817 JH	387	'
f9c01817 JH	388
f79ce8db	389	test_expect_success 'commit --no-status' '
f9c01817	390	clear_config commit.status &&
2dec68cf	391	try_commit --no-status &&
f79ce8db	392	test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
f9c01817 JH	393	'
f9c01817 JH	394
f79ce8db	395	test_expect_success 'commit with commit.status = yes' '
f9c01817 JH	396	clear_config commit.status &&
	397	git config commit.status yes &&
	398	try_commit "" &&
f79ce8db	399	test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
f9c01817 JH	400	'
f9c01817 JH	401
f79ce8db	402	test_expect_success 'commit with commit.status = no' '
f9c01817 JH	403	clear_config commit.status &&
	404	git config commit.status no &&
	405	try_commit "" &&
f79ce8db	406	test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
f9c01817 JH	407	'
f9c01817 JH	408
f79ce8db	409	test_expect_success 'commit --status with commit.status = yes' '
f9c01817 JH	410	clear_config commit.status &&
	411	git config commit.status yes &&
	412	try_commit --status &&
f79ce8db	413	test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
f9c01817 JH	414	'
f9c01817 JH	415
f79ce8db	416	test_expect_success 'commit --no-status with commit.status = yes' '
f9c01817 JH	417	clear_config commit.status &&
	418	git config commit.status yes &&
	419	try_commit --no-status &&
f79ce8db	420	test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
f9c01817 JH	421	'
f9c01817 JH	422
f79ce8db	423	test_expect_success 'commit --status with commit.status = no' '
f9c01817 JH	424	clear_config commit.status &&
	425	git config commit.status no &&
	426	try_commit --status &&
f79ce8db	427	test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
f9c01817 JH	428	'
f9c01817 JH	429
f79ce8db	430	test_expect_success 'commit --no-status with commit.status = no' '
f9c01817 JH	431	clear_config commit.status &&
	432	git config commit.status no &&
	433	try_commit --no-status &&
f79ce8db	434	test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
f9c01817 JH	435	'
	436
	437	}
	438
	439	try_commit_status_combo
	440
	441	use_template="-t template"
	442
	443	try_commit_status_combo
	444
b468f0ce	445	test_done