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

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

test_description='Various diff formatting options'

GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.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'
  ! [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

process_diffs () {
	perl -e '
		my $oid_length = length($ARGV[0]);
		my $x40 = "[0-9a-f]{40}";
		my $xab = "[0-9a-f]{4,16}";
		my $orx = "[0-9a-f]" x $oid_length;

		sub munge_oid {
			my ($oid) = @_;
			my $x;

			return "" unless length $oid;

			if ($oid =~ /^(100644|100755|120000)$/) {
				return $oid;
			}

			if ($oid =~ /^0*$/) {
				$x = "0";
			} else {
				$x = "f";
			}

			if (length($oid) == 40) {
				return $x x $oid_length;
			} else {
				return $x x length($oid);
			}
		}

		while (<STDIN>) {
			s/($orx)/munge_oid($1)/ge;
			s/From ($x40)( |\))/"From " . munge_oid($1) . $2/ge;
			s/commit ($x40)($| \(from )($x40?)/"commit " .  munge_oid($1) . $2 . munge_oid($3)/ge;
			s/\b($x40)( |\.\.|$)/munge_oid($1) . $2/ge;
			s/^($x40)($| )/munge_oid($1) . $2/e;
			s/($xab)(\.\.|,| |\.\.\.|$)/munge_oid($1) . $2/ge;
			print;
		}
	' "$ZERO_OID" <"$1"
}

V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g')
while read magic cmd
do
	status=success
	case "$magic" in
	'' | '#'*)
		continue ;;
	:*)
		magic=${magic#:}
		label="$magic-$cmd"
		case "$magic" in
		noellipses) ;;
		failure)
			status=failure
			magic=
			label="$cmd" ;;
		*)
			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_$status "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_cmp 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 --root -p --abbrev=10 initial
diff-tree --root -p --full-index initial
diff-tree --root -p --full-index --abbrev=10 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 -m 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 -p --diff-merges=first-parent master
log --diff-merges=first-parent master
log -m -p --first-parent master
log -m -p master
log --cc -m -p master
log -c -m -p master
log -m --raw master
log -m --stat 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 -IA -IB -I1 -I2 -p 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 -m matches log -m -p' '
	git log -m -p master >result &&
	process_diffs result >expected &&
	git log -m >result &&
	process_diffs result >actual &&
	test_cmp expected actual
'

test_expect_success 'log --diff-merges=on matches --diff-merges=separate' '
	git log -p --diff-merges=separate master >result &&
	process_diffs result >expected &&
	git log -p --diff-merges=on master >result &&
	process_diffs result >actual &&
	test_cmp expected actual
'

test_expect_success 'deny wrong log.diffMerges config' '
	test_config log.diffMerges wrong-value &&
	test_expect_code 128 git log
'

test_expect_success 'git config log.diffMerges first-parent' '
	git log -p --diff-merges=first-parent master >result &&
	process_diffs result >expected &&
	test_config log.diffMerges first-parent &&
	git log -p --diff-merges=on master >result &&
	process_diffs result >actual &&
	test_cmp expected actual
'

test_expect_success 'git config log.diffMerges first-parent vs -m' '
	git log -p --diff-merges=first-parent master >result &&
	process_diffs result >expected &&
	test_config log.diffMerges first-parent &&
	git log -p -m master >result &&
	process_diffs result >actual &&
	test_cmp expected actual
'

# -m in "git diff-index" means "match missing", that differs
# from its meaning in "git diff". Let's check it in diff-index.
# The line in the output for removed file should disappear when
# we provide -m in diff-index.
test_expect_success 'git diff-index -m' '
	rm -f file1 &&
	git diff-index HEAD >without-m &&
	lines_count=$(wc -l <without-m) &&
	git diff-index -m HEAD >with-m &&
	git restore file1 &&
	test_line_count = $((lines_count - 1)) with-m
'

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_expect_success 'diff -I<regex>: setup' '
	git checkout master &&
	test_seq 50 >file0 &&
	git commit -m "Set up -I<regex> test file" file0 &&
	test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
	echo >>file0
'
test_expect_success 'diff -I<regex>' '
	git diff --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
	cat >expect <<-\EOF &&
	diff --git a/file0 b/file0
	--- a/file0
	+++ b/file0
	@@ -34,7 +31,6 @@
	 34
	 35
	 36
	-37
	 38
	 39
	 40
	EOF
	compare_diff_patch expect actual
