Skip to content

Commit

Permalink
fix: compare lease against proper remote
Browse files Browse the repository at this point in the history
fixes #174
  • Loading branch information
travi authored and janl committed Jul 16, 2018
1 parent ef7e8a1 commit 6af2d1f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module.exports = function upload () {
const err = fs.openSync('gk-lockfile-git-push.err', 'w')

exec(`git remote add gk-origin ${remote} || git remote set-url gk-origin ${remote}`)
exec(`git push${process.env.GK_LOCK_COMMIT_AMEND ? ' --force-with-lease' : ''} gk-origin HEAD:${info.branchName}`, {
exec(`git push${process.env.GK_LOCK_COMMIT_AMEND ? ` --force-with-lease=${info.branchName}:origin/${info.branchName}` : ''} gk-origin HEAD:${info.branchName}`, {
stdio: [
'pipe',
'pipe',
Expand Down

0 comments on commit 6af2d1f

Please sign in to comment.