[thirdparty/git.git] / t / t4013-diff-various.sh

#!/bin/sh
#
# Copyright (c) 2006 Junio C Hamano
#

test_description='Various diff formatting options'

. ./test-lib.sh

LF='
'

test_expect_success setup '

	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

	mkdir dir &&
	mkdir dir2 &&
	for i in 1 2 3; do echo $i; done >file0 &&
	for i in A B; do echo $i; done >dir/sub &&
	cat file0 >file2 &&
	git add file0 file2 dir/sub &&
	git commit -m Initial &&

	git branch initial &&
	git branch side &&

	GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

	for i in 4 5 6; do echo $i; done >>file0 &&
	for i in C D; do echo $i; done >>dir/sub &&
	rm -f file2 &&
	git update-index --remove file0 file2 dir/sub &&
	git commit -m "Second${LF}${LF}This is the second commit." &&

	GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

	for i in A B C; do echo $i; done >file1 &&
	git add file1 &&
	for i in E F; do echo $i; done >>dir/sub &&
	git update-index dir/sub &&
	git commit -m Third &&

	GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

	git checkout side &&
	for i in A B C; do echo $i; done >>file0 &&
	for i in 1 2; do echo $i; done >>dir/sub &&
	cat dir/sub >file3 &&
	git add file3 &&
	git update-index file0 dir/sub &&
	git commit -m Side &&

	GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

	git checkout master &&
	git pull -s ours . side &&

	GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

	for i in A B C; do echo $i; done >>file0 &&
	for i in 1 2; do echo $i; done >>dir/sub &&
	git update-index file0 dir/sub &&

	mkdir dir3 &&
	cp dir/sub dir3/sub &&
	test-tool chmtime +1 dir3/sub &&

	git config log.showroot false &&
	git commit --amend &&

	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	git checkout -b rearrange initial &&
	for i in B A; do echo $i; done >dir/sub &&
	git add dir/sub &&
	git commit -m "Rearranged lines in dir/sub" &&
	git checkout master &&

	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	git checkout -b mode initial &&
	git update-index --chmod=+x file0 &&
	git commit -m "update mode" &&
	git checkout -f master &&

	git config diff.renames false &&

	git show-branch
'

: <<\EOF
! [initial] Initial
 * [master] Merge branch 'side'
  ! [rearrange] Rearranged lines in dir/sub
   ! [side] Side
----
  +  [rearrange] Rearranged lines in dir/sub
 -   [master] Merge branch 'side'
 * + [side] Side
 *   [master^] Third
 *   [master~2] Second
+*++ [initial] Initial
EOF

V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g')
while read magic cmd
do
	case "$magic" in
	'' | '#'*)
		continue ;;
	:*)
		magic=${magic#:}
		label="$magic-$cmd"
		case "$magic" in
		noellipses) ;;
		*)
			BUG "unknown magic $magic" ;;
		esac ;;
	*)
		cmd="$magic $cmd" magic=
		label="$cmd" ;;
	esac
	test=$(echo "$label" | sed -e 's|[/ ][/ ]*|_|g')
	pfx=$(printf "%04d" $test_count)
	expect="$TEST_DIRECTORY/t4013/diff.$test"
	actual="$pfx-diff.$test"

	test_expect_success "git $cmd # magic is ${magic:-(not used)}" '
		{
			echo "$ git $cmd"
			case "$magic" in
			"")
				GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
			noellipses)
				git $cmd ;;
			esac |
			sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
			    -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
			echo "\$"
		} >"$actual" &&
		if test -f "$expect"
		then
			case $cmd in
			*format-patch* | *-stat*)
				test_i18ncmp "$expect" "$actual";;
			*)
				test_cmp "$expect" "$actual";;
			esac &&
			rm -f "$actual"
		else
			# this is to help developing new tests.
			cp "$actual" "$expect"
			false
		fi
	'
