From 1e6df1b77500dff40c24245227658f7c85c1835c Mon Sep 17 00:00:00 2001
From: Remi Bergsma <github@remi.nl>
Date: Mon, 24 Aug 2015 16:16:16 +0200
Subject: [PATCH] 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.
---
 tools/git/git-pr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/git/git-pr b/tools/git/git-pr
index 2e0b275e86a..2bd58f689eb 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