[thirdparty/git.git] / t / t7814-grep-recurse-submodules.sh

#!/bin/sh

test_description='Test grep recurse-submodules feature

This test verifies the recurse-submodules feature correctly greps across
submodules.
'

. ./test-lib.sh

GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB

test_expect_success 'setup directory structure and submodule' '
	echo "(1|2)d(3|4)" >a &&
	mkdir b &&
	echo "(3|4)" >b/b &&
	git add a b &&
	git commit -m "add a and b" &&
	test_tick &&
	git init submodule &&
	echo "(1|2)d(3|4)" >submodule/a &&
	git -C submodule add a &&
	git -C submodule commit -m "add a" &&
	git submodule add ./submodule &&
	git commit -m "added submodule" &&
	test_tick
'

test_expect_success 'grep correctly finds patterns in a submodule' '
	cat >expect <<-\EOF &&
	a:(1|2)d(3|4)
	b/b:(3|4)
	submodule/a:(1|2)d(3|4)
	EOF

	git grep -e "(3|4)" --recurse-submodules >actual &&
	test_cmp expect actual
'

test_expect_success 'grep finds patterns in a submodule via config' '
	test_config submodule.recurse true &&
	# expect from previous test
	git grep -e "(3|4)" >actual &&
	test_cmp expect actual
'

test_expect_success 'grep --no-recurse-submodules overrides config' '
	test_config submodule.recurse true &&
	cat >expect <<-\EOF &&
	a:(1|2)d(3|4)
	b/b:(3|4)
	EOF

	git grep -e "(3|4)" --no-recurse-submodules >actual &&
	test_cmp expect actual
'

test_expect_success 'grep and basic pathspecs' '
	cat >expect <<-\EOF &&
	submodule/a:(1|2)d(3|4)
	EOF

	git grep -e. --recurse-submodules -- submodule >actual &&
	test_cmp expect actual
'

test_expect_success 'grep and nested submodules' '
	git init submodule/sub &&
	echo "(1|2)d(3|4)" >submodule/sub/a &&
	git -C submodule/sub add a &&
	git -C submodule/sub commit -m "add a" &&
	test_tick &&
	git -C submodule submodule add ./sub &&
	git -C submodule add sub &&
	git -C submodule commit -m "added sub" &&
	test_tick &&
	git add submodule &&
	git commit -m "updated submodule" &&
	test_tick &&

	cat >expect <<-\EOF &&
	a:(1|2)d(3|4)
	b/b:(3|4)
	submodule/a:(1|2)d(3|4)
	submodule/sub/a:(1|2)d(3|4)
	EOF

	git grep -e "(3|4)" --recurse-submodules >actual &&
	test_cmp expect actual
'

test_expect_success 'grep and multiple patterns' '
	cat >expect <<-\EOF &&
	a:(1|2)d(3|4)
	submodule/a:(1|2)d(3|4)
	submodule/sub/a:(1|2)d(3|4)
	EOF

	git grep -e "(3|4)" --and -e "(1|2)" --recurse-submodules >actual &&
	test_cmp expect actual
'

test_expect_success 'grep and multiple patterns' '
	cat >expect <<-\EOF &&
	b/b:(3|4)
	EOF

	git grep -e "(3|4)" --and --not -e "(1|2)" --recurse-submodules >actual &&
	test_cmp expect actual
'

test_expect_success 'basic grep tree' '
	cat >expect <<-\EOF &&
	HEAD:a:(1|2)d(3|4)
	HEAD:b/b:(3|4)
	HEAD:submodule/a:(1|2)d(3|4)
	HEAD:submodule/sub/a:(1|2)d(3|4)
	EOF

	git grep -e "(3|4)" --recurse-submodules HEAD >actual &&
	test_cmp expect actual
'

test_expect_success 'grep tree HEAD^' '
	cat >expect <<-\EOF &&
	HEAD^:a:(1|2)d(3|4)
	HEAD^:b/b:(3|4)
	HEAD^:submodule/a:(1|2)d(3|4)
	EOF

	git grep -e "(3|4)" --recurse-submodules HEAD^ >actual &&
	test_cmp expect actual
'

test_expect_success 'grep tree HEAD^^' '
	cat >expect <<-\EOF &&
	HEAD^^:a:(1|2)d(3|4)
	HEAD^^:b/b:(3|4)
	EOF

	git grep -e "(3|4)" --recurse-submodules HEAD^^ >actual &&
	test_cmp expect actual
'

test_expect_success 'grep tree and pathspecs' '
	cat >expect <<-\EOF &&
	HEAD:submodule/a:(1|2)d(3|4)
	HEAD:submodule/sub/a:(1|2)d(3|4)
	EOF

	git grep -e "(3|4)" --recurse-submodules HEAD -- submodule >actual &&
	test_cmp expect actual
'

test_expect_success 'grep tree and pathspecs' '
	cat >expect <<-\EOF &&
	HEAD:submodule/a:(1|2)d(3|4)
	HEAD:submodule/sub/a:(1|2)d(3|4)
	EOF

	git grep -e "(3|4)" --recurse-submodules HEAD -- "submodule*a" >actual &&
	test_cmp expect actual
'

test_expect_success 'grep tree and more pathspecs' '
	cat >expect <<-\EOF &&
	HEAD:submodule/a:(1|2)d(3|4)
	EOF

	git grep -e "(3|4)" --recurse-submodules HEAD -- "submodul?/a" >actual &&
	test_cmp expect actual
'

test_expect_success 'grep tree and more pathspecs' '
	cat >expect <<-\EOF &&
	HEAD:submodule/sub/a:(1|2)d(3|4)
	EOF

	git grep -e "(3|4)" --recurse-submodules HEAD -- "submodul*/sub/a" >actual &&
	test_cmp expect actual
'

