Skip to content
This repository was archived by the owner on Feb 22, 2018. It is now read-only.

Commit a5fd4e0

Browse files
committed
chore(presubmit): Rename remote to avoid conflict.
Closes #1214
1 parent 4633451 commit a5fd4e0

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

scripts/travis/presubmit.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ if [ "$TRAVIS_REPO_SLUG" = "angular/angular.dart" ]; then
2424
git config user.name "[email protected]"
2525

2626
echo "Pushing HEAD to master..."
27-
git remote add upstream https://github.com/angular/angular.dart.git
27+
git remote add upstream-commit https://github.com/angular/angular.dart.git
2828
git stash
29-
git fetch upstream master
30-
git rebase upstream/master
31-
if git push upstream HEAD:master; then
29+
git fetch upstream-commit master
30+
git rebase upstream-commit/master
31+
if git push upstream-commit HEAD:master; then
3232
echo "$TRAVIS_BRANCH has been merged into master, deleting..."
33-
git push upstream :"$TRAVIS_BRANCH"
33+
git push upstream-commit :"$TRAVIS_BRANCH"
3434
fi
3535
fi
3636
fi

0 commit comments

Comments
 (0)