From: Felipe Contreras Date: Tue, 7 May 2013 21:55:01 +0000 (-0500) Subject: tests: at-combinations: simplify setup X-Git-Tag: v1.8.4-rc0~180^2~12 X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=1bc6d022b731e4cf69de42fea75c5f6366d2dbae;p=git.git tests: at-combinations: simplify setup The test is setting up an upstream branch, but there's a much simpler way of doing that: git branch -u. Signed-off-by: Ramkumar Ramachandra Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh index d5d6244178..46e3f166a6 100755 --- a/t/t1508-at-combinations.sh +++ b/t/t1508-at-combinations.sh @@ -31,10 +31,8 @@ test_expect_success 'setup' ' git checkout -b new-branch && test_commit new-one && test_commit new-two && - git config branch.old-branch.remote . && - git config branch.old-branch.merge refs/heads/master && - git config branch.new-branch.remote . && - git config branch.new-branch.merge refs/heads/upstream-branch + git branch -u master old-branch && + git branch -u upstream-branch new-branch ' check HEAD new-two