Skip to content

Commit

Permalink
attempt-backport: use the "origin" git remote
Browse files Browse the repository at this point in the history
Refs: nodejs#90
  • Loading branch information
Fishrock123 committed Nov 16, 2016
1 parent eada278 commit 187cbd8
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions scripts/attempt-backport.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,13 @@ function attemptBackport (options, version, isLTS, cb) {
}

function gitCheckout () {
options.logger.debug(`checking out upstream/v${version}.x-staging...`)
wrapCP('git', ['checkout', `upstream/v${version}.x-staging`], gitReset)
options.logger.debug(`checking out origin/v${version}.x-staging...`)
wrapCP('git', ['checkout', `origin/v${version}.x-staging`], gitReset)
}

function gitReset () {
options.logger.debug(`resetting upstream/v${version}.x-staging...`)
wrapCP('git', ['reset', `upstream/v${version}.x-staging`, '--hard'], fetchDiff)
options.logger.debug(`resetting origin/v${version}.x-staging...`)
wrapCP('git', ['reset', `origin/v${version}.x-staging`, '--hard'], fetchDiff)
}

function fetchDiff () {
Expand Down

0 comments on commit 187cbd8

Please sign in to comment.