| Index: tests/upstream.sh
|
| diff --git a/tests/upstream.sh b/tests/upstream.sh
|
| index 0327b68227814375a726e384a5509ee3ee1ec26c..b2f8c930221f8322d4ef0355d354936d0fe12db0 100755
|
| --- a/tests/upstream.sh
|
| +++ b/tests/upstream.sh
|
| @@ -16,7 +16,8 @@ setup_gitsvn
|
| git config rietveld.server localhost:8080
|
|
|
| for ref in refs/remotes/trunk refs/remotes/some_branch; do
|
| - git checkout -q -B feature_branch $ref
|
| + git branch -f --set-upstream feature_branch $ref
|
| + git checkout -q feature_branch
|
| test_expect_success "Guessing upstream branch for $ref" \
|
| "$GIT_CL upstream | egrep -q '^$ref$'"
|
| git checkout -q master
|
|
|