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

#!/bin/sh
#
# Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>
#

# FIXME: Test the various index usages, -i and -o, test reflog,
# signoff

test_description='git commit'
. ./test-lib.sh

test_tick

test_expect_success \
	"initial status" \
	"echo 'bongo bongo' >file &&
	 git add file && \
	 git status | grep 'Initial commit'"

test_expect_success \
	"fail initial amend" \
	"test_must_fail git commit --amend"

test_expect_success \
	"initial commit" \
	"git commit -m initial"

test_expect_success \
	"invalid options 1" \
	"test_must_fail git commit -m foo -m bar -F file"

test_expect_success \
	"invalid options 2" \
	"test_must_fail git commit -C HEAD -m illegal"

test_expect_success \
	"using paths with -a" \
	"echo King of the bongo >file &&
	test_must_fail git commit -m foo -a file"

test_expect_success PERL \
	"using paths with --interactive" \
	"echo bong-o-bong >file &&
	! (echo 7 | git commit -m foo --interactive file)"

test_expect_success \
	"using invalid commit with -C" \
	"test_must_fail git commit -C bogus"

test_expect_success \
	"testing nothing to commit" \
	"test_must_fail git commit -m initial"

test_expect_success \
	"next commit" \
	"echo 'bongo bongo bongo' >file \
	 git commit -m next -a"

test_expect_success \
	"commit message from non-existing file" \
	"echo 'more bongo: bongo bongo bongo bongo' >file && \
	 test_must_fail git commit -F gah -a"

# Empty except stray tabs and spaces on a few lines.
sed -e 's/@$//' >msg <<EOF
		@

  @
Signed-off-by: hula
EOF
test_expect_success \
	"empty commit message" \
	"test_must_fail git commit -F msg -a"

test_expect_success \
	"commit message from file" \
	"echo 'this is the commit message, coming from a file' >msg && \
	 git commit -F msg -a"

cat >editor <<\EOF
#!/bin/sh
sed -e "s/a file/an amend commit/g" < "$1" > "$1-"
mv "$1-" "$1"
EOF
chmod 755 editor

test_expect_success \
	"amend commit" \
	"VISUAL=./editor git commit --amend"

test_expect_success \
	"passing -m and -F" \
	"echo 'enough with the bongos' >file && \
	 test_must_fail git commit -F msg -m amending ."

test_expect_success \
	"using message from other commit" \
	"git commit -C HEAD^ ."

cat >editor <<\EOF
#!/bin/sh
sed -e "s/amend/older/g"  < "$1" > "$1-"
mv "$1-" "$1"
EOF
chmod 755 editor

test_expect_success \
	"editing message from other commit" \
	"echo 'hula hula' >file && \
	 VISUAL=./editor git commit -c HEAD^ -a"

test_expect_success \
	"message from stdin" \
	"echo 'silly new contents' >file && \
	 echo commit message from stdin | git commit -F - -a"

test_expect_success \
	"overriding author from command line" \
	"echo 'gak' >file && \
	 git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a"

test_expect_success PERL \
	"interactive add" \
	"echo 7 | git commit --interactive | grep 'What now'"

test_expect_success \
	"showing committed revisions" \
	"git rev-list HEAD >current"

cat >editor <<\EOF
#!/bin/sh
sed -e "s/good/bad/g" < "$1" > "$1-"
mv "$1-" "$1"
EOF
chmod 755 editor

cat >msg <<EOF
A good commit message.
EOF

test_expect_success \
	'editor not invoked if -F is given' '
	 echo "moo" >file &&
	 VISUAL=./editor git commit -a -F msg &&
	 git show -s --pretty=format:"%s" | grep -q good &&
	 echo "quack" >file &&
	 echo "Another good message." | VISUAL=./editor git commit -a -F - &&
	 git show -s --pretty=format:"%s" | grep -q good
	 '
# We could just check the head sha1, but checking each commit makes it
# easier to isolate bugs.

cat >expected <<\EOF
72c0dc9855b0c9dadcbfd5a31cab072e0cb774ca
9b88fc14ce6b32e3d9ee021531a54f18a5cf38a2
3536bbb352c3a1ef9a420f5b4242d48578b92aa7
d381ac431806e53f3dd7ac2f1ae0534f36d738b9
4fd44095ad6334f3ef72e4c5ec8ddf108174b54a
402702b49136e7587daa9280e91e4bb7cb2179f7
EOF

test_expect_success \
    'validate git rev-list output.' \
    'test_cmp expected current'

test_expect_success 'partial commit that involves removal (1)' '

	git rm --cached file &&
	mv file elif &&
	git add elif &&
	git commit -m "Partial: add elif" elif &&
	git diff-tree --name-status HEAD^ HEAD >current &&
	echo "A	elif" >expected &&
	test_cmp expected current

'