test_expect_success !MINGW 'grep recurse submodule colon in name' '
	git init parent &&
	test_when_finished "rm -rf parent" &&
	echo "(1|2)d(3|4)" >"parent/fi:le" &&
	git -C parent add "fi:le" &&
	git -C parent commit -m "add fi:le" &&
	test_tick &&

	git init "su:b" &&
	test_when_finished "rm -rf su:b" &&
	echo "(1|2)d(3|4)" >"su:b/fi:le" &&
	git -C "su:b" add "fi:le" &&
	git -C "su:b" commit -m "add fi:le" &&
	test_tick &&

	test_config_global protocol.file.allow always &&
	git -C parent submodule add "../su:b" "su:b" &&
	git -C parent commit -m "add submodule" &&
	test_tick &&

	cat >expect <<-\EOF &&
	fi:le:(1|2)d(3|4)
	su:b/fi:le:(1|2)d(3|4)
	EOF
	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules >actual &&
	test_cmp expect actual &&

	cat >expect <<-\EOF &&
	HEAD:fi:le:(1|2)d(3|4)
	HEAD:su:b/fi:le:(1|2)d(3|4)
	EOF
	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules HEAD >actual &&
	test_cmp expect actual
'

test_expect_success 'grep history with moved submoules' '
	git init parent &&
	test_when_finished "rm -rf parent" &&
	echo "(1|2)d(3|4)" >parent/file &&
	git -C parent add file &&
	git -C parent commit -m "add file" &&
	test_tick &&

	git init sub &&
	test_when_finished "rm -rf sub" &&
	echo "(1|2)d(3|4)" >sub/file &&
	git -C sub add file &&
	git -C sub commit -m "add file" &&
	test_tick &&

	test_config_global protocol.file.allow always &&
	git -C parent submodule add ../sub dir/sub &&
	git -C parent commit -m "add submodule" &&
	test_tick &&

	cat >expect <<-\EOF &&
	dir/sub/file:(1|2)d(3|4)
	file:(1|2)d(3|4)
	EOF
	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules >actual &&
	test_cmp expect actual &&

	git -C parent mv dir/sub sub-moved &&
	git -C parent commit -m "moved submodule" &&
	test_tick &&

	cat >expect <<-\EOF &&
	file:(1|2)d(3|4)
	sub-moved/file:(1|2)d(3|4)
	EOF
	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules >actual &&
	test_cmp expect actual &&

	cat >expect <<-\EOF &&
	HEAD^:dir/sub/file:(1|2)d(3|4)
	HEAD^:file:(1|2)d(3|4)
	EOF
	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules HEAD^ >actual &&
	test_cmp expect actual
'

test_expect_success 'grep using relative path' '
	test_when_finished "rm -rf parent sub" &&
	git init sub &&
	echo "(1|2)d(3|4)" >sub/file &&
	git -C sub add file &&
	git -C sub commit -m "add file" &&
	test_tick &&

	git init parent &&
	echo "(1|2)d(3|4)" >parent/file &&
	git -C parent add file &&
	mkdir parent/src &&
	echo "(1|2)d(3|4)" >parent/src/file2 &&
	git -C parent add src/file2 &&
	test_config_global protocol.file.allow always &&
	git -C parent submodule add ../sub &&
	git -C parent commit -m "add files and submodule" &&
	test_tick &&

	# From top works
	cat >expect <<-\EOF &&
	file:(1|2)d(3|4)
	src/file2:(1|2)d(3|4)
	sub/file:(1|2)d(3|4)
	EOF
	git -C parent grep --recurse-submodules -e "(1|2)d(3|4)" >actual &&
	test_cmp expect actual &&

	# Relative path to top
	cat >expect <<-\EOF &&
	../file:(1|2)d(3|4)
	file2:(1|2)d(3|4)
	../sub/file:(1|2)d(3|4)
	EOF
	git -C parent/src grep --recurse-submodules -e "(1|2)d(3|4)" -- .. >actual &&
	test_cmp expect actual &&

	# Relative path to submodule
	cat >expect <<-\EOF &&
	../sub/file:(1|2)d(3|4)
	EOF
	git -C parent/src grep --recurse-submodules -e "(1|2)d(3|4)" -- ../sub >actual &&
	test_cmp expect actual
'

test_expect_success 'grep from a subdir' '
	test_when_finished "rm -rf parent sub" &&
	git init sub &&
	echo "(1|2)d(3|4)" >sub/file &&
	git -C sub add file &&
	git -C sub commit -m "add file" &&
	test_tick &&

	git init parent &&
	mkdir parent/src &&
	echo "(1|2)d(3|4)" >parent/src/file &&
	git -C parent add src/file &&
	test_config_global protocol.file.allow always &&
	git -C parent submodule add ../sub src/sub &&
	git -C parent submodule add ../sub sub &&
	git -C parent commit -m "add files and submodules" &&
	test_tick &&

	# Verify grep from root works
	cat >expect <<-\EOF &&
	src/file:(1|2)d(3|4)
	src/sub/file:(1|2)d(3|4)
	sub/file:(1|2)d(3|4)
	EOF
	git -C parent grep --recurse-submodules -e "(1|2)d(3|4)" >actual &&
	test_cmp expect actual &&

	# Verify grep from a subdir works
	cat >expect <<-\EOF &&
	file:(1|2)d(3|4)
	sub/file:(1|2)d(3|4)
	EOF
	git -C parent/src grep --recurse-submodules -e "(1|2)d(3|4)" >actual &&
	test_cmp expect actual
'

test_incompatible_with_recurse_submodules ()
{
	test_expect_success "--recurse-submodules and $1 are incompatible" "
		test_must_fail git grep -e. --recurse-submodules $1 2>actual &&
		test_i18ngrep 'not supported with --recurse-submodules' actual
	"
}

test_incompatible_with_recurse_submodules --untracked

test_expect_success 'grep --recurse-submodules --no-index ignores --recurse-submodules' '
	git grep --recurse-submodules --no-index -e "^(.|.)[\d]" >actual &&
	cat >expect <<-\EOF &&
	a:(1|2)d(3|4)
	submodule/a:(1|2)d(3|4)
	submodule/sub/a:(1|2)d(3|4)
	EOF
	test_cmp expect actual
'