'

test_expect_success 'diff -I<regex> --stat' '
	git diff --stat --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
	cat >expect <<-\EOF &&
	 file0 | 1 -
	 1 file changed, 1 deletion(-)
	EOF
	test_cmp expect actual
'

test_expect_success 'diff -I<regex>: detect malformed regex' '
	test_expect_code 129 git diff --ignore-matching-lines="^[124-9" 2>error &&
	test_i18ngrep "invalid regex given to -I: " error
'

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
334afbc7 JS	8	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
	9	export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
	10
3c2f75b5	11	. ./test-lib.sh
ebd73f50	12	. "$TEST_DIRECTORY"/lib-diff.sh
3c2f75b5 JH	13
	14	test_expect_success setup '
	15
	16	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
	17	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
	18	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	19
	20	mkdir dir &&
3cb56738	21	mkdir dir2 &&
3c2f75b5 JH	22	for i in 1 2 3; do echo $i; done >file0 &&
	23	for i in A B; do echo $i; done >dir/sub &&
	24	cat file0 >file2 &&
	25	git add file0 file2 dir/sub &&
	26	git commit -m Initial &&
	27
	28	git branch initial &&
	29	git branch side &&
	30
	31	GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
	32	GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
	33	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	34
	35	for i in 4 5 6; do echo $i; done >>file0 &&
	36	for i in C D; do echo $i; done >>dir/sub &&
	37	rm -f file2 &&
	38	git update-index --remove file0 file2 dir/sub &&
a40d384c	39	git commit -m "Second${LF}${LF}This is the second commit." &&
3c2f75b5 JH	40
	41	GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
	42	GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
	43	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	44
	45	for i in A B C; do echo $i; done >file1 &&
	46	git add file1 &&
	47	for i in E F; do echo $i; done >>dir/sub &&
	48	git update-index dir/sub &&
	49	git commit -m Third &&
	50
	51	GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
	52	GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
	53	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	54
	55	git checkout side &&
	56	for i in A B C; do echo $i; done >>file0 &&
	57	for i in 1 2; do echo $i; done >>dir/sub &&
	58	cat dir/sub >file3 &&
	59	git add file3 &&
	60	git update-index file0 dir/sub &&
	61	git commit -m Side &&
	62
	63	GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
	64	GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
	65	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	66
	67	git checkout master &&
	68	git pull -s ours . side &&
	69
	70	GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
	71	GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
	72	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	73
	74	for i in A B C; do echo $i; done >>file0 &&
	75	for i in 1 2; do echo $i; done >>dir/sub &&
	76	git update-index file0 dir/sub &&
	77
d61027b2 MS	78	mkdir dir3 &&
d61027b2 MS	79	cp dir/sub dir3/sub &&
0e496492	80	test-tool chmtime +1 dir3/sub &&
d61027b2	81
e0d10e1c	82	git config log.showroot false &&
8ff99e74	83	git commit --amend &&
204f01a2 JH	84
	85	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
	86	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
	87	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	88	git checkout -b rearrange initial &&
	89	for i in B A; do echo $i; done >dir/sub &&
	90	git add dir/sub &&
	91	git commit -m "Rearranged lines in dir/sub" &&
	92	git checkout master &&
	93
58aaced4 SB	94	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
	95	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
	96	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	97	git checkout -b mode initial &&
	98	git update-index --chmod=+x file0 &&
	99	git commit -m "update mode" &&
	100	git checkout -f master &&
	101
5778b22b TB	102	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
	103	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
	104	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	105	git checkout -b note initial &&
	106	git update-index --chmod=+x file2 &&
	107	git commit -m "update mode (file2)" &&
	108	git notes add -m "note" &&
	109	git checkout -f master &&
	110
04b19fca JK	111	# Same merge as master, but with parents reversed. Hide it in a
	112	# pseudo-ref to avoid impacting tests with --all.
	113	commit=$(echo reverse \|
	114	git commit-tree -p master^2 -p master^1 master^{tree}) &&
	115	git update-ref REVERSE $commit &&
	116
5404c116 MM	117	git config diff.renames false &&
5404c116 MM	118
3c2f75b5 JH	119	git show-branch
	120	'
	121
	122	: <<\EOF
	123	! [initial] Initial
21531927	124	* [master] Merge branch 'side'
204f01a2 JH	125	! [rearrange] Rearranged lines in dir/sub
	126	! [side] Side
	127	----
	128	+ [rearrange] Rearranged lines in dir/sub
21531927	129	- [master] Merge branch 'side'
204f01a2 JH	130	* + [side] Side
	131	* [master^] Third
	132	* [master~2] Second
	133	+*++ [initial] Initial
3c2f75b5 JH	134	EOF
3c2f75b5 JH	135
72f936b1	136	process_diffs () {
fc7e73d7	137	perl -e '
	138	my $oid_length = length($ARGV[0]);
	139	my $x40 = "[0-9a-f]{40}";
	140	my $xab = "[0-9a-f]{4,16}";
	141	my $orx = "[0-9a-f]" x $oid_length;
	142
	143	sub munge_oid {
	144	my ($oid) = @_;
	145	my $x;
	146
	147	return "" unless length $oid;
	148
	149	if ($oid =~ /^(100644\|100755\|120000)$/) {
	150	return $oid;
	151	}
	152
	153	if ($oid =~ /^0*$/) {
	154	$x = "0";
	155	} else {
	156	$x = "f";
	157	}
	158
	159	if (length($oid) == 40) {
	160	return $x x $oid_length;
	161	} else {
	162	return $x x length($oid);
	163	}
	164	}
	165
	166	while (<STDIN>) {
	167	s/($orx)/munge_oid($1)/ge;
	168	s/From ($x40)( \|\))/"From " . munge_oid($1) . $2/ge;
	169	s/commit ($x40)($\| \(from )($x40?)/"commit " . munge_oid($1) . $2 . munge_oid($3)/ge;
	170	s/\b($x40)( \|\.\.\|$)/munge_oid($1) . $2/ge;
	171	s/^($x40)($\| )/munge_oid($1) . $2/e;
	172	s/($xab)(\.\.\|,\| \|\.\.\.\|$)/munge_oid($1) . $2/ge;
	173	print;
	174	}
	175	' "$ZERO_OID" <"$1"
72f936b1	176	}
72f936b1	177
4ff03347	178	V=$(git version \| sed -e 's/^git version //' -e 's/\./\\./g')
b4c02c30	179	while read magic cmd
3c2f75b5	180	do
14c14b44	181	status=success
b4c02c30 AR	182	case "$magic" in
	183	'' \| '#'*)
	184	continue ;;
	185	:*)
	186	magic=${magic#:}
	187	label="$magic-$cmd"
	188	case "$magic" in
	189	noellipses) ;;
14c14b44 SO	190	failure)
	191	status=failure
	192	magic=
	193	label="$cmd" ;;
b4c02c30	194	*)
165293af	195	BUG "unknown magic $magic" ;;
b4c02c30 AR	196	esac ;;
	197	*)
	198	cmd="$magic $cmd" magic=
	199	label="$cmd" ;;
3c2f75b5	200	esac
b4c02c30	201	test=$(echo "$label" \| sed -e 's\|[/ ][/ ]*\|_\|g')
4ff03347	202	pfx=$(printf "%04d" $test_count)
bfdbee98	203	expect="$TEST_DIRECTORY/t4013/diff.$test"
3c2f75b5 JH	204	actual="$pfx-diff.$test"
3c2f75b5 JH	205
14c14b44	206	test_expect_$status "git $cmd # magic is ${magic:-(not used)}" '
3c2f75b5	207	{
b4c02c30 AR	208	echo "$ git $cmd"
	209	case "$magic" in
	210	"")
	211	GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
	212	noellipses)
	213	git $cmd ;;
	214	esac \|
6c7f4ceb	215	sed -e "s/^\\(-\\)$V\\(-\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
33ee4cfb	216	-e "s/^\\(.mixed; boundary=\"-\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
3c2f75b5 JH	217	echo "\$"
	218	} >"$actual" &&
	219	if test -f "$expect"
	220	then
