[thirdparty/git.git] / t / t4202-log.sh

#!/bin/sh

test_description='git log'

. ./test-lib.sh

test_expect_success setup '

	echo one >one &&
	git add one &&
	test_tick &&
	git commit -m initial &&

	echo ichi >one &&
	git add one &&
	test_tick &&
	git commit -m second &&

	git mv one ichi &&
	test_tick &&
	git commit -m third &&

	cp ichi ein &&
	git add ein &&
	test_tick &&
	git commit -m fourth &&

	mkdir a &&
	echo ni >a/two &&
	git add a/two &&
	test_tick &&
	git commit -m fifth  &&

	git rm a/two &&
	test_tick &&
	git commit -m sixth

'

printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial" > expect
test_expect_success 'pretty' '

	git log --pretty="format:%s" > actual &&
	test_cmp expect actual
'

printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial\n" > expect
test_expect_success 'pretty (tformat)' '

	git log --pretty="tformat:%s" > actual &&
	test_cmp expect actual
'

test_expect_success 'pretty (shortcut)' '

	git log --pretty="%s" > actual &&
	test_cmp expect actual
'

test_expect_success 'format' '

	git log --format="%s" > actual &&
	test_cmp expect actual
'

cat > expect << EOF
 This is
  the sixth
  commit.
 This is
  the fifth
  commit.
EOF

test_expect_success 'format %w(12,1,2)' '

	git log -2 --format="%w(12,1,2)This is the %s commit." > actual &&
	test_cmp expect actual
'

test_expect_success 'format %w(,1,2)' '

	git log -2 --format="%w(,1,2)This is%nthe %s%ncommit." > actual &&
	test_cmp expect actual
'

cat > expect << EOF
804a787 sixth
394ef78 fifth
5d31159 fourth
2fbe8c0 third
f7dab8e second
3a2fdcb initial
EOF
test_expect_success 'oneline' '

	git log --oneline > actual &&
	test_cmp expect actual
'

test_expect_success 'diff-filter=A' '

	actual=$(git log --pretty="format:%s" --diff-filter=A HEAD) &&
	expect=$(echo fifth ; echo fourth ; echo third ; echo initial) &&
	test "$actual" = "$expect" || {
		echo Oops
		echo "Actual: $actual"
		false
	}

'

test_expect_success 'diff-filter=M' '

	actual=$(git log --pretty="format:%s" --diff-filter=M HEAD) &&
	expect=$(echo second) &&
	test "$actual" = "$expect" || {
		echo Oops
		echo "Actual: $actual"
		false
	}

'

test_expect_success 'diff-filter=D' '

	actual=$(git log --pretty="format:%s" --diff-filter=D HEAD) &&
	expect=$(echo sixth ; echo third) &&
	test "$actual" = "$expect" || {
		echo Oops
		echo "Actual: $actual"
		false
	}

'

test_expect_success 'diff-filter=R' '

	actual=$(git log -M --pretty="format:%s" --diff-filter=R HEAD) &&
	expect=$(echo third) &&
	test "$actual" = "$expect" || {
		echo Oops
		echo "Actual: $actual"
		false
	}

'

test_expect_success 'diff-filter=C' '

	actual=$(git log -C -C --pretty="format:%s" --diff-filter=C HEAD) &&
	expect=$(echo fourth) &&
	test "$actual" = "$expect" || {
		echo Oops
		echo "Actual: $actual"
		false
	}

'

test_expect_success 'git log --follow' '

	actual=$(git log --follow --pretty="format:%s" ichi) &&
	expect=$(echo third ; echo second ; echo initial) &&
	test "$actual" = "$expect" || {
		echo Oops
		echo "Actual: $actual"
		false
	}

'

cat > expect << EOF
804a787 sixth
394ef78 fifth
5d31159 fourth
EOF
test_expect_success 'git log --no-walk <commits> sorts by commit time' '
	git log --no-walk --oneline 5d31159 804a787 394ef78 > actual &&
	test_cmp expect actual
'

cat > expect << EOF
5d31159 fourth
804a787 sixth
394ef78 fifth
EOF
test_expect_success 'git show <commits> leaves list of commits as given' '
	git show --oneline -s 5d31159 804a787 394ef78 > actual &&
	test_cmp expect actual