test_expect_success 'grep --recurse-submodules should pass the pattern type along' '
	# Fixed
	test_must_fail git grep -F --recurse-submodules -e "(.|.)[\d]" &&
	test_must_fail git -c grep.patternType=fixed grep --recurse-submodules -e "(.|.)[\d]" &&

	# Basic
	git grep -G --recurse-submodules -e "(.|.)[\d]" >actual &&
	cat >expect <<-\EOF &&
	a:(1|2)d(3|4)
	submodule/a:(1|2)d(3|4)
	submodule/sub/a:(1|2)d(3|4)
	EOF
	test_cmp expect actual &&
	git -c grep.patternType=basic grep --recurse-submodules -e "(.|.)[\d]" >actual &&
	test_cmp expect actual &&

	# Extended
	git grep -E --recurse-submodules -e "(.|.)[\d]" >actual &&
	cat >expect <<-\EOF &&
	.gitmodules:[submodule "submodule"]
	.gitmodules:	path = submodule
	.gitmodules:	url = ./submodule
	a:(1|2)d(3|4)
	submodule/.gitmodules:[submodule "sub"]
	submodule/a:(1|2)d(3|4)
	submodule/sub/a:(1|2)d(3|4)
	EOF
	test_cmp expect actual &&
	git -c grep.patternType=extended grep --recurse-submodules -e "(.|.)[\d]" >actual &&
	test_cmp expect actual &&
	git -c grep.extendedRegexp=true grep --recurse-submodules -e "(.|.)[\d]" >actual &&
	test_cmp expect actual &&

	# Perl
	if test_have_prereq PCRE
	then
		git grep -P --recurse-submodules -e "(.|.)[\d]" >actual &&
		cat >expect <<-\EOF &&
		a:(1|2)d(3|4)
		b/b:(3|4)
		submodule/a:(1|2)d(3|4)
		submodule/sub/a:(1|2)d(3|4)
		EOF
		test_cmp expect actual &&
		git -c grep.patternType=perl grep --recurse-submodules -e "(.|.)[\d]" >actual &&
		test_cmp expect actual
	fi
'

test_expect_success 'grep --recurse-submodules with submodules without .gitmodules in the working tree' '
	test_when_finished "git -C submodule checkout .gitmodules" &&
	rm submodule/.gitmodules &&
	git grep --recurse-submodules -e "(.|.)[\d]" >actual &&
	cat >expect <<-\EOF &&
	a:(1|2)d(3|4)
	submodule/a:(1|2)d(3|4)
	submodule/sub/a:(1|2)d(3|4)
	EOF
	test_cmp expect actual
'

reset_and_clean () {
	git reset --hard &&
	git clean -fd &&
	git submodule foreach --recursive 'git reset --hard' &&
	git submodule foreach --recursive 'git clean -fd'
}

test_expect_success 'grep --recurse-submodules without --cached considers worktree modifications' '
	reset_and_clean &&
	echo "A modified line in submodule" >>submodule/a &&
	echo "submodule/a:A modified line in submodule" >expect &&
	git grep --recurse-submodules "A modified line in submodule" >actual &&
	test_cmp expect actual
'

test_expect_success 'grep --recurse-submodules with --cached ignores worktree modifications' '
	reset_and_clean &&
	echo "A modified line in submodule" >>submodule/a &&
	test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 &&
	test_must_be_empty actual
'

test_expect_failure 'grep --textconv: superproject .gitattributes does not affect submodules' '
	reset_and_clean &&
	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
	echo "a diff=d2x" >.gitattributes &&

	cat >expect <<-\EOF &&
	a:(1|2)x(3|4)
	EOF
	git grep --textconv --recurse-submodules x >actual &&
	test_cmp expect actual
'

test_expect_failure 'grep --textconv: superproject .gitattributes (from index) does not affect submodules' '
	reset_and_clean &&
	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
	echo "a diff=d2x" >.gitattributes &&
	git add .gitattributes &&
	rm .gitattributes &&

	cat >expect <<-\EOF &&
	a:(1|2)x(3|4)
	EOF
	git grep --textconv --recurse-submodules x >actual &&
	test_cmp expect actual
'

test_expect_failure 'grep --textconv: superproject .git/info/attributes does not affect submodules' '
	reset_and_clean &&
	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
	super_attr="$(git rev-parse --git-path info/attributes)" &&
	test_when_finished "rm -f \"$super_attr\"" &&
	echo "a diff=d2x" >"$super_attr" &&

	cat >expect <<-\EOF &&
	a:(1|2)x(3|4)
	EOF
	git grep --textconv --recurse-submodules x >actual &&
	test_cmp expect actual
'

# Note: what currently prevents this test from passing is not that the
# .gitattributes file from "./submodule" is being ignored, but that it is being
# propagated to the nested "./submodule/sub" files.
#
test_expect_failure 'grep --textconv correctly reads submodule .gitattributes' '
	reset_and_clean &&
	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
	echo "a diff=d2x" >submodule/.gitattributes &&

	cat >expect <<-\EOF &&
	submodule/a:(1|2)x(3|4)
	EOF
	git grep --textconv --recurse-submodules x >actual &&
	test_cmp expect actual
'

test_expect_failure 'grep --textconv correctly reads submodule .gitattributes (from index)' '
	reset_and_clean &&
	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
	echo "a diff=d2x" >submodule/.gitattributes &&
	git -C submodule add .gitattributes &&
	rm submodule/.gitattributes &&

	cat >expect <<-\EOF &&
	submodule/a:(1|2)x(3|4)
	EOF
	git grep --textconv --recurse-submodules x >actual &&
	test_cmp expect actual
'

test_expect_failure 'grep --textconv correctly reads submodule .git/info/attributes' '
	reset_and_clean &&
	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&

	submodule_attr="$(git -C submodule rev-parse --path-format=absolute --git-path info/attributes)" &&
	test_when_finished "rm -f \"$submodule_attr\"" &&
	echo "a diff=d2x" >"$submodule_attr" &&

	cat >expect <<-\EOF &&
	submodule/a:(1|2)x(3|4)
	EOF
	git grep --textconv --recurse-submodules x >actual &&
	test_cmp expect actual
'