test_expect_success 'partial commit that involves removal (2)' '

	git commit -m "Partial: remove file" file &&
	git diff-tree --name-status HEAD^ HEAD >current &&
	echo "D	file" >expected &&
	test_cmp expected current

'

test_expect_success 'partial commit that involves removal (3)' '

	git rm --cached elif &&
	echo elif >elif &&
	git commit -m "Partial: modify elif" elif &&
	git diff-tree --name-status HEAD^ HEAD >current &&
	echo "M	elif" >expected &&
	test_cmp expected current

'

author="The Real Author <someguy@his.email.org>"
test_expect_success 'amend commit to fix author' '

	oldtick=$GIT_AUTHOR_DATE &&
	test_tick &&
	git reset --hard &&
	git cat-file -p HEAD |
	sed -e "s/author.*/author $author $oldtick/" \
		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
		expected &&
	git commit --amend --author="$author" &&
	git cat-file -p HEAD > current &&
	test_cmp expected current

'

test_expect_success 'sign off (1)' '

	echo 1 >positive &&
	git add positive &&
	git commit -s -m "thank you" &&
	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
	(
		echo thank you
		echo
		git var GIT_COMMITTER_IDENT |
		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
	) >expected &&
	test_cmp expected actual

'

test_expect_success 'sign off (2)' '

	echo 2 >positive &&
	git add positive &&
	existing="Signed-off-by: Watch This <watchthis@example.com>" &&
	git commit -s -m "thank you

$existing" &&
	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
	(
		echo thank you
		echo
		echo $existing
		git var GIT_COMMITTER_IDENT |
		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
	) >expected &&
	test_cmp expected actual

'

test_expect_success 'multiple -m' '

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

'

author="The Real Author <someguy@his.email.org>"
test_expect_success 'amend commit to fix author' '

	oldtick=$GIT_AUTHOR_DATE &&
	test_tick &&
	git reset --hard &&
	git cat-file -p HEAD |
	sed -e "s/author.*/author $author $oldtick/" \
		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
		expected &&
	git commit --amend --author="$author" &&
	git cat-file -p HEAD > current &&
	test_cmp expected current

'

test_expect_success 'git commit <file> with dirty index' '
	echo tacocat > elif &&
	echo tehlulz > chz &&
	git add chz &&
	git commit elif -m "tacocat is a palindrome" &&
	git show --stat | grep elif &&
	git diff --cached | grep chz
'

test_expect_success 'same tree (single parent)' '

	git reset --hard

	if git commit -m empty
	then
		echo oops -- should have complained
		false
	else
		: happy
	fi

'

test_expect_success 'same tree (single parent) --allow-empty' '

	git commit --allow-empty -m "forced empty" &&
	git cat-file commit HEAD | grep forced

'

test_expect_success 'same tree (merge and amend merge)' '

	git checkout -b side HEAD^ &&
	echo zero >zero &&
	git add zero &&
	git commit -m "add zero" &&
	git checkout master &&

	git merge -s ours side -m "empty ok" &&
	git diff HEAD^ HEAD >actual &&
	: >expected &&
	test_cmp expected actual &&

	git commit --amend -m "empty really ok" &&
	git diff HEAD^ HEAD >actual &&
	: >expected &&
	test_cmp expected actual

'

test_expect_success 'amend using the message from another commit' '

	git reset --hard &&
	test_tick &&
	git commit --allow-empty -m "old commit" &&
	old=$(git rev-parse --verify HEAD) &&
	test_tick &&
	git commit --allow-empty -m "new commit" &&
	new=$(git rev-parse --verify HEAD) &&
	test_tick &&
	git commit --allow-empty --amend -C "$old" &&
	git show --pretty="format:%ad %s" "$old" >expected &&
	git show --pretty="format:%ad %s" HEAD >actual &&
	test_cmp expected actual

'

test_expect_success 'amend using the message from a commit named with tag' '

	git reset --hard &&
	test_tick &&
	git commit --allow-empty -m "old commit" &&
	old=$(git rev-parse --verify HEAD) &&
	git tag -a -m "tag on old" tagged-old HEAD &&
	test_tick &&
	git commit --allow-empty -m "new commit" &&
	new=$(git rev-parse --verify HEAD) &&
	test_tick &&
	git commit --allow-empty --amend -C tagged-old &&
	git show --pretty="format:%ad %s" "$old" >expected &&
	git show --pretty="format:%ad %s" HEAD >actual &&
	test_cmp expected actual

'

test_done
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 && \
47a528ad NS	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" \
9d87442f BS	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" \
9d87442f BS	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" \
12ace0b2 KH	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-"
f69e836f BD	83	mv "$1-" "$1"
12ace0b2 KH	84	EOF
	85	chmod 755 editor
	86
	87	test_expect_success \
	88	"amend commit" \