'

test_expect_success 'setup case sensitivity tests' '
	echo case >one &&
	test_tick &&
	git add one
	git commit -a -m Second
'

test_expect_success 'log --grep' '
	echo second >expect &&
	git log -1 --pretty="tformat:%s" --grep=sec >actual &&
	test_cmp expect actual
'

test_expect_success 'log -i --grep' '
	echo Second >expect &&
	git log -1 --pretty="tformat:%s" -i --grep=sec >actual &&
	test_cmp expect actual
'

test_expect_success 'log --grep -i' '
	echo Second >expect &&
	git log -1 --pretty="tformat:%s" --grep=sec -i >actual &&
	test_cmp expect actual
'

cat > expect <<EOF
* Second
* sixth
* fifth
* fourth
* third
* second
* initial
EOF

test_expect_success 'simple log --graph' '
	git log --graph --pretty=tformat:%s >actual &&
	test_cmp expect actual
'

test_expect_success 'set up merge history' '
	git checkout -b side HEAD~4 &&
	test_commit side-1 1 1 &&
	test_commit side-2 2 2 &&
	git checkout master &&
	git merge side
'

cat > expect <<\EOF
*   Merge branch 'side'
|\
| * side-2
| * side-1
* | Second
* | sixth
* | fifth
* | fourth
|/
* third
* second
* initial
EOF

test_expect_success 'log --graph with merge' '
	git log --graph --date-order --pretty=tformat:%s |
		sed "s/ *\$//" >actual &&
	test_cmp expect actual
'

cat > expect <<\EOF
*   commit master
|\  Merge: A B
| | Author: A U Thor <author@example.com>
| |
| |     Merge branch 'side'
| |
| * commit side
| | Author: A U Thor <author@example.com>
| |
| |     side-2
| |
| * commit tags/side-1
| | Author: A U Thor <author@example.com>
| |
| |     side-1
| |
* | commit master~1
| | Author: A U Thor <author@example.com>
| |
| |     Second
| |
* | commit master~2
| | Author: A U Thor <author@example.com>
| |
| |     sixth
| |
* | commit master~3
| | Author: A U Thor <author@example.com>
| |
| |     fifth
| |
* | commit master~4
|/  Author: A U Thor <author@example.com>
|
|       fourth
|
* commit tags/side-1~1
| Author: A U Thor <author@example.com>
|
|     third
|
* commit tags/side-1~2
| Author: A U Thor <author@example.com>
|
|     second
|
* commit tags/side-1~3
  Author: A U Thor <author@example.com>

      initial
EOF

test_expect_success 'log --graph with full output' '
	git log --graph --date-order --pretty=short |
		git name-rev --name-only --stdin |
		sed "s/Merge:.*/Merge: A B/;s/ *\$//" >actual &&
	test_cmp expect actual
'

test_expect_success 'set up more tangled history' '
	git checkout -b tangle HEAD~6 &&
	test_commit tangle-a tangle-a a &&
	git merge master~3 &&
	git merge side~1 &&
	git checkout master &&
	git merge tangle &&
	git checkout -b reach &&
	test_commit reach &&
	git checkout master &&
	git checkout -b octopus-a &&
	test_commit octopus-a &&
	git checkout master &&
	git checkout -b octopus-b &&
	test_commit octopus-b &&
	git checkout master &&
	test_commit seventh &&
	git merge octopus-a octopus-b
	git merge reach
'

cat > expect <<\EOF
*   Merge commit 'reach'
|\
| \
|  \
*-. \   Merge commit 'octopus-a'; commit 'octopus-b'
|\ \ \
* | | | seventh
| | * | octopus-b
| |/ /
|/| |
| * | octopus-a
|/ /
| * reach
|/
*   Merge branch 'tangle'
|\
| *   Merge branch 'side' (early part) into tangle
| |\
| * \   Merge branch 'master' (early part) into tangle
| |\ \
| * | | tangle-a
* | | |   Merge branch 'side'
|\ \ \ \
| * | | | side-2
| | |_|/
| |/| |
| * | | side-1
* | | | Second
* | | | sixth
| |_|/
|/| |
* | | fifth
* | | fourth
|/ /
* | third
|/
* second
* initial
EOF