72f936b1	221	process_diffs "$actual" >actual &&
72f936b1	222	process_diffs "$expect" >expect &&
6dd88832 JN	223	case $cmd in
6dd88832 JN	224	format-patch \| -stat)
1108cea7	225	test_cmp expect actual;;
6dd88832	226	*)
72f936b1	227	test_cmp expect actual;;
6dd88832	228	esac &&
72f936b1	229	rm -f "$actual" actual expect
3c2f75b5 JH	230	else
	231	# this is to help developing new tests.
	232	cp "$actual" "$expect"
	233	false
	234	fi
	235	'
	236	done <<\EOF
	237	diff-tree initial
	238	diff-tree -r initial
	239	diff-tree -r --abbrev initial
	240	diff-tree -r --abbrev=4 initial
	241	diff-tree --root initial
	242	diff-tree --root --abbrev initial
c2f1d398	243	:noellipses diff-tree --root --abbrev initial
3c2f75b5 JH	244	diff-tree --root -r initial
3c2f75b5 JH	245	diff-tree --root -r --abbrev initial
c2f1d398	246	:noellipses diff-tree --root -r --abbrev initial
3c2f75b5	247	diff-tree --root -r --abbrev=4 initial
c2f1d398	248	:noellipses diff-tree --root -r --abbrev=4 initial
3c2f75b5 JH	249	diff-tree -p initial
3c2f75b5 JH	250	diff-tree --root -p initial
3046c7f6 ĐTCD	251	diff-tree --root -p --abbrev=10 initial
	252	diff-tree --root -p --full-index initial
	253	diff-tree --root -p --full-index --abbrev=10 initial
3c2f75b5 JH	254	diff-tree --patch-with-stat initial
	255	diff-tree --root --patch-with-stat initial
	256	diff-tree --patch-with-raw initial
	257	diff-tree --root --patch-with-raw initial
	258
	259	diff-tree --pretty initial
	260	diff-tree --pretty --root initial
	261	diff-tree --pretty -p initial
	262	diff-tree --pretty --stat initial
	263	diff-tree --pretty --summary initial
	264	diff-tree --pretty --stat --summary initial
	265	diff-tree --pretty --root -p initial
	266	diff-tree --pretty --root --stat initial
026625e7 JH	267	# improved by Timo's patch
	268	diff-tree --pretty --root --summary initial
	269	# improved by Timo's patch
	270	diff-tree --pretty --root --summary -r initial
3c2f75b5 JH	271	diff-tree --pretty --root --stat --summary initial
	272	diff-tree --pretty --patch-with-stat initial
	273	diff-tree --pretty --root --patch-with-stat initial
	274	diff-tree --pretty --patch-with-raw initial
	275	diff-tree --pretty --root --patch-with-raw initial
	276
	277	diff-tree --pretty=oneline initial
	278	diff-tree --pretty=oneline --root initial
	279	diff-tree --pretty=oneline -p initial
	280	diff-tree --pretty=oneline --root -p initial
	281	diff-tree --pretty=oneline --patch-with-stat initial
026625e7	282	# improved by Timo's patch
3c2f75b5 JH	283	diff-tree --pretty=oneline --root --patch-with-stat initial
	284	diff-tree --pretty=oneline --patch-with-raw initial
	285	diff-tree --pretty=oneline --root --patch-with-raw initial
	286
	287	diff-tree --pretty side
	288	diff-tree --pretty -p side
	289	diff-tree --pretty --patch-with-stat side
	290
58aaced4 SB	291	diff-tree initial mode
	292	diff-tree --stat initial mode
	293	diff-tree --summary initial mode
	294
3c2f75b5	295	diff-tree master
3ae7fe2b	296	diff-tree -m master
3c2f75b5 JH	297	diff-tree -p master
	298	diff-tree -p -m master
	299	diff-tree -c master
	300	diff-tree -c --abbrev master
c2f1d398	301	:noellipses diff-tree -c --abbrev master
3c2f75b5	302	diff-tree --cc master
47979d5d JH	303	# stat only should show the diffstat with the first parent
	304	diff-tree -c --stat master
	305	diff-tree --cc --stat master
	306	diff-tree -c --stat --summary master
	307	diff-tree --cc --stat --summary master
	308	# stat summary should show the diffstat and summary with the first parent
	309	diff-tree -c --stat --summary side
	310	diff-tree --cc --stat --summary side