test_expect_failure 'grep saves textconv cache in the appropriate repository' '
	reset_and_clean &&
	test_config_global diff.d2x_cached.textconv "sed -e \"s/d/x/\"" &&
	test_config_global diff.d2x_cached.cachetextconv true &&
	echo "a diff=d2x_cached" >submodule/.gitattributes &&

	# We only read/write to the textconv cache when grepping from an OID,
	# as the working tree file might have modifications.
	git grep --textconv --cached --recurse-submodules x &&

	super_textconv_cache="$(git rev-parse --git-path refs/notes/textconv/d2x_cached)" &&
	sub_textconv_cache="$(git -C submodule rev-parse \
			--path-format=absolute --git-path refs/notes/textconv/d2x_cached)" &&
	test_path_is_missing "$super_textconv_cache" &&
	test_path_is_file "$sub_textconv_cache"
'

test_expect_success 'grep partially-cloned submodule' '
	# Set up clean superproject and submodule for partial cloning.
	test_config_global protocol.file.allow always &&
	git init super &&
	git init super/sub &&
	(
		cd super &&
		test_commit --no-tag "Add file in superproject" \
			super-file "Some content for super-file" &&
		test_commit -C sub --no-tag "Add file in submodule" \
			sub-file "Some content for sub-file" &&
		git submodule add ./sub &&
		git commit -m "Add other as submodule sub" &&
		test_tick &&
		test_commit -C sub --no-tag --append "Update file in submodule" \
			sub-file "Some more content for sub-file" &&
		git add sub &&
		git commit -m "Update submodule" &&
		test_tick &&
		git config --local uploadpack.allowfilter 1 &&
		git config --local uploadpack.allowanysha1inwant 1 &&
		git -C sub config --local uploadpack.allowfilter 1 &&
		git -C sub config --local uploadpack.allowanysha1inwant 1
	) &&
	# Clone the superproject & submodule, then make sure we can lazy-fetch submodule objects.
	git clone --filter=blob:none --also-filter-submodules \
		--recurse-submodules "file://$(pwd)/super" partial &&
	(
		cd partial &&
		cat >expect <<-\EOF &&
		HEAD^:sub/sub-file:Some content for sub-file
		HEAD^:super-file:Some content for super-file
		EOF

		GIT_TRACE2_EVENT="$(pwd)/trace2.log" git grep -e content \
			--recurse-submodules HEAD^ >actual &&
		test_cmp expect actual &&
		# Verify that we actually fetched data from the promisor remote:
		grep \"category\":\"promisor\",\"key\":\"fetch_count\",\"value\":\"1\" trace2.log
	)
'

test_done
Commit	Line	Data
0281e487 BW	1	#!/bin/sh
	2
	3	test_description='Test grep recurse-submodules feature
	4
	5	This test verifies the recurse-submodules feature correctly greps across
	6	submodules.
	7	'
	8
	9	. ./test-lib.sh
	10
18a2f66d JT	11	GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
	12	export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
	13
0281e487	14	test_expect_success 'setup directory structure and submodule' '
5d52a30e	15	echo "(1\|2)d(3\|4)" >a &&
0281e487	16	mkdir b &&
5d52a30e	17	echo "(3\|4)" >b/b &&
0281e487 BW	18	git add a b &&
0281e487 BW	19	git commit -m "add a and b" &&
663d2501	20	test_tick &&
0281e487	21	git init submodule &&
5d52a30e	22	echo "(1\|2)d(3\|4)" >submodule/a &&
0281e487 BW	23	git -C submodule add a &&
	24	git -C submodule commit -m "add a" &&
	25	git submodule add ./submodule &&
663d2501 NTND	26	git commit -m "added submodule" &&
663d2501 NTND	27	test_tick
0281e487 BW	28	'
	29
	30	test_expect_success 'grep correctly finds patterns in a submodule' '
	31	cat >expect <<-\EOF &&
5d52a30e ÆAB	32	a:(1\|2)d(3\|4)
	33	b/b:(3\|4)
	34	submodule/a:(1\|2)d(3\|4)
0281e487 BW	35	EOF
0281e487 BW	36
5d52a30e	37	git grep -e "(3\|4)" --recurse-submodules >actual &&
0281e487 BW	38	test_cmp expect actual
	39	'
	40
9071c078 SB	41	test_expect_success 'grep finds patterns in a submodule via config' '
	42	test_config submodule.recurse true &&
	43	# expect from previous test
	44	git grep -e "(3\|4)" >actual &&
	45	test_cmp expect actual
	46	'
	47
	48	test_expect_success 'grep --no-recurse-submodules overrides config' '
	49	test_config submodule.recurse true &&
	50	cat >expect <<-\EOF &&
	51	a:(1\|2)d(3\|4)
	52	b/b:(3\|4)
	53	EOF
	54
	55	git grep -e "(3\|4)" --no-recurse-submodules >actual &&
	56	test_cmp expect actual
	57	'
	58
0281e487 BW	59	test_expect_success 'grep and basic pathspecs' '
0281e487 BW	60	cat >expect <<-\EOF &&
5d52a30e	61	submodule/a:(1\|2)d(3\|4)
0281e487 BW	62	EOF
	63
	64	git grep -e. --recurse-submodules -- submodule >actual &&
	65	test_cmp expect actual
	66	'
	67
	68	test_expect_success 'grep and nested submodules' '
	69	git init submodule/sub &&
5d52a30e	70	echo "(1\|2)d(3\|4)" >submodule/sub/a &&
0281e487 BW	71	git -C submodule/sub add a &&
0281e487 BW	72	git -C submodule/sub commit -m "add a" &&
663d2501	73	test_tick &&
0281e487 BW	74	git -C submodule submodule add ./sub &&
	75	git -C submodule add sub &&
	76	git -C submodule commit -m "added sub" &&
663d2501	77	test_tick &&
0281e487 BW	78	git add submodule &&
0281e487 BW	79	git commit -m "updated submodule" &&
663d2501	80	test_tick &&
0281e487 BW	81
0281e487 BW	82	cat >expect <<-\EOF &&
5d52a30e ÆAB	83	a:(1\|2)d(3\|4)
	84	b/b:(3\|4)
	85	submodule/a:(1\|2)d(3\|4)
	86	submodule/sub/a:(1\|2)d(3\|4)
0281e487 BW	87	EOF
0281e487 BW	88
5d52a30e	89	git grep -e "(3\|4)" --recurse-submodules >actual &&
0281e487 BW	90	test_cmp expect actual
	91	'
	92
	93	test_expect_success 'grep and multiple patterns' '
	94	cat >expect <<-\EOF &&