test_expect_success 'log --graph with merge' '
	git log --graph --date-order --pretty=tformat:%s |
		sed "s/ *\$//" >actual &&
	test_cmp expect actual
'

test_expect_success 'log.decorate configuration' '
	git config --unset-all log.decorate || :

	git log --oneline >expect.none &&
	git log --oneline --decorate >expect.short &&
	git log --oneline --decorate=full >expect.full &&

	echo "[log] decorate" >>.git/config &&
	git log --oneline >actual &&
	test_cmp expect.short actual &&

	git config --unset-all log.decorate &&
	git config log.decorate true &&
	git log --oneline >actual &&
	test_cmp expect.short actual &&
	git log --oneline --decorate=full >actual &&
	test_cmp expect.full actual &&
	git log --oneline --decorate=no >actual &&
	test_cmp expect.none actual &&

	git config --unset-all log.decorate &&
	git config log.decorate no &&
	git log --oneline >actual &&
	test_cmp expect.none actual &&
	git log --oneline --decorate >actual &&
	test_cmp expect.short actual &&
	git log --oneline --decorate=full >actual &&
	test_cmp expect.full actual &&

	git config --unset-all log.decorate &&
	git config log.decorate short &&
	git log --oneline >actual &&
	test_cmp expect.short actual &&
	git log --oneline --no-decorate >actual &&
	test_cmp expect.none actual &&
	git log --oneline --decorate=full >actual &&
	test_cmp expect.full actual &&

	git config --unset-all log.decorate &&
	git config log.decorate full &&
	git log --oneline >actual &&
	test_cmp expect.full actual &&
	git log --oneline --no-decorate >actual &&
	test_cmp expect.none actual &&
	git log --oneline --decorate >actual &&
	test_cmp expect.short actual

'

test_done
Commit	Line	Data
0faf2da7 AL	1	#!/bin/sh
	2
	3	test_description='git log'
	4
	5	. ./test-lib.sh
	6
	7	test_expect_success setup '
	8
	9	echo one >one &&
	10	git add one &&
	11	test_tick &&
	12	git commit -m initial &&
	13
	14	echo ichi >one &&
	15	git add one &&
	16	test_tick &&
	17	git commit -m second &&
	18
d9305089	19	git mv one ichi &&
0faf2da7 AL	20	test_tick &&
	21	git commit -m third &&
	22
d9305089 AL	23	cp ichi ein &&
d9305089 AL	24	git add ein &&
0faf2da7 AL	25	test_tick &&
	26	git commit -m fourth &&
	27
d9305089 AL	28	mkdir a &&
	29	echo ni >a/two &&
	30	git add a/two &&
	31	test_tick &&
	32	git commit -m fifth &&
	33
	34	git rm a/two &&
0faf2da7	35	test_tick &&
d9305089	36	git commit -m sixth
0faf2da7 AL	37
	38	'
	39
bb93afd5 FC	40	printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial" > expect
	41	test_expect_success 'pretty' '
	42
	43	git log --pretty="format:%s" > actual &&
	44	test_cmp expect actual
	45	'
	46
	47	printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial\n" > expect
	48	test_expect_success 'pretty (tformat)' '
	49
	50	git log --pretty="tformat:%s" > actual &&
	51	test_cmp expect actual
	52	'
	53
	54	test_expect_success 'pretty (shortcut)' '
	55
	56	git log --pretty="%s" > actual &&
	57	test_cmp expect actual
	58	'
	59
	60	test_expect_success 'format' '
	61
	62	git log --format="%s" > actual &&
	63	test_cmp expect actual
	64	'
	65
37bb5d74 RS	66	cat > expect << EOF
	67	This is
	68	the sixth
	69	commit.
	70	This is
	71	the fifth
	72	commit.
	73	EOF
	74
	75	test_expect_success 'format %w(12,1,2)' '
	76
	77	git log -2 --format="%w(12,1,2)This is the %s commit." > actual &&
	78	test_cmp expect actual
	79	'
	80
	81	test_expect_success 'format %w(,1,2)' '
	82
	83	git log -2 --format="%w(,1,2)This is%nthe %s%ncommit." > actual &&
	84	test_cmp expect actual
	85	'
	86