8290faa0	311	diff-tree --cc --shortstat master
04b19fca	312	diff-tree --cc --summary REVERSE
026625e7 JH	313	# improved by Timo's patch
	314	diff-tree --cc --patch-with-stat master
	315	# improved by Timo's patch
47979d5d JH	316	diff-tree --cc --patch-with-stat --summary master
	317	# this is correct
	318	diff-tree --cc --patch-with-stat --summary side
3c2f75b5 JH	319
	320	log master
	321	log -p master
	322	log --root master
	323	log --root -p master
	324	log --patch-with-stat master
	325	log --root --patch-with-stat master
47979d5d	326	log --root --patch-with-stat --summary master
026625e7	327	# improved by Timo's patch
47979d5d	328	log --root -c --patch-with-stat --summary master
026625e7	329	# improved by Timo's patch
47979d5d	330	log --root --cc --patch-with-stat --summary master
6fae74b4	331	log --no-diff-merges -p --first-parent master
298889d3 SO	332	log --diff-merges=off -p --first-parent master
298889d3 SO	333	log --first-parent --diff-merges=off -p master
126f431a	334	log -p --first-parent master
af04d8f1 SO	335	log -p --diff-merges=first-parent master
af04d8f1 SO	336	log --diff-merges=first-parent master
126f431a JH	337	log -m -p --first-parent master
126f431a JH	338	log -m -p master
6fc944d8 SO	339	log --cc -m -p master
6fc944d8 SO	340	log -c -m -p master
48229c19	341	log -m --raw master
faf16d4e	342	log -m --stat master
3c2f75b5	343	log -SF master
dea007fb	344	log -S F master
47979d5d	345	log -SF -p master
251df09b MM	346	log -SF master --max-count=0
	347	log -SF master --max-count=1
	348	log -SF master --max-count=2
bf1dfc31 JH	349	log -GF master
	350	log -GF -p master
	351	log -GF -p --pickaxe-all master
296d4a94	352	log -IA -IB -I1 -I2 -p master
28fd76bd	353	log --decorate --all
33e7018c	354	log --decorate=full --all
3c2f75b5	355
fcbc6efc TR	356	rev-list --parents HEAD
fcbc6efc TR	357	rev-list --children HEAD
3c2f75b5 JH	358
3c2f75b5 JH	359	whatchanged master
c2f1d398	360	:noellipses whatchanged master
3c2f75b5 JH	361	whatchanged -p master
3c2f75b5 JH	362	whatchanged --root master
c2f1d398	363	:noellipses whatchanged --root master
3c2f75b5 JH	364	whatchanged --root -p master
	365	whatchanged --patch-with-stat master
	366	whatchanged --root --patch-with-stat master
	367	whatchanged --root --patch-with-stat --summary master
026625e7	368	# improved by Timo's patch
47979d5d	369	whatchanged --root -c --patch-with-stat --summary master
026625e7	370	# improved by Timo's patch
47979d5d	371	whatchanged --root --cc --patch-with-stat --summary master
3c2f75b5	372	whatchanged -SF master
c2f1d398	373	:noellipses whatchanged -SF master
47979d5d	374	whatchanged -SF -p master
3c2f75b5 JH	375
	376	log --patch-with-stat master -- dir/
	377	whatchanged --patch-with-stat master -- dir/
47979d5d JH	378	log --patch-with-stat --summary master -- dir/
47979d5d JH	379	whatchanged --patch-with-stat --summary master -- dir/
3c2f75b5 JH	380
	381	show initial
	382	show --root initial
	383	show side
	384	show master
b4490059	385	show -c master
2bf65873 JH	386	show -m master
2bf65873 JH	387	show --first-parent master
3c2f75b5 JH	388	show --stat side
	389	show --stat --summary side
	390	show --patch-with-stat side
	391	show --patch-with-raw side
c2f1d398	392	:noellipses show --patch-with-raw side
3c2f75b5 JH	393	show --patch-with-stat --summary side
3c2f75b5 JH	394
d410e43b JH	395	format-patch --stdout initial..side
	396	format-patch --stdout initial..master^
	397	format-patch --stdout initial..master