5d52a30e ÆAB	95	a:(1\|2)d(3\|4)
	96	submodule/a:(1\|2)d(3\|4)
	97	submodule/sub/a:(1\|2)d(3\|4)
0281e487 BW	98	EOF
0281e487 BW	99
5d52a30e	100	git grep -e "(3\|4)" --and -e "(1\|2)" --recurse-submodules >actual &&
0281e487 BW	101	test_cmp expect actual
	102	'
	103
	104	test_expect_success 'grep and multiple patterns' '
	105	cat >expect <<-\EOF &&
5d52a30e	106	b/b:(3\|4)
0281e487 BW	107	EOF
0281e487 BW	108
5d52a30e	109	git grep -e "(3\|4)" --and --not -e "(1\|2)" --recurse-submodules >actual &&
0281e487 BW	110	test_cmp expect actual
	111	'
	112
74ed4371 BW	113	test_expect_success 'basic grep tree' '
74ed4371 BW	114	cat >expect <<-\EOF &&
5d52a30e ÆAB	115	HEAD:a:(1\|2)d(3\|4)
	116	HEAD:b/b:(3\|4)
	117	HEAD:submodule/a:(1\|2)d(3\|4)
	118	HEAD:submodule/sub/a:(1\|2)d(3\|4)
74ed4371 BW	119	EOF
74ed4371 BW	120
5d52a30e	121	git grep -e "(3\|4)" --recurse-submodules HEAD >actual &&
74ed4371 BW	122	test_cmp expect actual
	123	'
	124
	125	test_expect_success 'grep tree HEAD^' '
	126	cat >expect <<-\EOF &&
5d52a30e ÆAB	127	HEAD^:a:(1\|2)d(3\|4)
	128	HEAD^:b/b:(3\|4)
	129	HEAD^:submodule/a:(1\|2)d(3\|4)
74ed4371 BW	130	EOF
74ed4371 BW	131
5d52a30e	132	git grep -e "(3\|4)" --recurse-submodules HEAD^ >actual &&
74ed4371 BW	133	test_cmp expect actual
	134	'
	135
	136	test_expect_success 'grep tree HEAD^^' '
	137	cat >expect <<-\EOF &&
5d52a30e ÆAB	138	HEAD^^:a:(1\|2)d(3\|4)
5d52a30e ÆAB	139	HEAD^^:b/b:(3\|4)
74ed4371 BW	140	EOF
74ed4371 BW	141
5d52a30e	142	git grep -e "(3\|4)" --recurse-submodules HEAD^^ >actual &&
74ed4371 BW	143	test_cmp expect actual
	144	'
	145
	146	test_expect_success 'grep tree and pathspecs' '
	147	cat >expect <<-\EOF &&
5d52a30e ÆAB	148	HEAD:submodule/a:(1\|2)d(3\|4)
5d52a30e ÆAB	149	HEAD:submodule/sub/a:(1\|2)d(3\|4)
74ed4371 BW	150	EOF
74ed4371 BW	151
5d52a30e	152	git grep -e "(3\|4)" --recurse-submodules HEAD -- submodule >actual &&
74ed4371 BW	153	test_cmp expect actual
	154	'
	155
	156	test_expect_success 'grep tree and pathspecs' '
	157	cat >expect <<-\EOF &&
5d52a30e ÆAB	158	HEAD:submodule/a:(1\|2)d(3\|4)
5d52a30e ÆAB	159	HEAD:submodule/sub/a:(1\|2)d(3\|4)
74ed4371 BW	160	EOF
74ed4371 BW	161
5d52a30e	162	git grep -e "(3\|4)" --recurse-submodules HEAD -- "submodule*a" >actual &&
74ed4371 BW	163	test_cmp expect actual
	164	'
	165
	166	test_expect_success 'grep tree and more pathspecs' '
	167	cat >expect <<-\EOF &&
5d52a30e	168	HEAD:submodule/a:(1\|2)d(3\|4)
74ed4371 BW	169	EOF
74ed4371 BW	170
5d52a30e	171	git grep -e "(3\|4)" --recurse-submodules HEAD -- "submodul?/a" >actual &&
74ed4371 BW	172	test_cmp expect actual
	173	'
	174
	175	test_expect_success 'grep tree and more pathspecs' '
	176	cat >expect <<-\EOF &&
5d52a30e	177	HEAD:submodule/sub/a:(1\|2)d(3\|4)
74ed4371 BW	178	EOF
74ed4371 BW	179
5d52a30e	180	git grep -e "(3\|4)" --recurse-submodules HEAD -- "submodul*/sub/a" >actual &&
74ed4371 BW	181	test_cmp expect actual
	182	'
	183
	184	test_expect_success !MINGW 'grep recurse submodule colon in name' '
	185	git init parent &&
	186	test_when_finished "rm -rf parent" &&
5d52a30e	187	echo "(1\|2)d(3\|4)" >"parent/fi:le" &&
74ed4371 BW	188	git -C parent add "fi:le" &&
74ed4371 BW	189	git -C parent commit -m "add fi:le" &&
663d2501	190	test_tick &&
74ed4371 BW	191
	192	git init "su:b" &&
	193	test_when_finished "rm -rf su:b" &&
5d52a30e	194	echo "(1\|2)d(3\|4)" >"su:b/fi:le" &&
74ed4371 BW	195	git -C "su:b" add "fi:le" &&
74ed4371 BW	196	git -C "su:b" commit -m "add fi:le" &&
663d2501	197	test_tick &&
74ed4371	198
0d3beb71	199	test_config_global protocol.file.allow always &&
74ed4371 BW	200	git -C parent submodule add "../su:b" "su:b" &&
74ed4371 BW	201	git -C parent commit -m "add submodule" &&
663d2501	202	test_tick &&
74ed4371 BW	203
74ed4371 BW	204	cat >expect <<-\EOF &&
5d52a30e ÆAB	205	fi:le:(1\|2)d(3\|4)
5d52a30e ÆAB	206	su:b/fi:le:(1\|2)d(3\|4)
74ed4371	207	EOF
5d52a30e	208	git -C parent grep -e "(1\|2)d(3\|4)" --recurse-submodules >actual &&
74ed4371 BW	209	test_cmp expect actual &&
	210
	211	cat >expect <<-\EOF &&
