diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-07 00:40:44 +0300 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-07 00:40:44 +0300 |
| commit | 9cbd2827c5a19d935054cdb162e53e5703be09f4 (patch) | |
| tree | f7850cda5827aacd30b18b9d9f6494d46d3dc4d6 /t/t3426-rebase-submodule.sh | |
| parent | 067aa8fb41d09814d26f82515573b067feba87ba (diff) | |
| parent | ecf9b4a443ecd2c7dc759e5d18f226694bc3eced (diff) | |
Sync with 2.31.5
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 't/t3426-rebase-submodule.sh')
| -rwxr-xr-x | t/t3426-rebase-submodule.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t3426-rebase-submodule.sh b/t/t3426-rebase-submodule.sh index 0ad3a07bf4..fb21f675bb 100755 --- a/t/t3426-rebase-submodule.sh +++ b/t/t3426-rebase-submodule.sh @@ -47,7 +47,8 @@ test_expect_success 'rebase interactive ignores modified submodules' ' git init sub && git -C sub commit --allow-empty -m "Initial commit" && git init super && - git -C super submodule add ../sub && + git -c protocol.file.allow=always \ + -C super submodule add ../sub && git -C super config submodule.sub.ignore dirty && >super/foo && git -C super add foo && |