done <<\EOF
diff-tree initial
diff-tree -r initial
diff-tree -r --abbrev initial
diff-tree -r --abbrev=4 initial
diff-tree --root initial
diff-tree --root --abbrev initial
:noellipses diff-tree --root --abbrev initial
diff-tree --root -r initial
diff-tree --root -r --abbrev initial
:noellipses diff-tree --root -r --abbrev initial
diff-tree --root -r --abbrev=4 initial
:noellipses diff-tree --root -r --abbrev=4 initial
diff-tree -p initial
diff-tree --root -p initial
diff-tree --patch-with-stat initial
diff-tree --root --patch-with-stat initial
diff-tree --patch-with-raw initial
diff-tree --root --patch-with-raw initial

diff-tree --pretty initial
diff-tree --pretty --root initial
diff-tree --pretty -p initial
diff-tree --pretty --stat initial
diff-tree --pretty --summary initial
diff-tree --pretty --stat --summary initial
diff-tree --pretty --root -p initial
diff-tree --pretty --root --stat initial
# improved by Timo's patch
diff-tree --pretty --root --summary initial
# improved by Timo's patch
diff-tree --pretty --root --summary -r initial
diff-tree --pretty --root --stat --summary initial
diff-tree --pretty --patch-with-stat initial
diff-tree --pretty --root --patch-with-stat initial
diff-tree --pretty --patch-with-raw initial
diff-tree --pretty --root --patch-with-raw initial

diff-tree --pretty=oneline initial
diff-tree --pretty=oneline --root initial
diff-tree --pretty=oneline -p initial
diff-tree --pretty=oneline --root -p initial
diff-tree --pretty=oneline --patch-with-stat initial
# improved by Timo's patch
diff-tree --pretty=oneline --root --patch-with-stat initial
diff-tree --pretty=oneline --patch-with-raw initial
diff-tree --pretty=oneline --root --patch-with-raw initial

diff-tree --pretty side
diff-tree --pretty -p side
diff-tree --pretty --patch-with-stat side

diff-tree initial mode
diff-tree --stat initial mode
diff-tree --summary initial mode

diff-tree master
diff-tree -p master
diff-tree -p -m master
diff-tree -c master
diff-tree -c --abbrev master
:noellipses diff-tree -c --abbrev master
diff-tree --cc master
# stat only should show the diffstat with the first parent
diff-tree -c --stat master
diff-tree --cc --stat master
diff-tree -c --stat --summary master
diff-tree --cc --stat --summary master
# stat summary should show the diffstat and summary with the first parent
diff-tree -c --stat --summary side
diff-tree --cc --stat --summary side
# improved by Timo's patch
diff-tree --cc --patch-with-stat master
# improved by Timo's patch
diff-tree --cc --patch-with-stat --summary master
# this is correct
diff-tree --cc --patch-with-stat --summary side

log master
log -p master
log --root master
log --root -p master
log --patch-with-stat master
log --root --patch-with-stat master
log --root --patch-with-stat --summary master
# improved by Timo's patch
log --root -c --patch-with-stat --summary master
# improved by Timo's patch
log --root --cc --patch-with-stat --summary master
log -p --first-parent master
log -m -p --first-parent master
log -m -p master
log -SF master
log -S F master
log -SF -p master
log -SF master --max-count=0
log -SF master --max-count=1
log -SF master --max-count=2
log -GF master
log -GF -p master
log -GF -p --pickaxe-all master
log --decorate --all
log --decorate=full --all

rev-list --parents HEAD
rev-list --children HEAD

whatchanged master
:noellipses whatchanged master
whatchanged -p master
whatchanged --root master
:noellipses whatchanged --root master
whatchanged --root -p master
whatchanged --patch-with-stat master
whatchanged --root --patch-with-stat master
whatchanged --root --patch-with-stat --summary master
# improved by Timo's patch
whatchanged --root -c --patch-with-stat --summary master
# improved by Timo's patch
whatchanged --root --cc --patch-with-stat --summary master
whatchanged -SF master
:noellipses whatchanged -SF master
whatchanged -SF -p master

log --patch-with-stat master -- dir/
whatchanged --patch-with-stat master -- dir/
log --patch-with-stat --summary master -- dir/
whatchanged --patch-with-stat --summary master -- dir/

