Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8E49618D77 for ; Mon, 24 Aug 2015 20:16:23 +0000 (UTC) Received: (qmail 72713 invoked by uid 500); 24 Aug 2015 20:16:23 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 72570 invoked by uid 500); 24 Aug 2015 20:16:23 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 72560 invoked by uid 99); 24 Aug 2015 20:16:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Aug 2015 20:16:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 08A92E0616; Mon, 24 Aug 2015 20:16:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Mon, 24 Aug 2015 20:16:25 -0000 Message-Id: <30a2171e1b7e40fa9734541c05b4ce93@git.apache.org> In-Reply-To: <9f9c25533d274b83aed0e7c4769fedd6@git.apache.org> References: <9f9c25533d274b83aed0e7c4769fedd6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] git commit: updated refs/heads/master to a527d27 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/master Commit: 1e6df1b77500dff40c24245227658f7c85c1835c Parents: 9a24109 Author: Remi Bergsma Authored: Mon Aug 24 16:16:16 2015 +0200 Committer: Remi Bergsma 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