5d52a30e ÆAB	212	HEAD:fi:le:(1\|2)d(3\|4)
5d52a30e ÆAB	213	HEAD:su:b/fi:le:(1\|2)d(3\|4)
74ed4371	214	EOF
5d52a30e	215	git -C parent grep -e "(1\|2)d(3\|4)" --recurse-submodules HEAD >actual &&
74ed4371 BW	216	test_cmp expect actual
	217	'
	218
e6fac7f3 BW	219	test_expect_success 'grep history with moved submoules' '
	220	git init parent &&
	221	test_when_finished "rm -rf parent" &&
5d52a30e	222	echo "(1\|2)d(3\|4)" >parent/file &&
e6fac7f3 BW	223	git -C parent add file &&
e6fac7f3 BW	224	git -C parent commit -m "add file" &&
663d2501	225	test_tick &&
e6fac7f3 BW	226
	227	git init sub &&
	228	test_when_finished "rm -rf sub" &&
5d52a30e	229	echo "(1\|2)d(3\|4)" >sub/file &&
e6fac7f3 BW	230	git -C sub add file &&
e6fac7f3 BW	231	git -C sub commit -m "add file" &&
663d2501	232	test_tick &&
e6fac7f3	233
0d3beb71	234	test_config_global protocol.file.allow always &&
e6fac7f3 BW	235	git -C parent submodule add ../sub dir/sub &&
e6fac7f3 BW	236	git -C parent commit -m "add submodule" &&
663d2501	237	test_tick &&
e6fac7f3 BW	238
e6fac7f3 BW	239	cat >expect <<-\EOF &&
5d52a30e ÆAB	240	dir/sub/file:(1\|2)d(3\|4)
5d52a30e ÆAB	241	file:(1\|2)d(3\|4)
e6fac7f3	242	EOF
5d52a30e	243	git -C parent grep -e "(1\|2)d(3\|4)" --recurse-submodules >actual &&
e6fac7f3 BW	244	test_cmp expect actual &&
	245
	246	git -C parent mv dir/sub sub-moved &&
	247	git -C parent commit -m "moved submodule" &&
663d2501	248	test_tick &&
e6fac7f3 BW	249
e6fac7f3 BW	250	cat >expect <<-\EOF &&
5d52a30e ÆAB	251	file:(1\|2)d(3\|4)
5d52a30e ÆAB	252	sub-moved/file:(1\|2)d(3\|4)
e6fac7f3	253	EOF
5d52a30e	254	git -C parent grep -e "(1\|2)d(3\|4)" --recurse-submodules >actual &&
e6fac7f3 BW	255	test_cmp expect actual &&
	256
	257	cat >expect <<-\EOF &&
5d52a30e ÆAB	258	HEAD^:dir/sub/file:(1\|2)d(3\|4)
5d52a30e ÆAB	259	HEAD^:file:(1\|2)d(3\|4)
e6fac7f3	260	EOF
5d52a30e	261	git -C parent grep -e "(1\|2)d(3\|4)" --recurse-submodules HEAD^ >actual &&
e6fac7f3 BW	262	test_cmp expect actual
	263	'
	264
be80a239 BW	265	test_expect_success 'grep using relative path' '
	266	test_when_finished "rm -rf parent sub" &&
	267	git init sub &&
5d52a30e	268	echo "(1\|2)d(3\|4)" >sub/file &&
be80a239 BW	269	git -C sub add file &&
be80a239 BW	270	git -C sub commit -m "add file" &&
663d2501	271	test_tick &&
be80a239 BW	272
be80a239 BW	273	git init parent &&
5d52a30e	274	echo "(1\|2)d(3\|4)" >parent/file &&
be80a239 BW	275	git -C parent add file &&
be80a239 BW	276	mkdir parent/src &&
5d52a30e	277	echo "(1\|2)d(3\|4)" >parent/src/file2 &&
be80a239	278	git -C parent add src/file2 &&
0d3beb71	279	test_config_global protocol.file.allow always &&
be80a239 BW	280	git -C parent submodule add ../sub &&
be80a239 BW	281	git -C parent commit -m "add files and submodule" &&
663d2501	282	test_tick &&
be80a239 BW	283
	284	# From top works
	285	cat >expect <<-\EOF &&
5d52a30e ÆAB	286	file:(1\|2)d(3\|4)
	287	src/file2:(1\|2)d(3\|4)
	288	sub/file:(1\|2)d(3\|4)
be80a239	289	EOF
5d52a30e	290	git -C parent grep --recurse-submodules -e "(1\|2)d(3\|4)" >actual &&
be80a239 BW	291	test_cmp expect actual &&
	292
	293	# Relative path to top
	294	cat >expect <<-\EOF &&
5d52a30e ÆAB	295	../file:(1\|2)d(3\|4)
	296	file2:(1\|2)d(3\|4)
	297	../sub/file:(1\|2)d(3\|4)
be80a239	298	EOF
5d52a30e	299	git -C parent/src grep --recurse-submodules -e "(1\|2)d(3\|4)" -- .. >actual &&
be80a239 BW	300	test_cmp expect actual &&
	301
	302	# Relative path to submodule
	303	cat >expect <<-\EOF &&
5d52a30e	304	../sub/file:(1\|2)d(3\|4)
be80a239	305	EOF
5d52a30e	306	git -C parent/src grep --recurse-submodules -e "(1\|2)d(3\|4)" -- ../sub >actual &&
be80a239 BW	307	test_cmp expect actual
	308	'
	309
	310	test_expect_success 'grep from a subdir' '
	311	test_when_finished "rm -rf parent sub" &&
	312	git init sub &&
5d52a30e	313	echo "(1\|2)d(3\|4)" >sub/file &&
be80a239 BW	314	git -C sub add file &&
be80a239 BW	315	git -C sub commit -m "add file" &&
663d2501	316	test_tick &&
be80a239 BW	317
	318	git init parent &&
	319	mkdir parent/src &&
5d52a30e	320	echo "(1\|2)d(3\|4)" >parent/src/file &&
be80a239	321	git -C parent add src/file &&
0d3beb71	322	test_config_global protocol.file.allow always &&
be80a239 BW	323	git -C parent submodule add ../sub src/sub &&
	324	git -C parent submodule add ../sub sub &&
	325	git -C parent commit -m "add files and submodules" &&