bb93afd5 FC	87	cat > expect << EOF
	88	804a787 sixth
	89	394ef78 fifth
	90	5d31159 fourth
	91	2fbe8c0 third
	92	f7dab8e second
	93	3a2fdcb initial
	94	EOF
	95	test_expect_success 'oneline' '
	96
	97	git log --oneline > actual &&
	98	test_cmp expect actual
	99	'
	100
0faf2da7 AL	101	test_expect_success 'diff-filter=A' '
	102
	103	actual=$(git log --pretty="format:%s" --diff-filter=A HEAD) &&
d9305089	104	expect=$(echo fifth ; echo fourth ; echo third ; echo initial) &&
0faf2da7 AL	105	test "$actual" = "$expect" \|\| {
	106	echo Oops
	107	echo "Actual: $actual"
	108	false
	109	}
	110
	111	'
	112
	113	test_expect_success 'diff-filter=M' '
	114
	115	actual=$(git log --pretty="format:%s" --diff-filter=M HEAD) &&
	116	expect=$(echo second) &&
	117	test "$actual" = "$expect" \|\| {
	118	echo Oops
	119	echo "Actual: $actual"
	120	false
	121	}
	122
	123	'
	124
	125	test_expect_success 'diff-filter=D' '
	126
	127	actual=$(git log --pretty="format:%s" --diff-filter=D HEAD) &&
d9305089 AL	128	expect=$(echo sixth ; echo third) &&
	129	test "$actual" = "$expect" \|\| {
	130	echo Oops
	131	echo "Actual: $actual"
	132	false
	133	}
	134
	135	'
	136
	137	test_expect_success 'diff-filter=R' '
	138
	139	actual=$(git log -M --pretty="format:%s" --diff-filter=R HEAD) &&
	140	expect=$(echo third) &&
	141	test "$actual" = "$expect" \|\| {
	142	echo Oops
	143	echo "Actual: $actual"
	144	false
	145	}
	146
	147	'
	148
	149	test_expect_success 'diff-filter=C' '
	150
	151	actual=$(git log -C -C --pretty="format:%s" --diff-filter=C HEAD) &&
	152	expect=$(echo fourth) &&
	153	test "$actual" = "$expect" \|\| {
	154	echo Oops
	155	echo "Actual: $actual"
	156	false
	157	}
	158
	159	'
	160
	161	test_expect_success 'git log --follow' '
	162
	163	actual=$(git log --follow --pretty="format:%s" ichi) &&
	164	expect=$(echo third ; echo second ; echo initial) &&
0faf2da7 AL	165	test "$actual" = "$expect" \|\| {
	166	echo Oops
	167	echo "Actual: $actual"
	168	false
	169	}
	170
	171	'
	172
d5cee0f7 MG	173	cat > expect << EOF
	174	804a787 sixth
	175	394ef78 fifth
	176	5d31159 fourth
	177	EOF
	178	test_expect_success 'git log --no-walk <commits> sorts by commit time' '
	179	git log --no-walk --oneline 5d31159 804a787 394ef78 > actual &&
	180	test_cmp expect actual
	181	'
	182
	183	cat > expect << EOF
	184	5d31159 fourth
	185	804a787 sixth
	186	394ef78 fifth
	187	EOF
	188	test_expect_success 'git show <commits> leaves list of commits as given' '
	189	git show --oneline -s 5d31159 804a787 394ef78 > actual &&
	190	test_cmp expect actual
	191	'
	192
0843acfd JK	193	test_expect_success 'setup case sensitivity tests' '
	194	echo case >one &&
	195	test_tick &&
d9305089	196	git add one
0843acfd JK	197	git commit -a -m Second
	198	'
	199
	200	test_expect_success 'log --grep' '
	201	echo second >expect &&
	202	git log -1 --pretty="tformat:%s" --grep=sec >actual &&
	203	test_cmp expect actual
	204	'
