зеркало из https://github.com/microsoft/git.git
Merge branch 'rt/commit-cleanup-config'
Fix tests that contaminated their environments and affected new tests introduced later in the sequence by containing their effects in their own subshells. * rt/commit-cleanup-config: t7502: perform commits using alternate editor in a subshell
This commit is contained in:
Коммит
dcf0d12aed
|
@ -263,32 +263,40 @@ test_expect_success 'cleanup commit message (fail on invalid cleanup mode config
|
|||
test_expect_success 'cleanup commit message (no config and no option uses default)' '
|
||||
echo content >>file &&
|
||||
git add file &&
|
||||
test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
|
||||
git commit --no-status &&
|
||||
(
|
||||
test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
|
||||
git commit --no-status
|
||||
) &&
|
||||
commit_msg_is "commit message"
|
||||
'
|
||||
|
||||
test_expect_success 'cleanup commit message (option overrides default)' '
|
||||
echo content >>file &&
|
||||
git add file &&
|
||||
test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
|
||||
git commit --cleanup=whitespace --no-status &&
|
||||
(
|
||||
test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
|
||||
git commit --cleanup=whitespace --no-status
|
||||
) &&
|
||||
commit_msg_is "commit message # comment"
|
||||
'
|
||||
|
||||
test_expect_success 'cleanup commit message (config overrides default)' '
|
||||
echo content >>file &&
|
||||
git add file &&
|
||||
test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
|
||||
git -c commit.cleanup=whitespace commit --no-status &&
|
||||
(
|
||||
test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
|
||||
git -c commit.cleanup=whitespace commit --no-status
|
||||
) &&
|
||||
commit_msg_is "commit message # comment"
|
||||
'
|
||||
|
||||
test_expect_success 'cleanup commit message (option overrides config)' '
|
||||
echo content >>file &&
|
||||
git add file &&
|
||||
test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
|
||||
git -c commit.cleanup=whitespace commit --cleanup=default &&
|
||||
(
|
||||
test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
|
||||
git -c commit.cleanup=whitespace commit --cleanup=default
|
||||
) &&
|
||||
commit_msg_is "commit message"
|
||||
'
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче