Explorar el Código

Fix rebase-bump-commit script

Trim whitespace from wc's output before constructing arguments to `git rebase`

Signed-off-by: Aanand Prasad <[email protected]>
Aanand Prasad hace 9 años
padre
commit
e40a46349f
Se han modificado 1 ficheros con 1 adiciones y 1 borrados
  1. 1 1
      script/release/rebase-bump-commit

+ 1 - 1
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