[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

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_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 note initial &&
	git update-index --chmod=+x file2 &&
	git commit -m "update mode (file2)" &&
	git notes add -m "note" &&
	git checkout -f master &&

	# Same merge as master, but with parents reversed. Hide it in a
	# pseudo-ref to avoid impacting tests with --all.
	commit=$(echo reverse |
		 git commit-tree -p master^2 -p master^1 master^{tree}) &&
	git update-ref REVERSE $commit &&

	git config diff.renames false &&

	git show-branch
'

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

process_diffs () {
	_x04="[0-9a-f][0-9a-f][0-9a-f][0-9a-f]" &&
	_x07="$_x05[0-9a-f][0-9a-f]" &&
	sed -e "s/$OID_REGEX/$ZERO_OID/g" \
	    -e "s/From $_x40 /From $ZERO_OID /" \
	    -e "s/from $_x40)/from $ZERO_OID)/" \
	    -e "s/commit $_x40\$/commit $ZERO_OID/" \
	    -e "s/commit $_x40 (/commit $ZERO_OID (/" \
	    -e "s/$_x40 $_x40 $_x40/$ZERO_OID $ZERO_OID $ZERO_OID/" \
	    -e "s/$_x40 $_x40 /$ZERO_OID $ZERO_OID /" \
	    -e "s/^$_x40 $_x40$/$ZERO_OID $ZERO_OID/" \
	    -e "s/^$_x40 /$ZERO_OID /" \
	    -e "s/^$_x40$/$ZERO_OID/" \
	    -e "s/$_x07\.\.$_x07/fffffff..fffffff/g" \
	    -e "s/$_x07,$_x07\.\.$_x07/fffffff,fffffff..fffffff/g" \
	    -e "s/$_x07 $_x07 $_x07/fffffff fffffff fffffff/g" \
	    -e "s/$_x07 $_x07 /fffffff fffffff /g" \
	    -e "s/Merge: $_x07 $_x07/Merge: fffffff fffffff/g" \
	    -e "s/$_x07\.\.\./fffffff.../g" \
	    -e "s/ $_x04\.\.\./ ffff.../g" \
	    -e "s/ $_x04/ ffff/g" \
	    "$1"
}

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
			process_diffs "$actual" >actual &&
			process_diffs "$expect" >expect &&
			case $cmd in
			*format-patch* | *-stat*)
				test_i18ncmp expect actual;;
			*)
				test_cmp expect actual;;
			esac &&
			rm -f "$actual" actual expect
		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
diff-tree --cc --shortstat master
diff-tree --cc --summary REVERSE
# 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 --no-diff-merges -p --first-parent master
log --diff-merges=off -p --first-parent master
log --first-parent --diff-merges=off -p 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 -U initial..side
diff -U1 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
diff --dirstat --cc master~1 master
# 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 --pretty note
diff-tree --pretty --notes note
diff-tree --format=%N note
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 &&
	process_diffs result >actual &&
	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached" >expected &&
	test_cmp expected actual
'

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

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