docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix rebase-bump-commit script 

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

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2016-01-26 17:41:26 +00:00
parent 4b84d088e0
commit e40a46349f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/release/rebase-bump-commit
View File

@ -32,7 +32,7 @@ if [[ "$sha" == "$(git rev-parse HEAD)" ]]; then
exit 0 exit 0
fi 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 rebase --onto $sha~1 HEAD~$commits $BRANCH
git cherry-pick $sha git cherry-pick $sha