diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-04 21:47:25 (GMT) |
---|---|---|
committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-06 15:31:14 (GMT) |
commit | d9061ed9dacb5657bcff4260fc35a831946907ec (patch) | |
tree | 8fa50ba556fb013f388c7ca54ea7a9f97f82ce2b /t | |
parent | fc346cb2925d4647ccd65177660bffab13cbe253 (diff) | |
download | git-d9061ed9dacb5657bcff4260fc35a831946907ec.zip git-d9061ed9dacb5657bcff4260fc35a831946907ec.tar.gz git-d9061ed9dacb5657bcff4260fc35a831946907ec.tar.bz2 |
t7415: drop v2.20.x-specific work-around
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 <johannes.schindelin@gmx.de>
Diffstat (limited to 't')
-rwxr-xr-x | t/t7415-submodule-names.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7415-submodule-names.sh b/t/t7415-submodule-names.sh index 0f040e3..905a557 100755 --- 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 |