summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Yann Droneaud <ydroneaud@opteya.com>2013-03-24 22:06:03 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-25 08:50:53 -0700
commit55adef06506b27c3f8d9e16c77bdf4e2e83678e9 (patch)
tree0127350f0dd5291d7492a5e6cdb3b1cbcd9524f0
parentdiff.c: diff.renamelimit => diff.renameLimit in message (diff)
downloadtgif-55adef06506b27c3f8d9e16c77bdf4e2e83678e9.tar.xz
t3400: 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. Signed-off-by: Yann Droneaud <ydroneaud@opteya.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t3400-rebase.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 1de0ebda25..f6cc102657 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -138,8 +138,7 @@ test_expect_success 'rebase a single mode change' '
'
test_expect_success 'rebase is not broken by diff.renames' '
- git config diff.renames copies &&
- test_when_finished "git config --unset diff.renames" &&
+ test_config diff.renames copies &&
git checkout filemove &&
GIT_TRACE=1 git rebase force-3way
'