47a528ad	89	"VISUAL=./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-"
f69e836f BD	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 && \
47a528ad	110	VISUAL=./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 && \
47a528ad	120	git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a"
12ace0b2	121
1b19ccd2	122	test_expect_success PERL \
12ace0b2	123	"interactive add" \
47a528ad	124	"echo 7 \| git commit --interactive \| grep 'What now'"
12ace0b2 KH	125
	126	test_expect_success \
	127	"showing committed revisions" \
47a528ad	128	"git rev-list HEAD >current"
12ace0b2	129
7eb5bbdb AS	130	cat >editor <<\EOF
	131	#!/bin/sh
	132	sed -e "s/good/bad/g" < "$1" > "$1-"
	133	mv "$1-" "$1"
	134	EOF
	135	chmod 755 editor
	136
	137	cat >msg <<EOF
	138	A good commit message.
	139	EOF
	140
	141	test_expect_success \
	142	'editor not invoked if -F is given' '
	143	echo "moo" >file &&
	144	VISUAL=./editor git commit -a -F msg &&
	145	git show -s --pretty=format:"%s" \| grep -q good &&
	146	echo "quack" >file &&
	147	echo "Another good message." \| VISUAL=./editor git commit -a -F - &&
	148	git show -s --pretty=format:"%s" \| grep -q good
	149	'
12ace0b2 KH	150	# We could just check the head sha1, but checking each commit makes it
	151	# easier to isolate bugs.
	152
	153	cat >expected <<\EOF
	154	72c0dc9855b0c9dadcbfd5a31cab072e0cb774ca
	155	9b88fc14ce6b32e3d9ee021531a54f18a5cf38a2
	156	3536bbb352c3a1ef9a420f5b4242d48578b92aa7
	157	d381ac431806e53f3dd7ac2f1ae0534f36d738b9
	158	4fd44095ad6334f3ef72e4c5ec8ddf108174b54a
	159	402702b49136e7587daa9280e91e4bb7cb2179f7
	160	EOF
	161
	162	test_expect_success \
47a528ad	163	'validate git rev-list output.' \
1e368681	164	'test_cmp expected current'
12ace0b2	165
db33af0a	166	test_expect_success 'partial commit that involves removal (1)' '
80bffaf7 JH	167
	168	git rm --cached file &&
	169	mv file elif &&
	170	git add elif &&
	171	git commit -m "Partial: add elif" elif &&
	172	git diff-tree --name-status HEAD^ HEAD >current &&
	173	echo "A elif" >expected &&
1e368681	174	test_cmp expected current
80bffaf7 JH	175
	176	'
	177
db33af0a	178	test_expect_success 'partial commit that involves removal (2)' '
80bffaf7 JH	179
	180	git commit -m "Partial: remove file" file &&
	181	git diff-tree --name-status HEAD^ HEAD >current &&
	182	echo "D file" >expected &&
1e368681	183	test_cmp expected current
80bffaf7 JH	184
	185	'
	186
db33af0a JH	187	test_expect_success 'partial commit that involves removal (3)' '
	188
	189	git rm --cached elif &&
	190	echo elif >elif &&
	191	git commit -m "Partial: modify elif" elif &&
	192	git diff-tree --name-status HEAD^ HEAD >current &&
	193	echo "M elif" >expected &&
1e368681	194	test_cmp expected current
db33af0a JH	195
	196	'
	197
5aa5cd46 JH	198	author="The Real Author <someguy@his.email.org>"
	199	test_expect_success 'amend commit to fix author' '
	200
	201	oldtick=$GIT_AUTHOR_DATE &&
	202	test_tick &&
	203	git reset --hard &&
	204	git cat-file -p HEAD \|
	205	sed -e "s/author.*/author $author $oldtick/" \
	206	-e "s/^\(committer.> \).$/\1$GIT_COMMITTER_DATE/" > \
	207	expected &&
	208	git commit --amend --author="$author" &&
	209	git cat-file -p HEAD > current &&
1e368681	210	test_cmp expected current
5aa5cd46 JH	211
	212	'
	213
	214	test_expect_success 'sign off (1)' '
	215
	216	echo 1 >positive &&
	217	git add positive &&
	218	git commit -s -m "thank you" &&
	219	git cat-file commit HEAD \| sed -e "1,/^\$/d" >actual &&
	220	(
	221	echo thank you
	222	echo
	223	git var GIT_COMMITTER_IDENT \|
	224	sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
	225	) >expected &&
82ebb0b6	226	test_cmp expected actual
5aa5cd46 JH	227
	228	'
	229
	230	test_expect_success 'sign off (2)' '
	231
	232	echo 2 >positive &&
	233	git add positive &&
	234	existing="Signed-off-by: Watch This <watchthis@example.com>" &&
	235	git commit -s -m "thank you
	236
	237	$existing" &&
	238	git cat-file commit HEAD \| sed -e "1,/^\$/d" >actual &&
	239	(
	240	echo thank you
	241	echo
	242	echo $existing
	243	git var GIT_COMMITTER_IDENT \|
	244	sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
	245	) >expected &&
82ebb0b6	246	test_cmp expected actual
5aa5cd46 JH	247
	248	'
	249
	250	test_expect_success 'multiple -m' '
	251
	252	>negative &&
	253	git add negative &&
	254	git commit -m "one" -m "two" -m "three" &&
	255	git cat-file commit HEAD \| sed -e "1,/^\$/d" >actual &&
	256	(
	257	echo one
	258	echo
	259	echo two
	260	echo
	261	echo three
	262	) >expected &&
82ebb0b6	263	test_cmp expected actual
5aa5cd46 JH	264
	265	'
	266
d63c2fd1 KH	267	author="The Real Author <someguy@his.email.org>"
	268	test_expect_success 'amend commit to fix author' '
	269
	270	oldtick=$GIT_AUTHOR_DATE &&
	271	test_tick &&
	272	git reset --hard &&
	273	git cat-file -p HEAD \|
	274	sed -e "s/author.*/author $author $oldtick/" \
	275	-e "s/^\(committer.> \).$/\1$GIT_COMMITTER_DATE/" > \
	276	expected &&
	277	git commit --amend --author="$author" &&
	278	git cat-file -p HEAD > current &&
1e368681	279	test_cmp expected current
d63c2fd1 KH	280
d63c2fd1 KH	281	'
1200993a KH	282
	283	test_expect_success 'git commit <file> with dirty index' '
	284	echo tacocat > elif &&
	285	echo tehlulz > chz &&
	286	git add chz &&
	287	git commit elif -m "tacocat is a palindrome" &&
	288	git show --stat \| grep elif &&
	289	git diff --cached \| grep chz
	290	'
	291
13aba1e5 JS	292	test_expect_success 'same tree (single parent)' '
13aba1e5 JS	293
31cbb5d9 JH	294	git reset --hard
31cbb5d9 JH	295
13aba1e5 JS	296	if git commit -m empty
	297	then
	298	echo oops -- should have complained
	299	false
	300	else
	301	: happy
	302	fi
	303
	304	'
	305
36863af1 JH	306	test_expect_success 'same tree (single parent) --allow-empty' '
	307
	308	git commit --allow-empty -m "forced empty" &&
	309	git cat-file commit HEAD \| grep forced
	310
	311	'
	312
13aba1e5 JS	313	test_expect_success 'same tree (merge and amend merge)' '
	314
	315	git checkout -b side HEAD^ &&
	316	echo zero >zero &&
	317	git add zero &&
	318	git commit -m "add zero" &&
	319	git checkout master &&
	320
	321	git merge -s ours side -m "empty ok" &&
	322	git diff HEAD^ HEAD >actual &&
	323	: >expected &&
82ebb0b6	324	test_cmp expected actual &&
13aba1e5 JS	325
	326	git commit --amend -m "empty really ok" &&
	327	git diff HEAD^ HEAD >actual &&
	328	: >expected &&
82ebb0b6	329	test_cmp expected actual
13aba1e5 JS	330
	331	'
	332
1eb1e9ee JH	333	test_expect_success 'amend using the message from another commit' '
	334
	335	git reset --hard &&
	336	test_tick &&
	337	git commit --allow-empty -m "old commit" &&
	338	old=$(git rev-parse --verify HEAD) &&
	339	test_tick &&
	340	git commit --allow-empty -m "new commit" &&
	341	new=$(git rev-parse --verify HEAD) &&
	342	test_tick &&
	343	git commit --allow-empty --amend -C "$old" &&
	344	git show --pretty="format:%ad %s" "$old" >expected &&
	345	git show --pretty="format:%ad %s" HEAD >actual &&
82ebb0b6	346	test_cmp expected actual
1eb1e9ee JH	347
	348	'
	349
8a2f8733 JH	350	test_expect_success 'amend using the message from a commit named with tag' '
	351
	352	git reset --hard &&
	353	test_tick &&
	354	git commit --allow-empty -m "old commit" &&
	355	old=$(git rev-parse --verify HEAD) &&
	356	git tag -a -m "tag on old" tagged-old HEAD &&
	357	test_tick &&
	358	git commit --allow-empty -m "new commit" &&
	359	new=$(git rev-parse --verify HEAD) &&
	360	test_tick &&
	361	git commit --allow-empty --amend -C tagged-old &&
	362	git show --pretty="format:%ad %s" "$old" >expected &&
	363	git show --pretty="format:%ad %s" HEAD >actual &&
82ebb0b6	364	test_cmp expected actual
8a2f8733 JH	365
	366	'
	367
12ace0b2	368	test_done