Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DBBED104F9 for ; Mon, 12 Aug 2013 16:41:11 +0000 (UTC) Received: (qmail 52285 invoked by uid 500); 12 Aug 2013 16:40:57 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 51656 invoked by uid 500); 12 Aug 2013 16:40:50 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 51035 invoked by uid 99); 12 Aug 2013 16:40:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Aug 2013 16:40:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 38B728BCB24; Mon, 12 Aug 2013 16:40:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org Date: Mon, 12 Aug 2013 16:41:31 -0000 Message-Id: <5001c1ed428c44f7aac12b23051671d0@git.apache.org> In-Reply-To: <9c559e9207e04ab18111ca1aec19f967@git.apache.org> References: <9c559e9207e04ab18111ca1aec19f967@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [46/50] git commit: [#4665] Provide working (if inefficient) git merge commands when missing source_branch [#4665] Provide working (if inefficient) git merge commands when missing source_branch Signed-off-by: Cory Johns Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/6711c10a Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/6711c10a Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/6711c10a Branch: refs/heads/cj/6422 Commit: 6711c10a2e55ab3edc31bf14ab511e9eaa7dc746 Parents: 37b8fff Author: Cory Johns Authored: Wed Aug 7 22:34:45 2013 +0000 Committer: Cory Johns Committed: Wed Aug 7 22:35:27 2013 +0000 ---------------------------------------------------------------------- ForgeGit/forgegit/model/git_repo.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6711c10a/ForgeGit/forgegit/model/git_repo.py ---------------------------------------------------------------------- diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py index a982b2b..e0e47b8 100644 --- a/ForgeGit/forgegit/model/git_repo.py +++ b/ForgeGit/forgegit/model/git_repo.py @@ -84,11 +84,12 @@ class Repository(M.Repository): merge_request.source_branch, ) else: - fetch_command = 'git fetch {} {} # warning: '\ - 'no source branch specified'.format( - merge_request.downstream_repo_url, - '', - ) + fetch_command = ( + 'git remote add merge_request {}\n' + 'git fetch merge_request' + ).format( + merge_request.downstream_repo_url, + ) return 'git checkout %s\n%s\ngit merge %s' % ( merge_request.target_branch, fetch_command,