t5520: use test_config to set/unset git config variables (leftover bits)
Configuration from test_config does not last beyond the end of the current test assertion, making each test easier to think about in isolation. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra committed
Mar 28, 2013 at 18:10 UTC
790f2827378ef99ce1e7dd9b1d3ce42d222d26bd
1 file changed
+3
-3
t/t5520-pull.sh
+3
-3
@@ -167,9 +167,9 @@ test_expect_success 'pull --rebase dies early with dirty working directory' '
167
git update-ref refs/remotes/me/copy copy^ &&
168
COPY=$(git rev-parse --verify me/copy) &&
169
git rebase --onto $COPY copy &&
170
- git config branch.to-rebase.remote me &&
171
- git config branch.to-rebase.merge refs/heads/copy &&
172
- git config branch.to-rebase.rebase true &&
170
+ test_config branch.to-rebase.remote me &&
171
+ test_config branch.to-rebase.merge refs/heads/copy &&
172
+ test_config branch.to-rebase.rebase true &&
173
echo dirty >> file &&
174
git add file &&
175
test_must_fail git pull &&