diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-06 17:42:55 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-06 17:42:55 -0400 |
| commit | 478a426f14b92cef92fc09df442b356a53f6fa8f (patch) | |
| tree | 1f2dcc827b46b148cc2305f48f35bb233d437fa7 /t/t3426-rebase-submodule.sh | |
| parent | f2eed22852b0a21556f0c9f56732913eba553e62 (diff) | |
| parent | 7800e1dccf622ba8d490b4c1c92af734be6242ff (diff) | |
| download | git-478a426f14b92cef92fc09df442b356a53f6fa8f.tar.gz | |
Sync with 2.33.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 && |