diff options
author | Taylor Blau <me@ttaylorr.com> | 2022-10-07 00:39:15 +0300 |
---|---|---|
committer | Taylor Blau <me@ttaylorr.com> | 2022-10-07 00:39:15 +0300 |
commit | 122512967e6184b1888a63ea2b6ed9ada3046b28 (patch) | |
tree | 91a2c08868d550b5ce21efd7176c4d2d634bc44f /t/t3426-rebase-submodule.sh | |
parent | 5b1c746c352e85211770e5cbd26a433b3affd3b4 (diff) | |
parent | abd4d67ab0f84fff703fa14d9eebfd287b42daeb (diff) |
Sync with 2.30.6
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 && |