[thirdparty/git.git] / t / annotate-tests.sh

# This file isn't used as a test script directly, instead it is
# sourced from t8001-annotate.sh and t8002-blame.sh.

if test_have_prereq MINGW
then
  sanitize_L () {
	echo "$1" | sed 'sX\(^-L\|,\)\^\?/X&\\;*Xg'
  }
else
  sanitize_L () {
	echo "$1"
  }
fi

check_count () {
	head= &&
	file='file' &&
	options= &&
	while :
	do
		case "$1" in
		-h) head="$2"; shift; shift ;;
		-f) file="$2"; shift; shift ;;
		-L*) options="$options $(sanitize_L "$1")"; shift ;;
		-*) options="$options $1"; shift ;;
		*) break ;;
		esac
	done &&
	echo "$PROG $options $file $head" >&4 &&
	$PROG $options $file $head >actual &&
	perl -e '
		my %expect = (@ARGV);
		my %count = map { $_ => 0 } keys %expect;
		while (<STDIN>) {
			if (/^[0-9a-f]+\t\(([^\t]+)\t/) {
				my $author = $1;
				for ($author) { s/^\s*//; s/\s*$//; }
				$count{$author}++;
			}
		}
		my $bad = 0;
		while (my ($author, $count) = each %count) {
			my $ok;
			my $value = 0;
			$value = $expect{$author} if defined $expect{$author};
			if ($value != $count) {
				$bad = 1;
				$ok = "bad";
			}
			else {
				$ok = "good";
			}
			print STDERR "Author $author (expected $value, attributed $count) $ok\n";
		}
		exit($bad);
	' "$@" <actual
}

get_progress_result () {
	tr '\015' '\012' | tail -n 1
}

test_expect_success 'setup A lines' '
	echo "1A quick brown fox jumps over the" >file &&
	echo "lazy dog" >>file &&
	git add file &&
	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
	git commit -a -m "Initial."
'

test_expect_success 'blame 1 author' '
	check_count A 2
'

test_expect_success 'blame working copy' '
	test_when_finished "git restore file" &&
	echo "1A quick brown fox jumps over the" >file &&
	echo "another lazy dog" >>file &&
	check_count A 1 "Not Committed Yet" 1
'

test_expect_success 'blame with --contents' '
	check_count --contents=file A 2
'

test_expect_success 'blame with --contents in a bare repo' '
	git clone --bare . bare-contents.git &&
	(
		cd bare-contents.git &&
		echo "1A quick brown fox jumps over the" >contents &&
		check_count --contents=contents A 1
	)
'

test_expect_success 'blame with --contents changed' '
	echo "1A quick brown fox jumps over the" >contents &&
	echo "another lazy dog" >>contents &&
	check_count --contents=contents A 1 "External file (--contents)" 1
'

test_expect_success 'blame in a bare repo without starting commit' '
	git clone --bare . bare.git &&
	(
		cd bare.git &&
		check_count A 2
	)
'

test_expect_success 'blame by tag objects' '
	git tag -m "test tag" testTag &&
	git tag -m "test tag #2" testTag2 testTag &&
	check_count -h testTag A 2 &&
	check_count -h testTag2 A 2
'

test_expect_success 'setup B lines' '
	echo "2A quick brown fox jumps over the" >>file &&
	echo "lazy dog" >>file &&
	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
	git commit -a -m "Second."
'

test_expect_success 'blame 2 authors' '
	check_count A 2 B 2
'

test_expect_success 'blame with --contents and revision' '
	check_count -h testTag --contents=file A 2 "External file (--contents)" 2
'

test_expect_success 'setup B1 lines (branch1)' '
	git checkout -b branch1 main &&
	echo "3A slow green fox jumps into the" >>file &&
	echo "well." >>file &&
	GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
	git commit -a -m "Branch1-1"
'

test_expect_success 'blame 2 authors + 1 branch1 author' '
	check_count A 2 B 2 B1 2
'

test_expect_success 'setup B2 lines (branch2)' '
	git checkout -b branch2 main &&
	sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
	mv file.new file &&
	GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
	git commit -a -m "Branch2-1"
'

test_expect_success 'blame 2 authors + 1 branch2 author' '
	check_count A 2 B 1 B2 1
'

test_expect_success 'merge branch1 & branch2' '
	git merge branch1
'

test_expect_success 'blame 2 authors + 2 merged-in authors' '
	check_count A 2 B 1 B1 2 B2 1
'

test_expect_success 'blame --first-parent blames merge for branch1' '
	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
'

test_expect_success 'blame ancestor' '
	check_count -h main A 2 B 2
'

test_expect_success 'blame great-ancestor' '
	check_count -h main^ A 2
'

test_expect_success 'setup evil merge' '
	echo "evil merge." >>file &&
	git commit -a --amend
'

test_expect_success 'blame evil merge' '
	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
'

test_expect_success 'blame huge graft' '
	test_when_finished "git checkout branch2" &&
	test_when_finished "rm -rf .git/info" &&
	graft= &&
	for i in 0 1 2
	do
		for j in 0 1 2 3 4 5 6 7 8 9
		do
			git checkout --orphan "$i$j" &&
			printf "%s\n" "$i" "$j" >file &&
			test_tick &&
			GIT_AUTHOR_NAME=$i$j GIT_AUTHOR_EMAIL=$i$j@test.git \
			git commit -a -m "$i$j" &&
			commit=$(git rev-parse --verify HEAD) &&
			graft="$graft$commit " || return 1
		done
	done &&
	mkdir .git/info &&
	printf "%s " $graft >.git/info/grafts &&
	check_count -h 00 01 1 10 1
'

test_expect_success 'setup incomplete line' '
	echo "incomplete" | tr -d "\\012" >>file &&
	GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
	git commit -a -m "Incomplete"
'

test_expect_success 'blame incomplete line' '
	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
'

test_expect_success 'setup edits' '
	mv file file.orig &&
	{
		cat file.orig &&
		echo
	} | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" >file &&
	echo "incomplete" | tr -d "\\012" >>file &&
	GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
	git commit -a -m "edit"
'

test_expect_success 'blame edits' '
	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
'

test_expect_success 'setup obfuscated email' '
	echo "No robots allowed" >file.new &&
	cat file >>file.new &&
	mv file.new file &&
	GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
	git commit -a -m "norobots"
'

test_expect_success 'blame obfuscated email' '
	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
'

test_expect_success 'blame -L 1 (all)' '
	check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
'

test_expect_success 'blame -L , (all)' '
	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
'

test_expect_success 'blame -L X (X to end)' '
	check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
'

test_expect_success 'blame -L X, (X to end)' '
	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
'

test_expect_success 'blame -L ,Y (up to Y)' '
	check_count -L,3 A 1 B2 1 E 1
'

test_expect_success 'blame -L X,X' '
	check_count -L3,3 B2 1
'

test_expect_success 'blame -L X,Y' '
	check_count -L3,6 B 1 B1 1 B2 1 D 1
'

test_expect_success 'blame -L Y,X (undocumented)' '
	check_count -L6,3 B 1 B1 1 B2 1 D 1
'

test_expect_success 'blame -L -X' '
	test_must_fail $PROG -L-1 file
'

test_expect_success 'blame -L 0' '
	test_must_fail $PROG -L0 file
'

test_expect_success 'blame -L ,0' '
	test_must_fail $PROG -L,0 file
'

test_expect_success 'blame -L ,+0' '
	test_must_fail $PROG -L,+0 file
'

test_expect_success 'blame -L X,+0' '
	test_must_fail $PROG -L1,+0 file
'

test_expect_success 'blame -L X,+1' '
	check_count -L3,+1 B2 1
'

test_expect_success 'blame -L X,+N' '
	check_count -L3,+4 B 1 B1 1 B2 1 D 1
'

test_expect_success 'blame -L ,-0' '
	test_must_fail $PROG -L,-0 file
'

test_expect_success 'blame -L X,-0' '
	test_must_fail $PROG -L1,-0 file
'

test_expect_success 'blame -L X,-1' '
	check_count -L3,-1 B2 1
'

test_expect_success 'blame -L X,-N' '
	check_count -L6,-4 B 1 B1 1 B2 1 D 1
'

test_expect_success 'blame -L /RE/ (RE to end)' '
	check_count -L/evil/ C 1 "A U Thor" 1
'

test_expect_success 'blame -L /RE/,/RE2/' '
	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
'

test_expect_success 'blame -L X,/RE/' '
	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
'

test_expect_success 'blame -L /RE/,Y' '
	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
'

test_expect_success 'blame -L /RE/,+N' '
	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
'

test_expect_success 'blame -L /RE/,-N' '
	check_count -L/99/,-3 B 1 B2 1 D 1
'

# 'file' ends with an incomplete line, so 'wc' reports one fewer lines than
# git-blame sees, hence the last line is actually $(wc...)+1.
test_expect_success 'blame -L X (X == nlines)' '
	n=$(expr $(wc -l <file) + 1) &&
	check_count -L$n C 1
'

test_expect_success 'blame -L X (X == nlines + 1)' '
	n=$(expr $(wc -l <file) + 2) &&
	test_must_fail $PROG -L$n file
'

test_expect_success 'blame -L X (X > nlines)' '
	test_must_fail $PROG -L12345 file
'

test_expect_success 'blame -L ,Y (Y == nlines)' '
	n=$(expr $(wc -l <file) + 1) &&
	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
'

test_expect_success 'blame -L ,Y (Y == nlines + 1)' '
	n=$(expr $(wc -l <file) + 2) &&
	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
'

test_expect_success 'blame -L ,Y (Y > nlines)' '
	check_count -L,12345 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
'

test_expect_success 'blame -L multiple (disjoint)' '
	check_count -L2,3 -L6,7 A 1 B1 1 B2 1 "A U Thor" 1
'

test_expect_success 'blame -L multiple (disjoint: unordered)' '
	check_count -L6,7 -L2,3 A 1 B1 1 B2 1 "A U Thor" 1
'

test_expect_success 'blame -L multiple (adjacent)' '
	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
'

test_expect_success 'blame -L multiple (adjacent: unordered)' '
	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
'

test_expect_success 'blame -L multiple (overlapping)' '
	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
'

test_expect_success 'blame -L multiple (overlapping: unordered)' '
	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
'

test_expect_success 'blame -L multiple (superset/subset)' '
	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
'

test_expect_success 'blame -L multiple (superset/subset: unordered)' '
	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
'

test_expect_success 'blame -L /RE/ (relative)' '
	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
'

test_expect_success 'blame -L /RE/ (relative: no preceding range)' '
	check_count -L/dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
'

test_expect_success 'blame -L /RE/ (relative: adjacent)' '
	check_count -L1,1 -L/dog/,+1 A 1 E 1
'

test_expect_success 'blame -L /RE/ (relative: not found)' '
	test_must_fail $PROG -L4,4 -L/dog/ file
'

test_expect_success 'blame -L /RE/ (relative: end-of-file)' '
	test_must_fail $PROG -L, -L/$/ file
'

test_expect_success 'blame -L ^/RE/ (absolute)' '
	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
'

test_expect_success 'blame -L ^/RE/ (absolute: no preceding range)' '
	check_count -L^/dog/,+2 A 1 B2 1
'

test_expect_success 'blame -L ^/RE/ (absolute: not found)' '
	test_must_fail $PROG -L4,4 -L^/tambourine/ file
'

test_expect_success 'blame -L ^/RE/ (absolute: end-of-file)' '
	n=$(expr $(wc -l <file) + 1) &&
	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
'

test_expect_success 'setup -L :regex' '
	tr Q "\\t" >hello.c <<-\EOF &&
	int main(int argc, const char *argv[])
	{
	Qputs("hello");
	}
	EOF
	git add hello.c &&
	GIT_AUTHOR_NAME="F" GIT_AUTHOR_EMAIL="F@test.git" \
	git commit -m "hello" &&

	mv hello.c hello.orig &&
	sed -e "/}/ {x; s/$/Qputs(\"goodbye\");/; G;}" <hello.orig |
	tr Q "\\t" >hello.c &&
	GIT_AUTHOR_NAME="G" GIT_AUTHOR_EMAIL="G@test.git" \
	git commit -a -m "goodbye" &&

	mv hello.c hello.orig &&
	echo "#include <stdio.h>" >hello.c &&
	cat hello.orig >>hello.c &&
	tr Q "\\t" >>hello.c <<-\EOF &&
	void mail()
	{
	Qputs("mail");
	}
	EOF
	GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
	git commit -a -m "mail"
'

test_expect_success 'blame -L :literal' '
	check_count -f hello.c -L:main F 4 G 1
'

test_expect_success 'blame -L :regex' '
	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
'

test_expect_success 'blame -L :nomatch' '
	test_must_fail $PROG -L:nomatch hello.c
'

test_expect_success 'blame -L :RE (relative)' '
	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
'

test_expect_success 'blame -L :RE (relative: no preceding range)' '
	check_count -f hello.c -L:ma.. F 4 G 1
'

test_expect_success 'blame -L :RE (relative: not found)' '
	test_must_fail $PROG -L3,3 -L:tambourine hello.c
'

test_expect_success 'blame -L :RE (relative: end-of-file)' '
	test_must_fail $PROG -L, -L:main hello.c
'

test_expect_success 'blame -L ^:RE (absolute)' '
	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
'

test_expect_success 'blame -L ^:RE (absolute: no preceding range)' '
	check_count -f hello.c -L^:ma.. F 4 G 1
'

test_expect_success 'blame -L ^:RE (absolute: not found)' '
	test_must_fail $PROG -L4,4 -L^:tambourine hello.c
'

test_expect_success 'blame -L ^:RE (absolute: end-of-file)' '
	n=$(printf "%d" $(wc -l <hello.c)) &&
	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
'

test_expect_success 'blame -L :funcname with userdiff driver' '
	cat >file.template <<-\EOF &&
	DO NOT MATCH THIS LINE
	function RIGHT(a, b) result(c)
	AS THE DEFAULT DRIVER WOULD

	integer, intent(in) :: ChangeMe
	EOF

	fortran_file=file.f03 &&
	test_when_finished "rm .gitattributes" &&
	echo "$fortran_file diff=fortran" >.gitattributes &&

	test_commit --author "A <A@test.git>" \
		"add" "$fortran_file" \
		"$(cat file.template)" &&
	test_commit --author "B <B@test.git>" \
		"change" "$fortran_file" \
		"$(sed -e s/ChangeMe/IWasChanged/ file.template)" &&
	check_count -f "$fortran_file" -L:RIGHT A 3 B 1
'

test_expect_success 'setup incremental' '
	(
	GIT_AUTHOR_NAME=I &&
	export GIT_AUTHOR_NAME &&
	GIT_AUTHOR_EMAIL=I@test.git &&
	export GIT_AUTHOR_EMAIL &&
	>incremental &&
	git add incremental &&
	git commit -m "step 0" &&
	printf "partial" >>incremental &&
	git commit -a -m "step 0.5" &&
	echo >>incremental &&
	git commit -a -m "step 1"
	)
'

test_expect_success 'blame empty' '
	check_count -h HEAD^^ -f incremental
'

test_expect_success 'blame -L 0 empty' '
	test_must_fail $PROG -L0 incremental HEAD^^
'

test_expect_success 'blame -L 1 empty' '
	test_must_fail $PROG -L1 incremental HEAD^^
'

test_expect_success 'blame -L 2 empty' '
	test_must_fail $PROG -L2 incremental HEAD^^
'

test_expect_success 'blame half' '
	check_count -h HEAD^ -f incremental I 1
'

test_expect_success 'blame -L 0 half' '
	test_must_fail $PROG -L0 incremental HEAD^
'

test_expect_success 'blame -L 1 half' '
	check_count -h HEAD^ -f incremental -L1 I 1
'

test_expect_success 'blame -L 2 half' '
	test_must_fail $PROG -L2 incremental HEAD^
'

test_expect_success 'blame -L 3 half' '
	test_must_fail $PROG -L3 incremental HEAD^
'

test_expect_success 'blame full' '
	check_count -f incremental I 1
'

test_expect_success 'blame -L 0 full' '
	test_must_fail $PROG -L0 incremental
'

test_expect_success 'blame -L 1 full' '
	check_count -f incremental -L1 I 1
'

test_expect_success 'blame -L 2 full' '
	test_must_fail $PROG -L2 incremental
'

test_expect_success 'blame -L 3 full' '
	test_must_fail $PROG -L3 incremental
'

test_expect_success 'blame -L' '
	test_must_fail $PROG -L file
'

test_expect_success 'blame -L X,+' '
	test_must_fail $PROG -L1,+ file
'

test_expect_success 'blame -L X,-' '
	test_must_fail $PROG -L1,- file
'

test_expect_success 'blame -L X (non-numeric X)' '
	test_must_fail $PROG -LX file
'

test_expect_success 'blame -L X,Y (non-numeric Y)' '
	test_must_fail $PROG -L1,Y file
'

test_expect_success 'blame -L X,+N (non-numeric N)' '
	test_must_fail $PROG -L1,+N file
'

test_expect_success 'blame -L X,-N (non-numeric N)' '
	test_must_fail $PROG -L1,-N file
'

test_expect_success 'blame -L ,^/RE/' '
	test_must_fail $PROG -L1,^/99/ file
'

test_expect_success 'blame progress on a full file' '
	cat >expect <<-\EOF &&
	Blaming lines: 100% (10/10), done.
	EOF

	GIT_PROGRESS_DELAY=0 \
	git blame --progress hello.c 2>stderr &&

	get_progress_result <stderr >actual &&
	test_cmp expect actual
'

test_expect_success 'blame progress on a single range' '
	cat >expect <<-\EOF &&
	Blaming lines: 100% (4/4), done.
	EOF

	GIT_PROGRESS_DELAY=0 \
	git blame --progress -L 3,6 hello.c 2>stderr &&

	get_progress_result <stderr >actual &&
	test_cmp expect actual
'

test_expect_success 'blame progress on multiple ranges' '
	cat >expect <<-\EOF &&
	Blaming lines: 100% (7/7), done.
	EOF

	GIT_PROGRESS_DELAY=0 \
	git blame --progress -L 3,6 -L 8,10 hello.c 2>stderr &&

	get_progress_result <stderr >actual &&
	test_cmp expect actual
'
Commit	Line	Data
8752d11d	1	# This file isn't used as a test script directly, instead it is
9b01f003	2	# sourced from t8001-annotate.sh and t8002-blame.sh.
8752d11d	3
e8d08871 KB	4	if test_have_prereq MINGW
	5	then
	6	sanitize_L () {
	7	echo "$1" \| sed 'sX\(^-L\\|,\)\^\?/X&\\;*Xg'
	8	}
	9	else
	10	sanitize_L () {
	11	echo "$1"
	12	}
	13	fi
	14
92a903ac	15	check_count () {
e37f39c1	16	head= &&
5a9830cb	17	file='file' &&
03e15fc0 ES	18	options= &&
	19	while :
	20	do
	21	case "$1" in
	22	-h) head="$2"; shift; shift ;;
5a9830cb	23	-f) file="$2"; shift; shift ;;
e8d08871	24	-L*) options="$options $(sanitize_L "$1")"; shift ;;
03e15fc0 ES	25	-*) options="$options $1"; shift ;;
	26	*) break ;;
	27	esac
	28	done &&
