diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-06 17:42:02 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-06 17:42:02 -0400 |
| commit | 3957f3c84e89c68e8bf3f7cb172ba6837af70506 (patch) | |
| tree | d6dd7331dcd0049d54476275a3707d6637851aaa /t/t4060-diff-submodule-option-diff-format.sh | |
| parent | 80c525c4acaf6072697d4bd2a3a5137f91665b55 (diff) | |
| parent | af778cd9be6307e34f9f900fd42eb826c65b32da (diff) | |
| download | git-3957f3c84e89c68e8bf3f7cb172ba6837af70506.tar.gz | |
Sync with 2.32.4
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 't/t4060-diff-submodule-option-diff-format.sh')
| -rwxr-xr-x | t/t4060-diff-submodule-option-diff-format.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh index dc7b242697..a90add57f7 100755 --- a/t/t4060-diff-submodule-option-diff-format.sh +++ b/t/t4060-diff-submodule-option-diff-format.sh @@ -759,9 +759,9 @@ test_expect_success 'diff --submodule=diff with .git file' ' ' test_expect_success 'setup nested submodule' ' - git submodule add -f ./sm2 && + git -c protocol.file.allow=always submodule add -f ./sm2 && git commit -a -m "add sm2" && - git -C sm2 submodule add ../sm2 nested && + git -c protocol.file.allow=always -C sm2 submodule add ../sm2 nested && git -C sm2 commit -a -m "nested sub" && head10=$(git -C sm2 rev-parse --short --verify HEAD) ' |