diff options
| author |  Yann Droneaud <ydroneaud@opteya.com> | 2013-03-24 22:06:04 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-03-25 08:50:53 -0700 |
| commit | aac6c2f4bcea6bd371ef8b25edb991673a14d5b3 (patch) | |
| tree | 0535dc3cc28a8b7275a639871dc0602196d731bd | |
| parent | t3400: use test_config to set/unset git config variables (diff) | |
| download | tgif-aac6c2f4bcea6bd371ef8b25edb991673a14d5b3.tar.xz | |
t4304: use test_config to set/unset git config variables
Instead of using construct such as:
test_when_finished "git config --unset <key>"
git config <key> <value>
uses
test_config <key> <value>
The latter takes care of removing <key> at the end of the test.
Tests are modified to assume correct (default) configuration at entry,
and to reset the modified configuration variables at the end.
Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 15dcbd42d3..a58406d12f 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -937,8 +937,7 @@ test_expect_success 'rebase --edit-todo can be used to modify todo' ' test_expect_success 'rebase -i respects core.commentchar' ' git reset --hard && git checkout E^0 && - git config core.commentchar "\\" && - test_when_finished "git config --unset core.commentchar" && + test_config core.commentchar "\\" && write_script remove-all-but-first.sh <<-\EOF && sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" && mv "$1.tmp" "$1" |