Re: [PATCH 2/3] rebase tests: use test_unconfig after test_config
From: Phillip Wood <hidden>
Date: 2021-03-30 13:54:31
Hi Ævar On 22/03/2021 11:48, Ævar Arnfjörð Bjarmason wrote:
quoted hunk ↗ jump to hunk
Fix a test added in 906b63942ac (rebase --am: ignore rebase.rescheduleFailedExec, 2019-07-01) to reset its config after it runs. This doesn't matter now since it's the last test in the file, but will in a subsequent commit where I'll add new tests after this one. Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- t/t3418-rebase-continue.sh | 1 + 1 file changed, 1 insertion(+)diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index fe407e63cf1..ea14ef496cb 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh@@ -283,6 +283,7 @@ test_expect_success '--reschedule-failed-exec' ' ' test_expect_success 'rebase.rescheduleFailedExec only affects `rebase -i`' ' + test_when_finished "test_unconfig rebase.rescheduleFailedExec" &&
I think test_config adds this test_when_finished line itself. See
test-lib-functions.sh:
# Set git config, automatically unsetting it after the test is over.
test_config () {
config_dir=
if test "$1" = -C
then
shift
config_dir=$1
shift
fi
test_when_finished "test_unconfig ${config_dir:+-C '$config_dir'} '$1'" &&
git ${config_dir:+-C "$config_dir"} config "$@"
}
Best Wishes
Phillip
Best Wishes
Phillip
test_config rebase.rescheduleFailedExec true && test_must_fail git rebase -x false HEAD^ && grep "^exec false" .git/rebase-merge/git-rebase-todo &&