Merge pull request #2755 from aanand/fix-rebase-script

Fix rebase-bump-commit script
2016-01-27 02:05:24 +00:00 · 2016-01-27 02:05:24 +00:00 · 3aa545eb8e
parent ca81672b82 e40a46349f
commit 3aa545eb8e
1 changed files with 1 additions and 1 deletions
--- a/script/release/rebase-bump-commit
+++ b/script/release/rebase-bump-commit
@ -32,7 +32,7 @@ if [[ "$sha" == "$(git rev-parse HEAD)" ]]; then
    exit 0
 fi

-commits=$(git log --format="%H" "$sha..HEAD" | wc -l)
+commits=$(git log --format="%H" "$sha..HEAD" | wc -l | xargs echo)

 git rebase --onto $sha~1 HEAD~$commits $BRANCH
 git cherry-pick $sha