Skip to content

Commit

Permalink
Finish retry feature when pulley branch exists (var checkout was unde…
Browse files Browse the repository at this point in the history
…fined)
  • Loading branch information
doublerebel committed Dec 5, 2012
1 parent 909d67e commit 2d2b682
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pulley.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,9 @@
head_branch = pull.head.ref,
base_branch = pull.base.ref,
branch = "pull-" + id,
checkout = "git checkout " + base_branch,
checkout_cmds = [
"git checkout " + base_branch,
checkout,
"git pull " + config.remote + " " + base_branch,
"git submodule update --init",
"git checkout -b " + branch
Expand Down Expand Up @@ -186,7 +187,7 @@
function doPull( error, stdout, stderr ) {
var pull_cmds = [
"git pull " + repo + " " + head_branch,
"git checkout " + base_branch,
checkout,
"git merge --no-commit --squash " + branch
];

Expand Down

0 comments on commit 2d2b682

Please sign in to comment.