Skip to content

Commit 4cfc47d

Browse files
committed
t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
In v2.20.x, Git clones submodules recursively by first creating the submodules' gitdirs and _then_ "updating" the submodules. This can lead to the situation where the clone path is taken because the directory (while it exists already) is not a git directory, but then the clone fails because that gitdir is unexpectedly already a directory. This _also_ works around the vulnerability that was fixed in "Disallow dubiously-nested submodule git directories", but it produces a different error message than the one expected by the test case, therefore we adjust the test case accordingly. Note: as the two submodules "race each other", there are actually two possible error messages, therefore we have to teach the test case to expect _two_ possible (and good) outcomes in addition to the one it expected before. Note: this workaround is only necessary for the v2.20.x release train; The behavior changed again in v2.21.x so that the original test case's expectations are met again. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent d851d94 commit 4cfc47d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t7415-submodule-names.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ test_expect_success 'git dirs of sibling submodules must not be nested' '
244244
git commit -m nested
245245
) &&
246246
test_must_fail git clone --recurse-submodules nested clone 2>err &&
247-
test_i18ngrep "is inside git dir" err
247+
test_i18ngrep -E "(is inside git dir|hippo already exists|not a git repository: .*/hippo)" err
248248
'
249249

250250
test_done

0 commit comments

Comments
 (0)