Skip to content

Commit 790f282

Browse files
artagnongitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent cee683b commit 790f282

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

t/t5520-pull.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ test_expect_success 'pull --rebase dies early with dirty working directory' '
167167
git update-ref refs/remotes/me/copy copy^ &&
168168
COPY=$(git rev-parse --verify me/copy) &&
169169
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 &&
173173
echo dirty >> file &&
174174
git add file &&
175175
test_must_fail git pull &&

0 commit comments

Comments
 (0)