show initial
show --root initial
show side
show master
show -c master
show -m master
show --first-parent master
show --stat side
show --stat --summary side
show --patch-with-stat side
show --patch-with-raw side
:noellipses show --patch-with-raw side
show --patch-with-stat --summary side

format-patch --stdout initial..side
format-patch --stdout initial..master^
format-patch --stdout initial..master
format-patch --stdout --no-numbered initial..master
format-patch --stdout --numbered initial..master
format-patch --attach --stdout initial..side
format-patch --attach --stdout --suffix=.diff initial..side
format-patch --attach --stdout initial..master^
format-patch --attach --stdout initial..master
format-patch --inline --stdout initial..side
format-patch --inline --stdout initial..master^
format-patch --inline --stdout --numbered-files initial..master
format-patch --inline --stdout initial..master
format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
config format.subjectprefix DIFFERENT_PREFIX
format-patch --inline --stdout initial..master^^
format-patch --stdout --cover-letter -n initial..master^

diff --abbrev initial..side
diff -r initial..side
diff --stat initial..side
diff -r --stat initial..side
diff initial..side
diff --patch-with-stat initial..side
diff --patch-with-raw initial..side
:noellipses diff --patch-with-raw initial..side
diff --patch-with-stat -r initial..side
diff --patch-with-raw -r initial..side
:noellipses diff --patch-with-raw -r initial..side
diff --name-status dir2 dir
diff --no-index --name-status dir2 dir
diff --no-index --name-status -- dir2 dir
diff --no-index dir dir3
diff master master^ side
# Can't use spaces...
diff --line-prefix=abc master master^ side
diff --dirstat master~1 master~2
diff --dirstat initial rearrange
diff --dirstat-by-file initial rearrange
# No-index --abbrev and --no-abbrev
diff --raw initial
:noellipses diff --raw initial
diff --raw --abbrev=4 initial
:noellipses diff --raw --abbrev=4 initial
diff --raw --no-abbrev initial
diff --no-index --raw dir2 dir
:noellipses diff --no-index --raw dir2 dir
diff --no-index --raw --abbrev=4 dir2 dir
:noellipses diff --no-index --raw --abbrev=4 dir2 dir
diff --no-index --raw --no-abbrev dir2 dir

diff-tree --pretty --root --stat --compact-summary initial
diff-tree --pretty -R --root --stat --compact-summary initial
diff-tree --stat --compact-summary initial mode
diff-tree -R --stat --compact-summary initial mode
EOF

test_expect_success 'log -S requires an argument' '
	test_must_fail git log -S
'

test_expect_success 'diff --cached on unborn branch' '
	echo ref: refs/heads/unborn >.git/HEAD &&
	git diff --cached >result &&
	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached" result
'

test_expect_success 'diff --cached -- file on unborn branch' '
	git diff --cached -- file0 >result &&
	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result
'
test_expect_success 'diff --line-prefix with spaces' '
	git diff --line-prefix="| | | " --cached -- file0 >result &&
	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" result
'

test_expect_success 'diff-tree --stdin with log formatting' '
	cat >expect <<-\EOF &&
	Side
	Third
	Second
	EOF
	git rev-list master | git diff-tree --stdin --format=%s -s >actual &&
	test_cmp expect actual
'

test_done
Commit	Line	Data
3c2f75b5 JH	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2006 Junio C Hamano
	4	#
	5
	6	test_description='Various diff formatting options'
	7
	8	. ./test-lib.sh
	9
a40d384c JH	10	LF='
	11	'
	12
3c2f75b5 JH	13	test_expect_success setup '
	14
	15	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
	16	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
	17	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	18
	19	mkdir dir &&
3cb56738	20	mkdir dir2 &&
3c2f75b5 JH	21	for i in 1 2 3; do echo $i; done >file0 &&
	22	for i in A B; do echo $i; done >dir/sub &&
	23	cat file0 >file2 &&
	24	git add file0 file2 dir/sub &&
	25	git commit -m Initial &&
	26
	27	git branch initial &&
	28	git branch side &&
	29
	30	GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
	31	GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
	32	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	33
	34	for i in 4 5 6; do echo $i; done >>file0 &&
	35	for i in C D; do echo $i; done >>dir/sub &&
	36	rm -f file2 &&
	37	git update-index --remove file0 file2 dir/sub &&
