t9390: use the correct prereq when using "funny" file names

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin 2020-10-21 19:23:35 +02:00
parent 580e0f0395
commit 6c475a7e09

View File

@ -298,7 +298,7 @@ setup_metasyntactic_repo() {
) )
} }
test_expect_success '--tag-rename' ' test_expect_success FUNNYNAMES '--tag-rename' '
setup_metasyntactic_repo && setup_metasyntactic_repo &&
( (
git clone file://"$(pwd)"/metasyntactic tag_rename && git clone file://"$(pwd)"/metasyntactic tag_rename &&
@ -342,7 +342,7 @@ test_expect_success 'tag of tag before relevant portion of history' '
) )
' '
test_expect_success '--subdirectory-filter' ' test_expect_success FUNNYNAMES '--subdirectory-filter' '
setup_metasyntactic_repo && setup_metasyntactic_repo &&
( (
git clone file://"$(pwd)"/metasyntactic subdir_filter && git clone file://"$(pwd)"/metasyntactic subdir_filter &&
@ -361,7 +361,7 @@ test_expect_success '--subdirectory-filter' '
) )
' '
test_expect_success '--subdirectory-filter with trailing slash' ' test_expect_success FUNNYNAMES '--subdirectory-filter with trailing slash' '
setup_metasyntactic_repo && setup_metasyntactic_repo &&
( (
git clone file://"$(pwd)"/metasyntactic subdir_filter_2 && git clone file://"$(pwd)"/metasyntactic subdir_filter_2 &&
@ -380,7 +380,7 @@ test_expect_success '--subdirectory-filter with trailing slash' '
) )
' '
test_expect_success '--to-subdirectory-filter' ' test_expect_success FUNNYNAMES '--to-subdirectory-filter' '
setup_metasyntactic_repo && setup_metasyntactic_repo &&
( (
git clone file://"$(pwd)"/metasyntactic to_subdir_filter && git clone file://"$(pwd)"/metasyntactic to_subdir_filter &&
@ -400,7 +400,7 @@ test_expect_success '--to-subdirectory-filter' '
) )
' '
test_expect_success '--use-base-name' ' test_expect_success FUNNYNAMES '--use-base-name' '
setup_metasyntactic_repo && setup_metasyntactic_repo &&
( (
git clone file://"$(pwd)"/metasyntactic use_base_name && git clone file://"$(pwd)"/metasyntactic use_base_name &&
@ -419,7 +419,7 @@ test_expect_success '--use-base-name' '
) )
' '
test_expect_success 'refs/replace/ to skip a parent' ' test_expect_success FUNNYNAMES 'refs/replace/ to skip a parent' '
setup_metasyntactic_repo && setup_metasyntactic_repo &&
( (
git clone file://"$(pwd)"/metasyntactic replace_skip_ref && git clone file://"$(pwd)"/metasyntactic replace_skip_ref &&
@ -441,7 +441,7 @@ test_expect_success 'refs/replace/ to skip a parent' '
) )
' '
test_expect_success 'refs/replace/ to add more initial history' ' test_expect_success FUNNYNAMES 'refs/replace/ to add more initial history' '
setup_metasyntactic_repo && setup_metasyntactic_repo &&
( (
git clone file://"$(pwd)"/metasyntactic replace_add_refs && git clone file://"$(pwd)"/metasyntactic replace_add_refs &&
@ -476,7 +476,7 @@ test_expect_success 'refs/replace/ to add more initial history' '
) )
' '
test_expect_success 'creation/deletion/updating of replace refs' ' test_expect_success FUNNYNAMES 'creation/deletion/updating of replace refs' '
setup_metasyntactic_repo && setup_metasyntactic_repo &&
( (
git clone file://"$(pwd)"/metasyntactic replace_handling && git clone file://"$(pwd)"/metasyntactic replace_handling &&
@ -535,7 +535,7 @@ test_expect_success 'creation/deletion/updating of replace refs' '
) )
' '
test_expect_success '--debug' ' test_expect_success FUNNYNAMES '--debug' '
setup_metasyntactic_repo && setup_metasyntactic_repo &&
( (
git clone file://"$(pwd)"/metasyntactic debug && git clone file://"$(pwd)"/metasyntactic debug &&
@ -558,7 +558,7 @@ test_expect_success '--debug' '
) )
' '
test_expect_success '--dry-run' ' test_expect_success FUNNYNAMES '--dry-run' '
setup_metasyntactic_repo && setup_metasyntactic_repo &&
( (
git clone file://"$(pwd)"/metasyntactic dry_run && git clone file://"$(pwd)"/metasyntactic dry_run &&
@ -586,7 +586,7 @@ test_expect_success '--dry-run' '
) )
' '
test_expect_success '--dry-run --debug' ' test_expect_success FUNNYNAMES '--dry-run --debug' '
setup_metasyntactic_repo && setup_metasyntactic_repo &&
( (
git clone file://"$(pwd)"/metasyntactic dry_run_debug && git clone file://"$(pwd)"/metasyntactic dry_run_debug &&
@ -614,7 +614,7 @@ test_expect_success '--dry-run --debug' '
) )
' '
test_expect_success '--dry-run --stdin' ' test_expect_success FUNNYNAMES '--dry-run --stdin' '
setup_metasyntactic_repo && setup_metasyntactic_repo &&
( (
git clone file://"$(pwd)"/metasyntactic dry_run_stdin && git clone file://"$(pwd)"/metasyntactic dry_run_stdin &&
@ -1565,7 +1565,7 @@ test_expect_success '--state-branch with expanding paths and refs' '
) )
' '
test_expect_success 'degenerate merge with non-matching filenames' ' test_expect_success FUNNYNAMES 'degenerate merge with non-matching filenames' '
test_create_repo degenerate_merge_differing_filenames && test_create_repo degenerate_merge_differing_filenames &&
( (
cd degenerate_merge_differing_filenames && cd degenerate_merge_differing_filenames &&