summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-05-07 21:55:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-05-08 04:46:11 (GMT)
commit1bc6d022b731e4cf69de42fea75c5f6366d2dbae (patch)
tree5687d7ffa633731aa90d38736d6b06ec3c3c3605 /t
parent7d3ccdffb5d28970dd7a4d177cfcca690ccd0c22 (diff)
downloadgit-1bc6d022b731e4cf69de42fea75c5f6366d2dbae.zip
git-1bc6d022b731e4cf69de42fea75c5f6366d2dbae.tar.gz
git-1bc6d022b731e4cf69de42fea75c5f6366d2dbae.tar.bz2
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>
Diffstat (limited to 't')
-rwxr-xr-xt/t1508-at-combinations.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh
index d5d6244..46e3f16 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