a40d384c	38	git commit -m "Second${LF}${LF}This is the second commit." &&
3c2f75b5 JH	39
	40	GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
	41	GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
	42	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	43
	44	for i in A B C; do echo $i; done >file1 &&
	45	git add file1 &&
	46	for i in E F; do echo $i; done >>dir/sub &&
	47	git update-index dir/sub &&
	48	git commit -m Third &&
	49
	50	GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
	51	GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
	52	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	53
	54	git checkout side &&
	55	for i in A B C; do echo $i; done >>file0 &&
	56	for i in 1 2; do echo $i; done >>dir/sub &&
	57	cat dir/sub >file3 &&
	58	git add file3 &&
	59	git update-index file0 dir/sub &&
	60	git commit -m Side &&
	61
	62	GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
	63	GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
	64	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	65
	66	git checkout master &&
	67	git pull -s ours . side &&
	68
	69	GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
	70	GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
	71	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	72
	73	for i in A B C; do echo $i; done >>file0 &&
	74	for i in 1 2; do echo $i; done >>dir/sub &&
	75	git update-index file0 dir/sub &&
	76
d61027b2 MS	77	mkdir dir3 &&
d61027b2 MS	78	cp dir/sub dir3/sub &&
0e496492	79	test-tool chmtime +1 dir3/sub &&
d61027b2	80
e0d10e1c	81	git config log.showroot false &&
8ff99e74	82	git commit --amend &&
204f01a2 JH	83
	84	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
	85	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
	86	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	87	git checkout -b rearrange initial &&
	88	for i in B A; do echo $i; done >dir/sub &&
	89	git add dir/sub &&
	90	git commit -m "Rearranged lines in dir/sub" &&
	91	git checkout master &&
	92
58aaced4 SB	93	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
	94	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
	95	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	96	git checkout -b mode initial &&
	97	git update-index --chmod=+x file0 &&
	98	git commit -m "update mode" &&
	99	git checkout -f master &&
	100
5404c116 MM	101	git config diff.renames false &&
5404c116 MM	102
3c2f75b5 JH	103	git show-branch
	104	'
	105
	106	: <<\EOF
	107	! [initial] Initial
	108	* [master] Merge branch 'side'
204f01a2 JH	109	! [rearrange] Rearranged lines in dir/sub
	110	! [side] Side
	111	----
	112	+ [rearrange] Rearranged lines in dir/sub
	113	- [master] Merge branch 'side'
	114	* + [side] Side
	115	* [master^] Third
	116	* [master~2] Second
	117	+*++ [initial] Initial
3c2f75b5 JH	118	EOF
3c2f75b5 JH	119
4ff03347	120	V=$(git version \| sed -e 's/^git version //' -e 's/\./\\./g')
b4c02c30	121	while read magic cmd
3c2f75b5	122	do
b4c02c30 AR	123	case "$magic" in
	124	'' \| '#'*)
	125	continue ;;
	126	:*)
	127	magic=${magic#:}
	128	label="$magic-$cmd"
	129	case "$magic" in
	130	noellipses) ;;
	131	*)
165293af	132	BUG "unknown magic $magic" ;;
b4c02c30 AR	133	esac ;;
	134	*)
	135	cmd="$magic $cmd" magic=
	136	label="$cmd" ;;
3c2f75b5	137	esac
b4c02c30	138	test=$(echo "$label" \| sed -e 's\|[/ ][/ ]*\|_\|g')
4ff03347	139	pfx=$(printf "%04d" $test_count)
bfdbee98	140	expect="$TEST_DIRECTORY/t4013/diff.$test"
3c2f75b5 JH	141	actual="$pfx-diff.$test"
3c2f75b5 JH	142
de231e57	143	test_expect_success "git $cmd # magic is ${magic:-(not used)}" '
3c2f75b5	144	{
b4c02c30 AR	145	echo "$ git $cmd"
	146	case "$magic" in
	147	"")
	148	GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
	149	noellipses)
	150	git $cmd ;;
	151	esac \|