5a9830cb ES	29	echo "$PROG $options $file $head" >&4 &&
5a9830cb ES	30	$PROG $options $file $head >actual &&
e37f39c1	31	perl -e '
92a903ac	32	my %expect = (@ARGV);
27eea66b	33	my %count = map { $_ => 0 } keys %expect;
92a903ac JH	34	while (<STDIN>) {
	35	if (/^[0-9a-f]+\t\(([^\t]+)\t/) {
	36	my $author = $1;
	37	for ($author) { s/^\s//; s/\s$//; }
27eea66b	38	$count{$author}++;
92a903ac JH	39	}
	40	}
	41	my $bad = 0;
	42	while (my ($author, $count) = each %count) {
	43	my $ok;
27eea66b KB	44	my $value = 0;
	45	$value = $expect{$author} if defined $expect{$author};
	46	if ($value != $count) {
92a903ac JH	47	$bad = 1;
	48	$ok = "bad";
	49	}
	50	else {
	51	$ok = "good";
	52	}
27eea66b	53	print STDERR "Author $author (expected $value, attributed $count) $ok\n";
92a903ac JH	54	}
92a903ac JH	55	exit($bad);
e37f39c1	56	' "$@" <actual
92a903ac JH	57	}
92a903ac JH	58
e5f5d7d4 ECA	59	get_progress_result () {
	60	tr '\015' '\012' \| tail -n 1
	61	}
	62
e37f39c1 ES	63	test_expect_success 'setup A lines' '
	64	echo "1A quick brown fox jumps over the" >file &&
	65	echo "lazy dog" >>file &&
	66	git add file &&
	67	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
	68	git commit -a -m "Initial."
	69	'
	70
	71	test_expect_success 'blame 1 author' '
	72	check_count A 2
	73	'
	74
603d0fdc JK	75	test_expect_success 'blame working copy' '
	76	test_when_finished "git restore file" &&
	77	echo "1A quick brown fox jumps over the" >file &&
	78	echo "another lazy dog" >>file &&
	79	check_count A 1 "Not Committed Yet" 1
	80	'
	81
1a3119ed JK	82	test_expect_success 'blame with --contents' '
	83	check_count --contents=file A 2
	84	'
	85
835950bd HY	86	test_expect_success 'blame with --contents in a bare repo' '
	87	git clone --bare . bare-contents.git &&
	88	(
	89	cd bare-contents.git &&
	90	echo "1A quick brown fox jumps over the" >contents &&
	91	check_count --contents=contents A 1
	92	)
	93	'
	94
1a3119ed JK	95	test_expect_success 'blame with --contents changed' '
	96	echo "1A quick brown fox jumps over the" >contents &&
	97	echo "another lazy dog" >>contents &&
603d0fdc	98	check_count --contents=contents A 1 "External file (--contents)" 1
1a3119ed JK	99	'
1a3119ed JK	100
a544fb08 SG	101	test_expect_success 'blame in a bare repo without starting commit' '
	102	git clone --bare . bare.git &&
	103	(
	104	cd bare.git &&
	105	check_count A 2
	106	)
	107	'
	108
7cb5f7c4 JK	109	test_expect_success 'blame by tag objects' '
	110	git tag -m "test tag" testTag &&
	111	git tag -m "test tag #2" testTag2 testTag &&
	112	check_count -h testTag A 2 &&
	113	check_count -h testTag2 A 2
	114	'
	115
e37f39c1 ES	116	test_expect_success 'setup B lines' '
	117	echo "2A quick brown fox jumps over the" >>file &&
	118	echo "lazy dog" >>file &&
	119	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
	120	git commit -a -m "Second."
	121	'
	122
	123	test_expect_success 'blame 2 authors' '
	124	check_count A 2 B 2
	125	'
	126
1a3119ed	127	test_expect_success 'blame with --contents and revision' '
603d0fdc	128	check_count -h testTag --contents=file A 2 "External file (--contents)" 2
1a3119ed JK	129	'
1a3119ed JK	130
e37f39c1	131	test_expect_success 'setup B1 lines (branch1)' '
747f6c68	132	git checkout -b branch1 main &&
e37f39c1 ES	133	echo "3A slow green fox jumps into the" >>file &&
	134	echo "well." >>file &&
	135	GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
	136	git commit -a -m "Branch1-1"
	137	'
	138
	139	test_expect_success 'blame 2 authors + 1 branch1 author' '
	140	check_count A 2 B 2 B1 2
	141	'
	142
	143	test_expect_success 'setup B2 lines (branch2)' '
747f6c68	144	git checkout -b branch2 main &&
e37f39c1 ES	145	sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
	146	mv file.new file &&
	147	GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
	148	git commit -a -m "Branch2-1"
	149	'
	150
	151	test_expect_success 'blame 2 authors + 1 branch2 author' '
	152	check_count A 2 B 1 B2 1
	153	'
	154
	155	test_expect_success 'merge branch1 & branch2' '
501a75a7	156	git merge branch1
e37f39c1 ES	157	'
	158
	159	test_expect_success 'blame 2 authors + 2 merged-in authors' '
	160	check_count A 2 B 1 B1 2 B2 1
	161	'
	162
95a4fb0e JK	163	test_expect_success 'blame --first-parent blames merge for branch1' '
	164	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
	165	'
	166
e37f39c1	167	test_expect_success 'blame ancestor' '
747f6c68	168	check_count -h main A 2 B 2
e37f39c1 ES	169	'
	170
	171	test_expect_success 'blame great-ancestor' '
747f6c68	172	check_count -h main^ A 2
e37f39c1 ES	173	'
	174
	175	test_expect_success 'setup evil merge' '
	176	echo "evil merge." >>file &&
	177	git commit -a --amend
	178	'
	179
	180	test_expect_success 'blame evil merge' '
	181	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
	182	'
	183
e228c173 JS	184	test_expect_success 'blame huge graft' '
e228c173 JS	185	test_when_finished "git checkout branch2" &&
93e02b6e	186	test_when_finished "rm -rf .git/info" &&
e228c173 JS	187	graft= &&
	188	for i in 0 1 2
	189	do
	190	for j in 0 1 2 3 4 5 6 7 8 9
	191	do
	192	git checkout --orphan "$i$j" &&
	193	printf "%s\n" "$i" "$j" >file &&
	194	test_tick &&
	195	GIT_AUTHOR_NAME=$i$j GIT_AUTHOR_EMAIL=$i$j@test.git \
	196	git commit -a -m "$i$j" &&
	197	commit=$(git rev-parse --verify HEAD) &&
0c51d6b4	198	graft="$graft$commit " \|\| return 1
e228c173 JS	199	done
e228c173 JS	200	done &&
93e02b6e	201	mkdir .git/info &&
e228c173 JS	202	printf "%s " $graft >.git/info/grafts &&
	203	check_count -h 00 01 1 10 1
	204	'
	205
e37f39c1 ES	206	test_expect_success 'setup incomplete line' '
	207	echo "incomplete" \| tr -d "\\012" >>file &&
	208	GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
	209	git commit -a -m "Incomplete"
	210	'
	211
	212	test_expect_success 'blame incomplete line' '
	213	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
	214	'
	215
	216	test_expect_success 'setup edits' '
	217	mv file file.orig &&
	218	{
	219	cat file.orig &&
	220	echo
	221	} \| sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" >file &&
	222	echo "incomplete" \| tr -d "\\012" >>file &&
	223	GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
	224	git commit -a -m "edit"
	225	'
	226
	227	test_expect_success 'blame edits' '
	228	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
	229	'
	230
	231	test_expect_success 'setup obfuscated email' '
	232	echo "No robots allowed" >file.new &&
	233	cat file >>file.new &&
	234	mv file.new file &&
	235	GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
	236	git commit -a -m "norobots"
	237	'
	238
	239	test_expect_success 'blame obfuscated email' '
	240	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
	241	'
03e15fc0 ES	242
	243	test_expect_success 'blame -L 1 (all)' '
	244	check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
	245	'
	246
	247	test_expect_success 'blame -L , (all)' '
	248	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
	249	'
	250
	251	test_expect_success 'blame -L X (X to end)' '
	252	check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
	253	'
	254
	255	test_expect_success 'blame -L X, (X to end)' '
	256	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
	257	'
	258
	259	test_expect_success 'blame -L ,Y (up to Y)' '
	260	check_count -L,3 A 1 B2 1 E 1
	261	'
	262
	263	test_expect_success 'blame -L X,X' '
	264	check_count -L3,3 B2 1
	265	'
	266
	267	test_expect_success 'blame -L X,Y' '
	268	check_count -L3,6 B 1 B1 1 B2 1 D 1
	269	'
	270
	271	test_expect_success 'blame -L Y,X (undocumented)' '
	272	check_count -L6,3 B 1 B1 1 B2 1 D 1
	273	'
	274
5ce922a0	275	test_expect_success 'blame -L -X' '
9527604f ES	276	test_must_fail $PROG -L-1 file
	277	'
	278
5ce922a0	279	test_expect_success 'blame -L 0' '
9527604f ES	280	test_must_fail $PROG -L0 file
	281	'
	282
5ce922a0	283	test_expect_success 'blame -L ,0' '
9527604f ES	284	test_must_fail $PROG -L,0 file
	285	'
	286
5d57cac6	287	test_expect_success 'blame -L ,+0' '
82cd7e5d ES	288	test_must_fail $PROG -L,+0 file
	289	'
	290
abba3539	291	test_expect_success 'blame -L X,+0' '
dedb9129 ES	292	test_must_fail $PROG -L1,+0 file
	293	'
	294
03e15fc0 ES	295	test_expect_success 'blame -L X,+1' '
	296	check_count -L3,+1 B2 1
	297	'
	298
	299	test_expect_success 'blame -L X,+N' '
	300	check_count -L3,+4 B 1 B1 1 B2 1 D 1
	301	'
	302
5d57cac6	303	test_expect_success 'blame -L ,-0' '
82cd7e5d ES	304	test_must_fail $PROG -L,-0 file
	305	'
	306
abba3539	307	test_expect_success 'blame -L X,-0' '
dedb9129 ES	308	test_must_fail $PROG -L1,-0 file
	309	'
	310
03e15fc0 ES	311	test_expect_success 'blame -L X,-1' '
	312	check_count -L3,-1 B2 1
	313	'
	314
	315	test_expect_success 'blame -L X,-N' '
	316	check_count -L6,-4 B 1 B1 1 B2 1 D 1
	317	'
	318
	319	test_expect_success 'blame -L /RE/ (RE to end)' '
	320	check_count -L/evil/ C 1 "A U Thor" 1
	321	'
	322
	323	test_expect_success 'blame -L /RE/,/RE2/' '
	324	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
	325	'
	326
	327	test_expect_success 'blame -L X,/RE/' '
	328	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
	329	'
	330
	331	test_expect_success 'blame -L /RE/,Y' '
	332	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
	333	'
	334
	335	test_expect_success 'blame -L /RE/,+N' '
	336	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
	337	'
	338
	339	test_expect_success 'blame -L /RE/,-N' '
	340	check_count -L/99/,-3 B 1 B2 1 D 1
	341	'
	342
580b4f3a ES	343	# 'file' ends with an incomplete line, so 'wc' reports one fewer lines than
	344	# git-blame sees, hence the last line is actually $(wc...)+1.
	345	test_expect_success 'blame -L X (X == nlines)' '
	346	n=$(expr $(wc -l <file) + 1) &&
	347	check_count -L$n C 1
	348	'
	349
164a9cf4	350	test_expect_success 'blame -L X (X == nlines + 1)' '
580b4f3a ES	351	n=$(expr $(wc -l <file) + 2) &&
	352	test_must_fail $PROG -L$n file
	353	'
	354
03e15fc0 ES	355	test_expect_success 'blame -L X (X > nlines)' '
	356	test_must_fail $PROG -L12345 file
	357	'
	358
580b4f3a ES	359	test_expect_success 'blame -L ,Y (Y == nlines)' '
	360	n=$(expr $(wc -l <file) + 1) &&
	361	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
	362	'
	363
	364	test_expect_success 'blame -L ,Y (Y == nlines + 1)' '
	365	n=$(expr $(wc -l <file) + 2) &&
96cfa94e	366	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
580b4f3a ES	367	'
580b4f3a ES	368
03e15fc0	369	test_expect_success 'blame -L ,Y (Y > nlines)' '
96cfa94e	370	check_count -L,12345 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
03e15fc0 ES	371	'
03e15fc0 ES	372
91b5494e ES	373	test_expect_success 'blame -L multiple (disjoint)' '
	374	check_count -L2,3 -L6,7 A 1 B1 1 B2 1 "A U Thor" 1
	375	'
	376
	377	test_expect_success 'blame -L multiple (disjoint: unordered)' '
	378	check_count -L6,7 -L2,3 A 1 B1 1 B2 1 "A U Thor" 1
	379	'
	380
	381	test_expect_success 'blame -L multiple (adjacent)' '
	382	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
	383	'
	384
	385	test_expect_success 'blame -L multiple (adjacent: unordered)' '
	386	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
	387	'
	388
	389	test_expect_success 'blame -L multiple (overlapping)' '
	390	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
	391	'
	392
	393	test_expect_success 'blame -L multiple (overlapping: unordered)' '
	394	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
	395	'
	396
	397	test_expect_success 'blame -L multiple (superset/subset)' '
	398	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
	399	'
	400
	401	test_expect_success 'blame -L multiple (superset/subset: unordered)' '
	402	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
	403	'
	404
52f4d126 ES	405	test_expect_success 'blame -L /RE/ (relative)' '
	406	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
	407	'
	408
	409	test_expect_success 'blame -L /RE/ (relative: no preceding range)' '
	410	check_count -L/dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
	411	'
	412
	413	test_expect_success 'blame -L /RE/ (relative: adjacent)' '
	414	check_count -L1,1 -L/dog/,+1 A 1 E 1
	415	'
	416
	417	test_expect_success 'blame -L /RE/ (relative: not found)' '
	418	test_must_fail $PROG -L4,4 -L/dog/ file
	419	'
	420
	421	test_expect_success 'blame -L /RE/ (relative: end-of-file)' '
	422	test_must_fail $PROG -L, -L/$/ file
	423	'
	424
a6ac5f98 ES	425	test_expect_success 'blame -L ^/RE/ (absolute)' '
	426	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
	427	'
	428
	429	test_expect_success 'blame -L ^/RE/ (absolute: no preceding range)' '
	430	check_count -L^/dog/,+2 A 1 B2 1
	431	'
	432
	433	test_expect_success 'blame -L ^/RE/ (absolute: not found)' '
	434	test_must_fail $PROG -L4,4 -L^/tambourine/ file
	435	'
	436
	437	test_expect_success 'blame -L ^/RE/ (absolute: end-of-file)' '
	438	n=$(expr $(wc -l <file) + 1) &&
	439	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
	440	'
	441
5a9830cb ES	442	test_expect_success 'setup -L :regex' '
	443	tr Q "\\t" >hello.c <<-\EOF &&
	444	int main(int argc, const char *argv[])
	445	{
	446	Qputs("hello");
	447	}
	448	EOF
	449	git add hello.c &&
	450	GIT_AUTHOR_NAME="F" GIT_AUTHOR_EMAIL="F@test.git" \
	451	git commit -m "hello" &&
	452
	453	mv hello.c hello.orig &&
3a4fc21a RS	454	sed -e "/}/ {x; s/$/Qputs(\"goodbye\");/; G;}" <hello.orig \|
3a4fc21a RS	455	tr Q "\\t" >hello.c &&
5a9830cb ES	456	GIT_AUTHOR_NAME="G" GIT_AUTHOR_EMAIL="G@test.git" \
	457	git commit -a -m "goodbye" &&
	458
	459	mv hello.c hello.orig &&
	460	echo "#include <stdio.h>" >hello.c &&
	461	cat hello.orig >>hello.c &&
99094a7a	462	tr Q "\\t" >>hello.c <<-\EOF &&
5a9830cb ES	463	void mail()
	464	{
	465	Qputs("mail");
	466	}
	467	EOF
	468	GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
	469	git commit -a -m "mail"
	470	'
	471
	472	test_expect_success 'blame -L :literal' '
	473	check_count -f hello.c -L:main F 4 G 1
	474	'
	475
	476	test_expect_success 'blame -L :regex' '
	477	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
	478	'
	479
	480	test_expect_success 'blame -L :nomatch' '
	481	test_must_fail $PROG -L:nomatch hello.c
	482	'
	483
1ce761a5 ES	484	test_expect_success 'blame -L :RE (relative)' '
	485	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
	486	'
	487
	488	test_expect_success 'blame -L :RE (relative: no preceding range)' '
	489	check_count -f hello.c -L:ma.. F 4 G 1
	490	'
	491
	492	test_expect_success 'blame -L :RE (relative: not found)' '
	493	test_must_fail $PROG -L3,3 -L:tambourine hello.c
	494	'
	495
	496	test_expect_success 'blame -L :RE (relative: end-of-file)' '
	497	test_must_fail $PROG -L, -L:main hello.c
	498	'
	499
215e76c7 ES	500	test_expect_success 'blame -L ^:RE (absolute)' '
	501	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
	502	'
	503
	504	test_expect_success 'blame -L ^:RE (absolute: no preceding range)' '
	505	check_count -f hello.c -L^:ma.. F 4 G 1
	506	'
	507
	508	test_expect_success 'blame -L ^:RE (absolute: not found)' '
	509	test_must_fail $PROG -L4,4 -L^:tambourine hello.c
	510	'
	511
	512	test_expect_success 'blame -L ^:RE (absolute: end-of-file)' '
	513	n=$(printf "%d" $(wc -l <hello.c)) &&
	514	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
	515	'
	516
f08b4013 ÆAB	517	test_expect_success 'blame -L :funcname with userdiff driver' '
	518	cat >file.template <<-\EOF &&
	519	DO NOT MATCH THIS LINE
b269441b	520	function RIGHT(a, b) result(c)
f08b4013	521	AS THE DEFAULT DRIVER WOULD
b269441b ÆAB	522
b269441b ÆAB	523	integer, intent(in) :: ChangeMe
b269441b	524	EOF
9466e380	525
f08b4013 ÆAB	526	fortran_file=file.f03 &&
	527	test_when_finished "rm .gitattributes" &&
	528	echo "$fortran_file diff=fortran" >.gitattributes &&
	529
	530	test_commit --author "A <A@test.git>" \
	531	"add" "$fortran_file" \
	532	"$(cat file.template)" &&
	533	test_commit --author "B <B@test.git>" \
	534	"change" "$fortran_file" \
47c0f245	535	"$(sed -e s/ChangeMe/IWasChanged/ file.template)" &&
f08b4013	536	check_count -f "$fortran_file" -L:RIGHT A 3 B 1
9466e380 PB	537	'
9466e380 PB	538
a8fa8eca ES	539	test_expect_success 'setup incremental' '
	540	(
	541	GIT_AUTHOR_NAME=I &&
	542	export GIT_AUTHOR_NAME &&
	543	GIT_AUTHOR_EMAIL=I@test.git &&
	544	export GIT_AUTHOR_EMAIL &&
	545	>incremental &&
	546	git add incremental &&
	547	git commit -m "step 0" &&
	548	printf "partial" >>incremental &&
	549	git commit -a -m "step 0.5" &&
	550	echo >>incremental &&
	551	git commit -a -m "step 1"
	552	)
	553	'
	554
	555	test_expect_success 'blame empty' '
	556	check_count -h HEAD^^ -f incremental
	557	'
	558
5ce922a0 ES	559	test_expect_success 'blame -L 0 empty' '
5ce922a0 ES	560	test_must_fail $PROG -L0 incremental HEAD^^
a8fa8eca ES	561	'
a8fa8eca ES	562
164a9cf4	563	test_expect_success 'blame -L 1 empty' '
a8fa8eca ES	564	test_must_fail $PROG -L1 incremental HEAD^^
	565	'
	566
	567	test_expect_success 'blame -L 2 empty' '
	568	test_must_fail $PROG -L2 incremental HEAD^^
	569	'
	570
	571	test_expect_success 'blame half' '
	572	check_count -h HEAD^ -f incremental I 1
	573	'
	574
5ce922a0 ES	575	test_expect_success 'blame -L 0 half' '
5ce922a0 ES	576	test_must_fail $PROG -L0 incremental HEAD^
a8fa8eca ES	577	'
	578
	579	test_expect_success 'blame -L 1 half' '
	580	check_count -h HEAD^ -f incremental -L1 I 1
	581	'
	582
164a9cf4	583	test_expect_success 'blame -L 2 half' '
a8fa8eca ES	584	test_must_fail $PROG -L2 incremental HEAD^
	585	'
	586
	587	test_expect_success 'blame -L 3 half' '
	588	test_must_fail $PROG -L3 incremental HEAD^
	589	'
	590
	591	test_expect_success 'blame full' '
	592	check_count -f incremental I 1
	593	'
	594
5ce922a0 ES	595	test_expect_success 'blame -L 0 full' '
5ce922a0 ES	596	test_must_fail $PROG -L0 incremental
a8fa8eca ES	597	'
	598
	599	test_expect_success 'blame -L 1 full' '
	600	check_count -f incremental -L1 I 1
	601	'
	602
164a9cf4	603	test_expect_success 'blame -L 2 full' '
a8fa8eca ES	604	test_must_fail $PROG -L2 incremental
	605	'
	606
	607	test_expect_success 'blame -L 3 full' '
	608	test_must_fail $PROG -L3 incremental
	609	'
	610
f350cf9e ES	611	test_expect_success 'blame -L' '
	612	test_must_fail $PROG -L file
	613	'
	614
	615	test_expect_success 'blame -L X,+' '
	616	test_must_fail $PROG -L1,+ file
	617	'
	618
	619	test_expect_success 'blame -L X,-' '
	620	test_must_fail $PROG -L1,- file
	621	'
	622
	623	test_expect_success 'blame -L X (non-numeric X)' '
	624	test_must_fail $PROG -LX file
	625	'
	626
	627	test_expect_success 'blame -L X,Y (non-numeric Y)' '
	628	test_must_fail $PROG -L1,Y file
	629	'
	630
	631	test_expect_success 'blame -L X,+N (non-numeric N)' '
	632	test_must_fail $PROG -L1,+N file
	633	'
	634
	635	test_expect_success 'blame -L X,-N (non-numeric N)' '
03e15fc0 ES	636	test_must_fail $PROG -L1,-N file
03e15fc0 ES	637	'
a6ac5f98 ES	638
	639	test_expect_success 'blame -L ,^/RE/' '
	640	test_must_fail $PROG -L1,^/99/ file
	641	'
e5f5d7d4 ECA	642
	643	test_expect_success 'blame progress on a full file' '
	644	cat >expect <<-\EOF &&
	645	Blaming lines: 100% (10/10), done.
	646	EOF
	647
	648	GIT_PROGRESS_DELAY=0 \
	649	git blame --progress hello.c 2>stderr &&
	650
	651	get_progress_result <stderr >actual &&
	652	test_cmp expect actual
	653	'
	654
	655	test_expect_success 'blame progress on a single range' '
	656	cat >expect <<-\EOF &&
	657	Blaming lines: 100% (4/4), done.
	658	EOF
	659
	660	GIT_PROGRESS_DELAY=0 \
	661	git blame --progress -L 3,6 hello.c 2>stderr &&
	662
	663	get_progress_result <stderr >actual &&
	664	test_cmp expect actual
	665	'
	666
	667	test_expect_success 'blame progress on multiple ranges' '
	668	cat >expect <<-\EOF &&
	669	Blaming lines: 100% (7/7), done.
	670	EOF
	671
	672	GIT_PROGRESS_DELAY=0 \
	673	git blame --progress -L 3,6 -L 8,10 hello.c 2>stderr &&
	674
	675	get_progress_result <stderr >actual &&
	676	test_cmp expect actual
	677	'