663d2501	326	test_tick &&
be80a239 BW	327
	328	# Verify grep from root works
	329	cat >expect <<-\EOF &&
5d52a30e ÆAB	330	src/file:(1\|2)d(3\|4)
	331	src/sub/file:(1\|2)d(3\|4)
	332	sub/file:(1\|2)d(3\|4)
be80a239	333	EOF
5d52a30e	334	git -C parent grep --recurse-submodules -e "(1\|2)d(3\|4)" >actual &&
be80a239 BW	335	test_cmp expect actual &&
	336
	337	# Verify grep from a subdir works
	338	cat >expect <<-\EOF &&
5d52a30e ÆAB	339	file:(1\|2)d(3\|4)
5d52a30e ÆAB	340	sub/file:(1\|2)d(3\|4)
be80a239	341	EOF
5d52a30e	342	git -C parent/src grep --recurse-submodules -e "(1\|2)d(3\|4)" >actual &&
be80a239 BW	343	test_cmp expect actual
	344	'
	345
0281e487 BW	346	test_incompatible_with_recurse_submodules ()
	347	{
	348	test_expect_success "--recurse-submodules and $1 are incompatible" "
	349	test_must_fail git grep -e. --recurse-submodules $1 2>actual &&
	350	test_i18ngrep 'not supported with --recurse-submodules' actual
	351	"
	352	}
	353
	354	test_incompatible_with_recurse_submodules --untracked
c56c48dd PB	355
	356	test_expect_success 'grep --recurse-submodules --no-index ignores --recurse-submodules' '
	357	git grep --recurse-submodules --no-index -e "^(.\|.)[\d]" >actual &&
	358	cat >expect <<-\EOF &&
	359	a:(1\|2)d(3\|4)
	360	submodule/a:(1\|2)d(3\|4)
	361	submodule/sub/a:(1\|2)d(3\|4)
	362	EOF
	363	test_cmp expect actual
	364	'
0281e487	365
5ee6f1a2 ÆAB	366	test_expect_success 'grep --recurse-submodules should pass the pattern type along' '
	367	# Fixed
	368	test_must_fail git grep -F --recurse-submodules -e "(.\|.)[\d]" &&
	369	test_must_fail git -c grep.patternType=fixed grep --recurse-submodules -e "(.\|.)[\d]" &&
	370
	371	# Basic
	372	git grep -G --recurse-submodules -e "(.\|.)[\d]" >actual &&
	373	cat >expect <<-\EOF &&
	374	a:(1\|2)d(3\|4)
	375	submodule/a:(1\|2)d(3\|4)
	376	submodule/sub/a:(1\|2)d(3\|4)
	377	EOF
	378	test_cmp expect actual &&
	379	git -c grep.patternType=basic grep --recurse-submodules -e "(.\|.)[\d]" >actual &&
	380	test_cmp expect actual &&
	381
	382	# Extended
	383	git grep -E --recurse-submodules -e "(.\|.)[\d]" >actual &&
	384	cat >expect <<-\EOF &&
	385	.gitmodules:[submodule "submodule"]
	386	.gitmodules: path = submodule
	387	.gitmodules: url = ./submodule
	388	a:(1\|2)d(3\|4)
	389	submodule/.gitmodules:[submodule "sub"]
	390	submodule/a:(1\|2)d(3\|4)
	391	submodule/sub/a:(1\|2)d(3\|4)
	392	EOF
	393	test_cmp expect actual &&
	394	git -c grep.patternType=extended grep --recurse-submodules -e "(.\|.)[\d]" >actual &&
	395	test_cmp expect actual &&
	396	git -c grep.extendedRegexp=true grep --recurse-submodules -e "(.\|.)[\d]" >actual &&
	397	test_cmp expect actual &&
	398
	399	# Perl
	400	if test_have_prereq PCRE
	401	then
	402	git grep -P --recurse-submodules -e "(.\|.)[\d]" >actual &&
	403	cat >expect <<-\EOF &&
	404	a:(1\|2)d(3\|4)
	405	b/b:(3\|4)
	406	submodule/a:(1\|2)d(3\|4)
	407	submodule/sub/a:(1\|2)d(3\|4)
	408	EOF
	409	test_cmp expect actual &&
	410	git -c grep.patternType=perl grep --recurse-submodules -e "(.\|.)[\d]" >actual &&
	411	test_cmp expect actual
	412	fi
	413	'
	414
d9b8b8f8	415	test_expect_success 'grep --recurse-submodules with submodules without .gitmodules in the working tree' '
76e9bdc4 AO	416	test_when_finished "git -C submodule checkout .gitmodules" &&
	417	rm submodule/.gitmodules &&
	418	git grep --recurse-submodules -e "(.\|.)[\d]" >actual &&
	419	cat >expect <<-\EOF &&
	420	a:(1\|2)d(3\|4)
	421	submodule/a:(1\|2)d(3\|4)
	422	submodule/sub/a:(1\|2)d(3\|4)
	423	EOF
	424	test_cmp expect actual
	425	'
	426
6a289d45 MT	427	reset_and_clean () {
	428	git reset --hard &&
	429	git clean -fd &&
	430	git submodule foreach --recursive 'git reset --hard' &&
	431	git submodule foreach --recursive 'git clean -fd'
	432	}
	433
	434	test_expect_success 'grep --recurse-submodules without --cached considers worktree modifications' '
	435	reset_and_clean &&
	436	echo "A modified line in submodule" >>submodule/a &&
	437	echo "submodule/a:A modified line in submodule" >expect &&
	438	git grep --recurse-submodules "A modified line in submodule" >actual &&
	439	test_cmp expect actual
	440	'
	441
	442	test_expect_success 'grep --recurse-submodules with --cached ignores worktree modifications' '
	443	reset_and_clean &&
	444	echo "A modified line in submodule" >>submodule/a &&
	445	test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 &&
	446	test_must_be_empty actual
	447	'