6c7f4ceb	152	sed -e "s/^\\(-\\)$V\\(-\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
33ee4cfb	153	-e "s/^\\(.mixed; boundary=\"-\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
3c2f75b5 JH	154	echo "\$"
	155	} >"$actual" &&
	156	if test -f "$expect"
	157	then
6dd88832 JN	158	case $cmd in
	159	format-patch \| -stat)
	160	test_i18ncmp "$expect" "$actual";;
	161	*)
	162	test_cmp "$expect" "$actual";;
	163	esac &&
3c2f75b5 JH	164	rm -f "$actual"
	165	else
	166	# this is to help developing new tests.
	167	cp "$actual" "$expect"
	168	false
	169	fi
	170	'
	171	done <<\EOF
	172	diff-tree initial
	173	diff-tree -r initial
	174	diff-tree -r --abbrev initial
	175	diff-tree -r --abbrev=4 initial
	176	diff-tree --root initial
	177	diff-tree --root --abbrev initial
c2f1d398	178	:noellipses diff-tree --root --abbrev initial
3c2f75b5 JH	179	diff-tree --root -r initial
3c2f75b5 JH	180	diff-tree --root -r --abbrev initial
c2f1d398	181	:noellipses diff-tree --root -r --abbrev initial
3c2f75b5	182	diff-tree --root -r --abbrev=4 initial
c2f1d398	183	:noellipses diff-tree --root -r --abbrev=4 initial
3c2f75b5 JH	184	diff-tree -p initial
	185	diff-tree --root -p initial
	186	diff-tree --patch-with-stat initial
	187	diff-tree --root --patch-with-stat initial
	188	diff-tree --patch-with-raw initial
	189	diff-tree --root --patch-with-raw initial
	190
	191	diff-tree --pretty initial
	192	diff-tree --pretty --root initial
	193	diff-tree --pretty -p initial
	194	diff-tree --pretty --stat initial
	195	diff-tree --pretty --summary initial
	196	diff-tree --pretty --stat --summary initial
	197	diff-tree --pretty --root -p initial
	198	diff-tree --pretty --root --stat initial
026625e7 JH	199	# improved by Timo's patch
	200	diff-tree --pretty --root --summary initial
	201	# improved by Timo's patch
	202	diff-tree --pretty --root --summary -r initial
3c2f75b5 JH	203	diff-tree --pretty --root --stat --summary initial
	204	diff-tree --pretty --patch-with-stat initial
	205	diff-tree --pretty --root --patch-with-stat initial
	206	diff-tree --pretty --patch-with-raw initial
	207	diff-tree --pretty --root --patch-with-raw initial
	208
	209	diff-tree --pretty=oneline initial
	210	diff-tree --pretty=oneline --root initial
	211	diff-tree --pretty=oneline -p initial
	212	diff-tree --pretty=oneline --root -p initial
	213	diff-tree --pretty=oneline --patch-with-stat initial
026625e7	214	# improved by Timo's patch
3c2f75b5 JH	215	diff-tree --pretty=oneline --root --patch-with-stat initial
	216	diff-tree --pretty=oneline --patch-with-raw initial
	217	diff-tree --pretty=oneline --root --patch-with-raw initial
	218
	219	diff-tree --pretty side
	220	diff-tree --pretty -p side
	221	diff-tree --pretty --patch-with-stat side
	222
58aaced4 SB	223	diff-tree initial mode
	224	diff-tree --stat initial mode
	225	diff-tree --summary initial mode
	226
3c2f75b5 JH	227	diff-tree master
	228	diff-tree -p master
	229	diff-tree -p -m master
	230	diff-tree -c master
	231	diff-tree -c --abbrev master
