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.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1e6df1b7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1e6df1b7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1e6df1b7 Branch: refs/heads/deploy-from-snapshot Commit: 1e6df1b77500dff40c24245227658f7c85c1835c Parents: 9a24109 Author: Remi Bergsma <git...@remi.nl> Authored: Mon Aug 24 16:16:16 2015 +0200 Committer: Remi Bergsma <git...@remi.nl> Committed: Mon Aug 24 16:16:16 2015 +0200 ---------------------------------------------------------------------- tools/git/git-pr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e6df1b7/tools/git/git-pr ---------------------------------------------------------------------- diff --git a/tools/git/git-pr b/tools/git/git-pr index 2e0b275..2bd58f6 100755 --- a/tools/git/git-pr +++ b/tools/git/git-pr @@ -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
