t7415: drop v2.20.x-specific work-around

dscho · dscho · commit d9061ed9dacb · 2019-12-06T16:31:14.000+01:00
This reverts the work-around that was introduced just for the v2.20.x
release train in "t7415: adjust test for dubiously-nested submodule
gitdirs for v2.20.x"; It is not necessary for v2.21.x.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/t/t7415-submodule-names.sh b/t/t7415-submodule-names.sh
@@ -244,7 +244,7 @@ test_expect_success 'git dirs of sibling submodules must not be nested' '
 		git commit -m nested
 	) &&
 	test_must_fail git clone --recurse-submodules nested clone 2>err &&
-	test_i18ngrep -E "(is inside git dir|hippo already exists|not a git repository: .*/hippo)" err
+	test_i18ngrep "is inside git dir" err
 '
 
 test_done

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ test_expect_success 'git dirs of sibling submodules must not be nested' '`
`244`	`244`	`git commit -m nested`
`245`	`245`	`) &&`
`246`	`246`	`test_must_fail git clone --recurse-submodules nested clone 2>err &&`
`247`		`- test_i18ngrep -E "(is inside git dir\|hippo already exists\|not a git repository: .*/hippo)" err`
	`247`	`+ test_i18ngrep "is inside git dir" err`
`248`	`248`	`'`
`249`	`249`
`250`	`250`	`test_done`