diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2013-03-28 12:40:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-28 15:16:07 (GMT) |
| commit | 790f2827378ef99ce1e7dd9b1d3ce42d222d26bd (patch) | |
| tree | c1f65d5ca70fd227bbb589501d7de1d81cdb3b00 /t/t5520-pull.sh | |
| parent | cee683b72eac1a1ac0fcbaabf5256a5f0aff07f7 (diff) | |
| download | git-790f2827378ef99ce1e7dd9b1d3ce42d222d26bd.zip git-790f2827378ef99ce1e7dd9b1d3ce42d222d26bd.tar.gz git-790f2827378ef99ce1e7dd9b1d3ce42d222d26bd.tar.bz2 | |
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>
Diffstat (limited to 't/t5520-pull.sh')
| -rwxr-xr-x | t/t5520-pull.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index cb1a4c5..6af6c63 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -167,9 +167,9 @@ test_expect_success 'pull --rebase dies early with dirty working directory' ' git update-ref refs/remotes/me/copy copy^ && COPY=$(git rev-parse --verify me/copy) && git rebase --onto $COPY copy && - git config branch.to-rebase.remote me && - git config branch.to-rebase.merge refs/heads/copy && - git config branch.to-rebase.rebase true && + test_config branch.to-rebase.remote me && + test_config branch.to-rebase.merge refs/heads/copy && + test_config branch.to-rebase.rebase true && echo dirty >> file && git add file && test_must_fail git pull && |