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:
Remi Bergsma 2015-08-24 16:16:16 +02:00
parent 9a24109f95
commit 1e6df1b775
1 changed files with 1 additions and 1 deletions

View File

@ -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