aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7400-submodule-basic.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-07-24 13:44:24 -0700
committerJunio C Hamano <gitster@pobox.com>2025-07-24 13:56:46 -0700
commit9305027adef9b8e8de8b2bee11dd442c7e579490 (patch)
treeba6689e3b450ae498d9e42f2d96ef7f5c60c1cfb /t/t7400-submodule-basic.sh
parentsubmodule: skip redundant active entries when pattern covers path (diff)
downloadgit-9305027adef9b8e8de8b2bee11dd442c7e579490.tar.gz
git-9305027adef9b8e8de8b2bee11dd442c7e579490.zip
fixup! submodule: prevent overwriting .gitmodules on path reuse
Diffstat (limited to 't/t7400-submodule-basic.sh')
-rwxr-xr-xt/t7400-submodule-basic.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 6812df3081..fd3e7e355e 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -1500,7 +1500,8 @@ test_expect_success 'submodule add fails when name is reused' '
# Now adding a *new* repo at the old name must fail
git init ../child2-origin &&
git -C ../child2-origin commit --allow-empty -m init &&
- test_must_fail git submodule add ../child2-origin child
+ test_must_fail git submodule add ../child2-origin child 2>err &&
+ test_grep "already used for" err
)
'