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/t3420-rebase-autostash.sh | |
| parent | 5b1c746c352e85211770e5cbd26a433b3affd3b4 (diff) | |
| parent | abd4d67ab0f84fff703fa14d9eebfd287b42daeb (diff) | |
Sync with 2.30.6
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 't/t3420-rebase-autostash.sh')
| -rwxr-xr-x | t/t3420-rebase-autostash.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 43fcb68f27..693934ee8b 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -310,7 +310,7 @@ test_expect_success 'autostash is saved on editor failure with conflict' ' test_expect_success 'autostash with dirty submodules' ' test_when_finished "git reset --hard && git checkout main" && git checkout -b with-submodule && - git submodule add ./ sub && + git -c protocol.file.allow=always submodule add ./ sub && test_tick && git commit -m add-submodule && echo changed >sub/file0 && |