From patchwork Thu Jan 29 18:35:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 434624 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 8160414027F for ; Fri, 30 Jan 2015 05:35:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3FB814B849; Thu, 29 Jan 2015 19:35:35 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ARZhSpmGJ9RM; Thu, 29 Jan 2015 19:35:35 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0DDF24B839; Thu, 29 Jan 2015 19:35:33 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D08024B808 for ; Thu, 29 Jan 2015 19:35:24 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B87Cy72J6UjO for ; Thu, 29 Jan 2015 19:35:24 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pa0-f74.google.com (mail-pa0-f74.google.com [209.85.220.74]) by theia.denx.de (Postfix) with ESMTPS id 4A3954B800 for ; Thu, 29 Jan 2015 19:35:21 +0100 (CET) Received: by mail-pa0-f74.google.com with SMTP id kx10so6652510pab.1 for ; Thu, 29 Jan 2015 10:35:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4E67DvsiHbLAR20exVo58E62BcQheA8tFVVI+d7FXGA=; b=kgS8HgJ7P2GhobjD3hXauk6nUKfFx+yMbDGKJIlQramxHB7rTIKQ3/WXxV10Gvpe68 yhCVycag8Q+0mmKp3xVzc7ZX+dcMJtcFMoi8yAsCZVAJCxit3sad8/32oyaoFpj8Gf7R SlwvJTihopoiB0mbJa0nNCEXfzwcFAAfcf2PtvIIJY1rMffwVRCRZP5r9ZtZahBhJYAE XFEypL8/OuptJxgvs3UIMCVVSPHKXIVWjld8X6BO2S5uGNykih00U0tXXn+vMW0BJJ/t sC4B8nD3zf33/5pAwp1UO5ITGbHFFHPHB58EnxRbxUnBoQq4KjYeZaOWtIO4Hcm7aF+5 jopg== X-Gm-Message-State: ALoCoQmlSqfQ1L8WlWHHCKBlUZYFVTnZ5ost9EunCdJnL+P0xmUpJTHK05E4Vu4cE1mbt0IbyOan X-Received: by 10.68.95.100 with SMTP id dj4mr1527128pbb.9.1422556520490; Thu, 29 Jan 2015 10:35:20 -0800 (PST) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id q2si1327574qcn.2.2015.01.29.10.35.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jan 2015 10:35:20 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id wLLnkNfm.1; Thu, 29 Jan 2015 10:35:20 -0800 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id A05F9220633; Thu, 29 Jan 2015 11:35:19 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 29 Jan 2015 11:35:16 -0700 Message-Id: <1422556517-17239-1-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c Subject: [U-Boot] [PATCH 1/2] buildman: Fix incorrect arguemnt in GetUpstream() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This causes an error when trying to build a local branch which has a local branch as its upstream. Signed-off-by: Simon Glass Reported-by: Masahiro Yamada --- tools/patman/gitutil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index cc5a55a..9a40f68 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -129,7 +129,7 @@ def GetUpstream(git_dir, branch): return upstream, msg if remote == '.': - return merge + return merge, None elif remote and merge: leaf = merge.split('/')[-1] return '%s/%s' % (remote, leaf), None