kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Felipe Contreras 2013-05-07 16:55:01 -05:00 committed by Junio C Hamano
parent 7d3ccdffb5
commit 1bc6d022b7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t1508-at-combinations.sh
View File

@ -31,10 +31,8 @@ test_expect_success 'setup' '
git checkout -b new-branch && git checkout -b new-branch &&
test_commit new-one && test_commit new-one &&
test_commit new-two && test_commit new-two &&
git config branch.old-branch.remote . && git branch -u master old-branch &&
git config branch.old-branch.merge refs/heads/master && git branch -u upstream-branch new-branch
git config branch.new-branch.remote . &&
git config branch.new-branch.merge refs/heads/upstream-branch
' '


check HEAD new-two check HEAD new-two