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 <artagnon@gmail.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 7, 2013 at 16:55 UTC
1bc6d022b731e4cf69de42fea75c5f6366d2dbae
1 file changed
+2
-4
t/t1508-at-combinations.sh
+2
-4
@@ -31,10 +31,8 @@ test_expect_success 'setup' '
31
git checkout -b new-branch &&
32
test_commit new-one &&
33
test_commit new-two &&
34
- git config branch.old-branch.remote . &&
35
- git config branch.old-branch.merge refs/heads/master &&
36
- git config branch.new-branch.remote . &&
37
- git config branch.new-branch.merge refs/heads/upstream-branch
34
+ git branch -u master old-branch &&
35
+ git branch -u upstream-branch new-branch
36
'
37
38
check HEAD new-two