c2f1d398	232	:noellipses diff-tree -c --abbrev master
3c2f75b5	233	diff-tree --cc master
47979d5d JH	234	# stat only should show the diffstat with the first parent
	235	diff-tree -c --stat master
	236	diff-tree --cc --stat master
	237	diff-tree -c --stat --summary master
	238	diff-tree --cc --stat --summary master
	239	# stat summary should show the diffstat and summary with the first parent
	240	diff-tree -c --stat --summary side
	241	diff-tree --cc --stat --summary side
026625e7 JH	242	# improved by Timo's patch
	243	diff-tree --cc --patch-with-stat master
	244	# improved by Timo's patch
47979d5d JH	245	diff-tree --cc --patch-with-stat --summary master
	246	# this is correct
	247	diff-tree --cc --patch-with-stat --summary side
3c2f75b5 JH	248
	249	log master
	250	log -p master
	251	log --root master
	252	log --root -p master
	253	log --patch-with-stat master
	254	log --root --patch-with-stat master
47979d5d	255	log --root --patch-with-stat --summary master
026625e7	256	# improved by Timo's patch
47979d5d	257	log --root -c --patch-with-stat --summary master
026625e7	258	# improved by Timo's patch
47979d5d	259	log --root --cc --patch-with-stat --summary master
126f431a JH	260	log -p --first-parent master
	261	log -m -p --first-parent master
	262	log -m -p master
3c2f75b5	263	log -SF master
dea007fb	264	log -S F master
47979d5d	265	log -SF -p master
251df09b MM	266	log -SF master --max-count=0
	267	log -SF master --max-count=1
	268	log -SF master --max-count=2
bf1dfc31 JH	269	log -GF master
	270	log -GF -p master
	271	log -GF -p --pickaxe-all master
28fd76bd	272	log --decorate --all
33e7018c	273	log --decorate=full --all
3c2f75b5	274
fcbc6efc TR	275	rev-list --parents HEAD
fcbc6efc TR	276	rev-list --children HEAD
3c2f75b5 JH	277
3c2f75b5 JH	278	whatchanged master
c2f1d398	279	:noellipses whatchanged master
3c2f75b5 JH	280	whatchanged -p master
3c2f75b5 JH	281	whatchanged --root master
c2f1d398	282	:noellipses whatchanged --root master
3c2f75b5 JH	283	whatchanged --root -p master
	284	whatchanged --patch-with-stat master
	285	whatchanged --root --patch-with-stat master
	286	whatchanged --root --patch-with-stat --summary master
026625e7	287	# improved by Timo's patch
47979d5d	288	whatchanged --root -c --patch-with-stat --summary master
026625e7	289	# improved by Timo's patch
47979d5d	290	whatchanged --root --cc --patch-with-stat --summary master
3c2f75b5	291	whatchanged -SF master
c2f1d398	292	:noellipses whatchanged -SF master
47979d5d	293	whatchanged -SF -p master
3c2f75b5 JH	294
	295	log --patch-with-stat master -- dir/
	296	whatchanged --patch-with-stat master -- dir/
47979d5d JH	297	log --patch-with-stat --summary master -- dir/
47979d5d JH	298	whatchanged --patch-with-stat --summary master -- dir/
3c2f75b5 JH	299
	300	show initial
	301	show --root initial
	302	show side
	303	show master
b4490059	304	show -c master
2bf65873 JH	305	show -m master
2bf65873 JH	306	show --first-parent master
3c2f75b5 JH	307	show --stat side
	308	show --stat --summary side
	309	show --patch-with-stat side
	310	show --patch-with-raw side
c2f1d398	311	:noellipses show --patch-with-raw side
3c2f75b5 JH	312	show --patch-with-stat --summary side
3c2f75b5 JH	313
d410e43b JH	314	format-patch --stdout initial..side
	315	format-patch --stdout initial..master^
	316	format-patch --stdout initial..master
