Skip to content

Commit

Permalink
t3400: use test_config to set/unset git config variables
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yann Droneaud authored and Junio C Hamano committed Mar 25, 2013
1 parent c9fc441 commit 55adef0
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions t/t3400-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'
Expand Down

0 comments on commit 55adef0

Please sign in to comment.