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>
This commit is contained in:
Felipe Contreras 2013-05-07 16:55:01 -05:00 коммит произвёл Junio C Hamano
Родитель 7d3ccdffb5
Коммит 1bc6d022b7
1 изменённых файлов: 2 добавлений и 4 удалений

Просмотреть файл

@ -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