a567fdcb BG	317	format-patch --stdout --no-numbered initial..master
a567fdcb BG	318	format-patch --stdout --numbered initial..master
d410e43b	319	format-patch --attach --stdout initial..side
108dab28	320	format-patch --attach --stdout --suffix=.diff initial..side
d410e43b JH	321	format-patch --attach --stdout initial..master^
d410e43b JH	322	format-patch --attach --stdout initial..master
c112f689 JS	323	format-patch --inline --stdout initial..side
c112f689 JS	324	format-patch --inline --stdout initial..master^
747e2505	325	format-patch --inline --stdout --numbered-files initial..master
a567fdcb	326	format-patch --inline --stdout initial..master
171ddd91	327	format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
dbd21447 AR	328	config format.subjectprefix DIFFERENT_PREFIX
dbd21447 AR	329	format-patch --inline --stdout initial..master^^
a5a27c79	330	format-patch --stdout --cover-letter -n initial..master^
d410e43b	331
b319b02e JH	332	diff --abbrev initial..side
	333	diff -r initial..side
	334	diff --stat initial..side
	335	diff -r --stat initial..side
	336	diff initial..side
	337	diff --patch-with-stat initial..side
	338	diff --patch-with-raw initial..side
c2f1d398	339	:noellipses diff --patch-with-raw initial..side
b319b02e JH	340	diff --patch-with-stat -r initial..side
b319b02e JH	341	diff --patch-with-raw -r initial..side
c2f1d398	342	:noellipses diff --patch-with-raw -r initial..side
3cb56738	343	diff --name-status dir2 dir
0569e9b8	344	diff --no-index --name-status dir2 dir
e423ffd8	345	diff --no-index --name-status -- dir2 dir
d61027b2	346	diff --no-index dir dir3
b75271d9	347	diff master master^ side
660e113c JK	348	# Can't use spaces...
660e113c JK	349	diff --line-prefix=abc master master^ side
f37bfb7a	350	diff --dirstat master~1 master~2
204f01a2	351	diff --dirstat initial rearrange
0133dab7	352	diff --dirstat-by-file initial rearrange
43d1948b JB	353	# No-index --abbrev and --no-abbrev
43d1948b JB	354	diff --raw initial
c2f1d398	355	:noellipses diff --raw initial
43d1948b	356	diff --raw --abbrev=4 initial
c2f1d398	357	:noellipses diff --raw --abbrev=4 initial
43d1948b JB	358	diff --raw --no-abbrev initial
43d1948b JB	359	diff --no-index --raw dir2 dir
c2f1d398	360	:noellipses diff --no-index --raw dir2 dir
43d1948b	361	diff --no-index --raw --abbrev=4 dir2 dir
c2f1d398	362	:noellipses diff --no-index --raw --abbrev=4 dir2 dir
43d1948b	363	diff --no-index --raw --no-abbrev dir2 dir
ddf88fa6 NTND	364
	365	diff-tree --pretty --root --stat --compact-summary initial
	366	diff-tree --pretty -R --root --stat --compact-summary initial
	367	diff-tree --stat --compact-summary initial mode
	368	diff-tree -R --stat --compact-summary initial mode
3c2f75b5 JH	369	EOF
3c2f75b5 JH	370
dea007fb MM	371	test_expect_success 'log -S requires an argument' '
	372	test_must_fail git log -S
	373	'
	374
a2b7a3b3 NTND	375	test_expect_success 'diff --cached on unborn branch' '
	376	echo ref: refs/heads/unborn >.git/HEAD &&
	377	git diff --cached >result &&
	378	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached" result
	379	'
	380
	381	test_expect_success 'diff --cached -- file on unborn branch' '
	382	git diff --cached -- file0 >result &&
	383	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result
	384	'
660e113c JK	385	test_expect_success 'diff --line-prefix with spaces' '
	386	git diff --line-prefix="\| \| \| " --cached -- file0 >result &&
	387	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" result
	388	'
a2b7a3b3	389
d299e9e5 JK	390	test_expect_success 'diff-tree --stdin with log formatting' '
	391	cat >expect <<-\EOF &&
	392	Side
	393	Third
	394	Second
	395	EOF
	396	git rev-list master \| git diff-tree --stdin --format=%s -s >actual &&
	397	test_cmp expect actual
	398	'
	399
3c2f75b5	400	test_done