a567fdcb BG	398	format-patch --stdout --no-numbered initial..master
a567fdcb BG	399	format-patch --stdout --numbered initial..master
d410e43b	400	format-patch --attach --stdout initial..side
108dab28	401	format-patch --attach --stdout --suffix=.diff initial..side
d410e43b JH	402	format-patch --attach --stdout initial..master^
d410e43b JH	403	format-patch --attach --stdout initial..master
c112f689 JS	404	format-patch --inline --stdout initial..side
c112f689 JS	405	format-patch --inline --stdout initial..master^
747e2505	406	format-patch --inline --stdout --numbered-files initial..master
a567fdcb	407	format-patch --inline --stdout initial..master
171ddd91	408	format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
dbd21447 AR	409	config format.subjectprefix DIFFERENT_PREFIX
dbd21447 AR	410	format-patch --inline --stdout initial..master^^
a5a27c79	411	format-patch --stdout --cover-letter -n initial..master^
d410e43b	412
b319b02e	413	diff --abbrev initial..side
8ef05193 NTND	414	diff -U initial..side
8ef05193 NTND	415	diff -U1 initial..side
b319b02e JH	416	diff -r initial..side
	417	diff --stat initial..side
	418	diff -r --stat initial..side
	419	diff initial..side
	420	diff --patch-with-stat initial..side
	421	diff --patch-with-raw initial..side
c2f1d398	422	:noellipses diff --patch-with-raw initial..side
b319b02e JH	423	diff --patch-with-stat -r initial..side
b319b02e JH	424	diff --patch-with-raw -r initial..side
c2f1d398	425	:noellipses diff --patch-with-raw -r initial..side
3cb56738	426	diff --name-status dir2 dir
0569e9b8	427	diff --no-index --name-status dir2 dir
e423ffd8	428	diff --no-index --name-status -- dir2 dir
d61027b2	429	diff --no-index dir dir3
b75271d9	430	diff master master^ side
660e113c JK	431	# Can't use spaces...
660e113c JK	432	diff --line-prefix=abc master master^ side
f37bfb7a	433	diff --dirstat master~1 master~2
204f01a2	434	diff --dirstat initial rearrange
0133dab7	435	diff --dirstat-by-file initial rearrange
dac03b55	436	diff --dirstat --cc master~1 master
43d1948b JB	437	# No-index --abbrev and --no-abbrev
43d1948b JB	438	diff --raw initial
c2f1d398	439	:noellipses diff --raw initial
43d1948b	440	diff --raw --abbrev=4 initial
c2f1d398	441	:noellipses diff --raw --abbrev=4 initial
43d1948b JB	442	diff --raw --no-abbrev initial
43d1948b JB	443	diff --no-index --raw dir2 dir
c2f1d398	444	:noellipses diff --no-index --raw dir2 dir
43d1948b	445	diff --no-index --raw --abbrev=4 dir2 dir
c2f1d398	446	:noellipses diff --no-index --raw --abbrev=4 dir2 dir
43d1948b	447	diff --no-index --raw --no-abbrev dir2 dir
ddf88fa6 NTND	448
	449	diff-tree --pretty --root --stat --compact-summary initial
	450	diff-tree --pretty -R --root --stat --compact-summary initial
5778b22b TB	451	diff-tree --pretty note
	452	diff-tree --pretty --notes note
	453	diff-tree --format=%N note
ddf88fa6 NTND	454	diff-tree --stat --compact-summary initial mode
ddf88fa6 NTND	455	diff-tree -R --stat --compact-summary initial mode
3c2f75b5 JH	456	EOF
3c2f75b5 JH	457
f5bfcc82 SO	458	test_expect_success 'log -m matches log -m -p' '
f5bfcc82 SO	459	git log -m -p master >result &&
7a55fa0e SO	460	process_diffs result >expected &&
	461	git log -m >result &&
	462	process_diffs result >actual &&
	463	test_cmp expected actual
	464	'
	465
4320815e SO	466	test_expect_success 'log --diff-merges=on matches --diff-merges=separate' '
	467	git log -p --diff-merges=separate master >result &&
	468	process_diffs result >expected &&
	469	git log -p --diff-merges=on master >result &&
	470	process_diffs result >actual &&
