mirror of
https://github.com/docker/compose.git
synced 2025-04-08 17:05:13 +02:00
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:
parent
4b84d088e0
commit
e40a46349f
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user