diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-07 03:00:04 +0300 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-07 03:00:04 +0300 |
| commit | f64d4ca8d65bdca39da444d24bde94864ac01bb1 (patch) | |
| tree | edc9055c3dc8e378474c951ad6a3513deaa777d0 /t/t3426-rebase-submodule.sh | |
| parent | 3dcec76d9df911ed8321007b1d197c1a206dc164 (diff) | |
| parent | 83d5e3341b69b3116675f13d2fab208a12c79e27 (diff) | |
Sync with 2.37.4
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 7a9f1127a4..ba069dccbd 100755 --- a/t/t3426-rebase-submodule.sh +++ b/t/t3426-rebase-submodule.sh @@ -48,7 +48,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 && |