17c13e60 SO	471	test_cmp expected actual
	472	'
	473
	474	test_expect_success 'deny wrong log.diffMerges config' '
	475	test_config log.diffMerges wrong-value &&
	476	test_expect_code 128 git log
	477	'
	478
	479	test_expect_success 'git config log.diffMerges first-parent' '
	480	git log -p --diff-merges=first-parent master >result &&
	481	process_diffs result >expected &&
	482	test_config log.diffMerges first-parent &&
	483	git log -p --diff-merges=on master >result &&
	484	process_diffs result >actual &&
	485	test_cmp expected actual
	486	'
	487
	488	test_expect_success 'git config log.diffMerges first-parent vs -m' '
	489	git log -p --diff-merges=first-parent master >result &&
	490	process_diffs result >expected &&
	491	test_config log.diffMerges first-parent &&
	492	git log -p -m master >result &&
	493	process_diffs result >actual &&
4320815e SO	494	test_cmp expected actual
	495	'
	496
e0b16421 SO	497	# -m in "git diff-index" means "match missing", that differs
	498	# from its meaning in "git diff". Let's check it in diff-index.
	499	# The line in the output for removed file should disappear when
	500	# we provide -m in diff-index.
	501	test_expect_success 'git diff-index -m' '
	502	rm -f file1 &&
	503	git diff-index HEAD >without-m &&
	504	lines_count=$(wc -l <without-m) &&
	505	git diff-index -m HEAD >with-m &&
	506	git restore file1 &&
	507	test_line_count = $((lines_count - 1)) with-m
	508	'
	509
dea007fb MM	510	test_expect_success 'log -S requires an argument' '
	511	test_must_fail git log -S
	512	'
	513
a2b7a3b3 NTND	514	test_expect_success 'diff --cached on unborn branch' '
	515	echo ref: refs/heads/unborn >.git/HEAD &&
	516	git diff --cached >result &&
72f936b1	517	process_diffs result >actual &&
	518	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached" >expected &&
	519	test_cmp expected actual
a2b7a3b3 NTND	520	'
	521
	522	test_expect_success 'diff --cached -- file on unborn branch' '
	523	git diff --cached -- file0 >result &&
72f936b1	524	process_diffs result >actual &&
	525	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" >expected &&
	526	test_cmp expected actual
a2b7a3b3	527	'
660e113c JK	528	test_expect_success 'diff --line-prefix with spaces' '
660e113c JK	529	git diff --line-prefix="\| \| \| " --cached -- file0 >result &&
72f936b1	530	process_diffs result >actual &&
	531	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" >expected &&
	532	test_cmp expected actual
660e113c	533	'
a2b7a3b3	534
d299e9e5 JK	535	test_expect_success 'diff-tree --stdin with log formatting' '
	536	cat >expect <<-\EOF &&
	537	Side
	538	Third
	539	Second
	540	EOF
	541	git rev-list master \| git diff-tree --stdin --format=%s -s >actual &&
	542	test_cmp expect actual
	543	'
	544
296d4a94 MK	545	test_expect_success 'diff -I<regex>: setup' '
	546	git checkout master &&
	547	test_seq 50 >file0 &&
	548	git commit -m "Set up -I<regex> test file" file0 &&
	549	test_seq 50 \| sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
	550	echo >>file0
	551	'
	552	test_expect_success 'diff -I<regex>' '
	553	git diff --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
	554	cat >expect <<-\EOF &&
	555	diff --git a/file0 b/file0
	556	--- a/file0
	557	+++ b/file0
	558	@@ -34,7 +31,6 @@
	559	34
	560	35
	561	36
	562	-37
	563	38
	564	39
	565	40
	566	EOF
	567	compare_diff_patch expect actual
	568	'
	569
	570	test_expect_success 'diff -I<regex> --stat' '
	571	git diff --stat --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
	572	cat >expect <<-\EOF &&
	573	file0 \| 1 -
	574	1 file changed, 1 deletion(-)
	575	EOF
	576	test_cmp expect actual
	577	'
	578
	579	test_expect_success 'diff -I<regex>: detect malformed regex' '
	580	test_expect_code 129 git diff --ignore-matching-lines="^[124-9" 2>error &&
	581	test_i18ngrep "invalid regex given to -I: " error
	582	'
	583
3c2f75b5	584	test_done