45bde58e MT	448
	449	test_expect_failure 'grep --textconv: superproject .gitattributes does not affect submodules' '
	450	reset_and_clean &&
	451	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
	452	echo "a diff=d2x" >.gitattributes &&
	453
	454	cat >expect <<-\EOF &&
	455	a:(1\|2)x(3\|4)
	456	EOF
	457	git grep --textconv --recurse-submodules x >actual &&
	458	test_cmp expect actual
	459	'
	460
	461	test_expect_failure 'grep --textconv: superproject .gitattributes (from index) does not affect submodules' '
	462	reset_and_clean &&
	463	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
	464	echo "a diff=d2x" >.gitattributes &&
	465	git add .gitattributes &&
	466	rm .gitattributes &&
	467
	468	cat >expect <<-\EOF &&
	469	a:(1\|2)x(3\|4)
	470	EOF
	471	git grep --textconv --recurse-submodules x >actual &&
	472	test_cmp expect actual
	473	'
	474
	475	test_expect_failure 'grep --textconv: superproject .git/info/attributes does not affect submodules' '
	476	reset_and_clean &&
	477	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
	478	super_attr="$(git rev-parse --git-path info/attributes)" &&
	479	test_when_finished "rm -f \"$super_attr\"" &&
	480	echo "a diff=d2x" >"$super_attr" &&
	481
	482	cat >expect <<-\EOF &&
	483	a:(1\|2)x(3\|4)
	484	EOF
	485	git grep --textconv --recurse-submodules x >actual &&
	486	test_cmp expect actual
	487	'
	488
	489	# Note: what currently prevents this test from passing is not that the
	490	# .gitattributes file from "./submodule" is being ignored, but that it is being
	491	# propagated to the nested "./submodule/sub" files.
	492	#
	493	test_expect_failure 'grep --textconv correctly reads submodule .gitattributes' '
	494	reset_and_clean &&
	495	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
	496	echo "a diff=d2x" >submodule/.gitattributes &&
	497
	498	cat >expect <<-\EOF &&
	499	submodule/a:(1\|2)x(3\|4)
	500	EOF
	501	git grep --textconv --recurse-submodules x >actual &&
	502	test_cmp expect actual
	503	'
	504
	505	test_expect_failure 'grep --textconv correctly reads submodule .gitattributes (from index)' '
	506	reset_and_clean &&
	507	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
	508	echo "a diff=d2x" >submodule/.gitattributes &&
	509	git -C submodule add .gitattributes &&
	510	rm submodule/.gitattributes &&
	511
512	cat >expect <<-\EOF &&
513	submodule/a:(1\|2)x(3\|4)
514	EOF
515	git grep --textconv --recurse-submodules x >actual &&
516	test_cmp expect actual
517	'
518
519	test_expect_failure 'grep --textconv correctly reads submodule .git/info/attributes' '
520	reset_and_clean &&
521	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
522
523	submodule_attr="$(git -C submodule rev-parse --path-format=absolute --git-path info/attributes)" &&
524	test_when_finished "rm -f \"$submodule_attr\"" &&
525	echo "a diff=d2x" >"$submodule_attr" &&
526
527	cat >expect <<-\EOF &&
528	submodule/a:(1\|2)x(3\|4)
529	EOF
530	git grep --textconv --recurse-submodules x >actual &&
531	test_cmp expect actual
532	'
533
534	test_expect_failure 'grep saves textconv cache in the appropriate repository' '
535	reset_and_clean &&
536	test_config_global diff.d2x_cached.textconv "sed -e \"s/d/x/\"" &&
537	test_config_global diff.d2x_cached.cachetextconv true &&
538	echo "a diff=d2x_cached" >submodule/.gitattributes &&
539
540	# We only read/write to the textconv cache when grepping from an OID,
541	# as the working tree file might have modifications.
542	git grep --textconv --cached --recurse-submodules x &&
543
544	super_textconv_cache="$(git rev-parse --git-path refs/notes/textconv/d2x_cached)" &&
545	sub_textconv_cache="$(git -C submodule rev-parse \
546	--path-format=absolute --git-path refs/notes/textconv/d2x_cached)" &&
547	test_path_is_missing "$super_textconv_cache" &&
548	test_path_is_file "$sub_textconv_cache"
549	'
550
f05da2b4 JS	551	test_expect_success 'grep partially-cloned submodule' '
f05da2b4 JS	552	# Set up clean superproject and submodule for partial cloning.
8a7bfa0f	553	test_config_global protocol.file.allow always &&
f05da2b4 JS	554	git init super &&
	555	git init super/sub &&
	556	(
	557	cd super &&
	558	test_commit --no-tag "Add file in superproject" \
	559	super-file "Some content for super-file" &&
	560	test_commit -C sub --no-tag "Add file in submodule" \
	561	sub-file "Some content for sub-file" &&
	562	git submodule add ./sub &&
	563	git commit -m "Add other as submodule sub" &&
	564	test_tick &&
	565	test_commit -C sub --no-tag --append "Update file in submodule" \
	566	sub-file "Some more content for sub-file" &&
	567	git add sub &&
	568	git commit -m "Update submodule" &&
	569	test_tick &&
	570	git config --local uploadpack.allowfilter 1 &&
	571	git config --local uploadpack.allowanysha1inwant 1 &&
	572	git -C sub config --local uploadpack.allowfilter 1 &&
	573	git -C sub config --local uploadpack.allowanysha1inwant 1
	574	) &&
	575	# Clone the superproject & submodule, then make sure we can lazy-fetch submodule objects.
	576	git clone --filter=blob:none --also-filter-submodules \
	577	--recurse-submodules "file://$(pwd)/super" partial &&
	578	(
	579	cd partial &&
	580	cat >expect <<-\EOF &&
	581	HEAD^:sub/sub-file:Some content for sub-file
	582	HEAD^:super-file:Some content for super-file
	583	EOF
	584
	585	GIT_TRACE2_EVENT="$(pwd)/trace2.log" git grep -e content \
	586	--recurse-submodules HEAD^ >actual &&
	587	test_cmp expect actual &&
	588	# Verify that we actually fetched data from the promisor remote:
	589	grep \"category\":\"promisor\",\"key\":\"fetch_count\",\"value\":\"1\" trace2.log
	590	)
	591	'
	592
0281e487	593	test_done