summaryrefslogtreecommitdiff
path: root/t/t1508-at-combinations.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t1508-at-combinations.sh')
-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