Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes: >> +test_expect_success 'deny wrong log.diffMerges config' ' >> + git config log.diffMerges wrong-value && >> + test_expect_code 128 git log && >> + git config --unset log.diffMerges > > Don't use "git config", but "test_config" at the start, then you don't > need the --unset at the end, it'll happen automatically. Ditto for the > following tests. More importantly, test_config arranges the unset to happen even if a step in the middle (e.g. test_expect_code in the above example) fails. In the posted version, the control would not reach the "git config --unset" and leaves the configuration behind. And that is the biggest reason why the above should use test_config. Thanks for a good suggestion.