0faf2da7	205
0843acfd JK	206	test_expect_success 'log -i --grep' '
	207	echo Second >expect &&
	208	git log -1 --pretty="tformat:%s" -i --grep=sec >actual &&
	209	test_cmp expect actual
	210	'
	211
	212	test_expect_success 'log --grep -i' '
	213	echo Second >expect &&
	214	git log -1 --pretty="tformat:%s" --grep=sec -i >actual &&
	215	test_cmp expect actual
	216	'
0faf2da7	217
289e1623 TR	218	cat > expect <<EOF
	219	* Second
	220	* sixth
	221	* fifth
	222	* fourth
	223	* third
	224	* second
	225	* initial
	226	EOF
	227
	228	test_expect_success 'simple log --graph' '
	229	git log --graph --pretty=tformat:%s >actual &&
	230	test_cmp expect actual
	231	'
	232
	233	test_expect_success 'set up merge history' '
	234	git checkout -b side HEAD~4 &&
	235	test_commit side-1 1 1 &&
	236	test_commit side-2 2 2 &&
	237	git checkout master &&
	238	git merge side
	239	'
	240
	241	cat > expect <<\EOF
	242	* Merge branch 'side'
	243	\|\
	244	\| * side-2
	245	\| * side-1
	246	* \| Second
	247	* \| sixth
	248	* \| fifth
	249	* \| fourth
	250	\|/
	251	* third
	252	* second
	253	* initial
	254	EOF
	255
	256	test_expect_success 'log --graph with merge' '
	257	git log --graph --date-order --pretty=tformat:%s \|
9524cf29	258	sed "s/ *\$//" >actual &&
289e1623 TR	259	test_cmp expect actual
	260	'
	261
	262	cat > expect <<\EOF
	263	* commit master
	264	\|\ Merge: A B
	265	\| \| Author: A U Thor <author@example.com>
	266	\| \|
	267	\| \| Merge branch 'side'
	268	\| \|
	269	\| * commit side
	270	\| \| Author: A U Thor <author@example.com>
	271	\| \|
	272	\| \| side-2
	273	\| \|
	274	\| * commit tags/side-1
	275	\| \| Author: A U Thor <author@example.com>
	276	\| \|
	277	\| \| side-1
	278	\| \|
	279	* \| commit master~1
	280	\| \| Author: A U Thor <author@example.com>
	281	\| \|
	282	\| \| Second
	283	\| \|
	284	* \| commit master~2
	285	\| \| Author: A U Thor <author@example.com>
	286	\| \|
	287	\| \| sixth
	288	\| \|
	289	* \| commit master~3
	290	\| \| Author: A U Thor <author@example.com>
	291	\| \|
	292	\| \| fifth
	293	\| \|
	294	* \| commit master~4
	295	\|/ Author: A U Thor <author@example.com>
	296	\|
	297	\| fourth
	298	\|
	299	* commit tags/side-1~1
	300	\| Author: A U Thor <author@example.com>
	301	\|
	302	\| third
	303	\|
	304	* commit tags/side-1~2
	305	\| Author: A U Thor <author@example.com>
	306	\|
	307	\| second
	308	\|
	309	* commit tags/side-1~3
	310	Author: A U Thor <author@example.com>
	311
	312	initial
	313	EOF
	314
	315	test_expect_success 'log --graph with full output' '
	316	git log --graph --date-order --pretty=short \|
	317	git name-rev --name-only --stdin \|
9524cf29	318	sed "s/Merge:./Merge: A B/;s/ \$//" >actual &&
289e1623 TR	319	test_cmp expect actual
	320	'
	321
	322	test_expect_success 'set up more tangled history' '
	323	git checkout -b tangle HEAD~6 &&
	324	test_commit tangle-a tangle-a a &&
	325	git merge master~3 &&
	326	git merge side~1 &&
	327	git checkout master &&
7b1d6269 AC	328	git merge tangle &&
	329	git checkout -b reach &&
	330	test_commit reach &&
	331	git checkout master &&
	332	git checkout -b octopus-a &&
	333	test_commit octopus-a &&
	334	git checkout master &&
	335	git checkout -b octopus-b &&
	336	test_commit octopus-b &&
	337	git checkout master &&
	338	test_commit seventh &&
	339	git merge octopus-a octopus-b
	340	git merge reach
289e1623 TR	341	'
	342
	343	cat > expect <<\EOF
751c5974	344	* Merge commit 'reach'
7b1d6269 AC	345	\|\
	346	\| \
	347	\| \
751c5974	348	*-. \ Merge commit 'octopus-a'; commit 'octopus-b'
7b1d6269 AC	349	\|\ \ \
	350	* \| \| \| seventh
	351	\| \| * \| octopus-b
	352	\| \|/ /
	353	\|/\| \|
	354	\| * \| octopus-a
	355	\|/ /
	356	\| * reach
	357	\|/
289e1623 TR	358	* Merge branch 'tangle'
	359	\|\
	360	\| * Merge branch 'side' (early part) into tangle
	361	\| \|\
	362	\| * \ Merge branch 'master' (early part) into tangle
	363	\| \|\ \
	364	\| * \| \| tangle-a
	365	* \| \| \| Merge branch 'side'
	366	\|\ \ \ \
	367	\| * \| \| \| side-2
eaf158f8	368	\| \| \|_\|/
289e1623 TR	369	\| \|/\| \|
	370	\| * \| \| side-1
	371	* \| \| \| Second
	372	* \| \| \| sixth
eaf158f8	373	\| \|_\|/
289e1623 TR	374	\|/\| \|
	375	* \| \| fifth
	376	* \| \| fourth
	377	\|/ /
	378	* \| third
	379	\|/
	380	* second
	381	* initial
	382	EOF
	383
95110d75	384	test_expect_success 'log --graph with merge' '
289e1623	385	git log --graph --date-order --pretty=tformat:%s \|
9524cf29	386	sed "s/ *\$//" >actual &&
289e1623 TR	387	test_cmp expect actual
	388	'
	389
8a3d203b JH	390	test_expect_success 'log.decorate configuration' '
	391	git config --unset-all log.decorate \|\| :
	392
4f62c2bc JH	393	git log --oneline >expect.none &&
	394	git log --oneline --decorate >expect.short &&
	395	git log --oneline --decorate=full >expect.full &&
8a3d203b JH	396
8a3d203b JH	397	echo "[log] decorate" >>.git/config &&
635530a2	398	git log --oneline >actual &&
4f62c2bc	399	test_cmp expect.short actual &&
8a3d203b JH	400
	401	git config --unset-all log.decorate &&
	402	git config log.decorate true &&
4f62c2bc	403	git log --oneline >actual &&
8a3d203b	404	test_cmp expect.short actual &&
4f62c2bc	405	git log --oneline --decorate=full >actual &&
8a3d203b	406	test_cmp expect.full actual &&
4f62c2bc	407	git log --oneline --decorate=no >actual &&
8a3d203b JH	408	test_cmp expect.none actual &&
	409
	410	git config --unset-all log.decorate &&
	411	git config log.decorate no &&
4f62c2bc	412	git log --oneline >actual &&
8a3d203b	413	test_cmp expect.none actual &&
4f62c2bc	414	git log --oneline --decorate >actual &&
8a3d203b	415	test_cmp expect.short actual &&
4f62c2bc	416	git log --oneline --decorate=full >actual &&
8a3d203b JH	417	test_cmp expect.full actual &&
	418
	419	git config --unset-all log.decorate &&
	420	git config log.decorate short &&
4f62c2bc	421	git log --oneline >actual &&
8a3d203b	422	test_cmp expect.short actual &&
4f62c2bc	423	git log --oneline --no-decorate >actual &&
8a3d203b	424	test_cmp expect.none actual &&
4f62c2bc	425	git log --oneline --decorate=full >actual &&
8a3d203b JH	426	test_cmp expect.full actual &&
	427
	428	git config --unset-all log.decorate &&
	429	git config log.decorate full &&
4f62c2bc	430	git log --oneline >actual &&
8a3d203b	431	test_cmp expect.full actual &&
4f62c2bc	432	git log --oneline --no-decorate >actual &&
8a3d203b	433	test_cmp expect.none actual &&
4f62c2bc	434	git log --oneline --decorate >actual &&
8a3d203b JH	435	test_cmp expect.short actual
	436
	437	'
	438
c65233fe BC	439	test_done
c65233fe BC	440