mirror of https://github.com/apache/cloudstack.git
fixed hardcoded merge message location
This would be empty if run from another directory, resulting in a merge message with only a 'signed-off by' line.
This commit is contained in:
parent
9a24109f95
commit
1e6df1b775
|
|
@ -217,7 +217,7 @@ echo "INFO: ********************************************************************
|
|||
|
||||
# Do the actual merge
|
||||
git fetch ${github_remote} pull/${prId}/head:pr/${prId}
|
||||
git merge --no-ff --log -m "$(cat .git-tmp-message.txt)" pr/${prId}
|
||||
git merge --no-ff --log -m "$(cat ${tmpMessageFile})" pr/${prId}
|
||||
if [ $? -eq 0 ]; then
|
||||
git commit --amend -s --allow-empty-message -m ''
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in New Issue