From: Simon Glass <sjg@chromium.org>
Date: Thu, 29 Jan 2015 18:35:16 +0000 (-0700)
Subject: buildman: Fix incorrect arguemnt in GetUpstream()
X-Git-Tag: v2015.04-rc2~25^2~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=71edbe5cdaf1516f070cf6c0910910b3240b0bf5;p=oweals%2Fu-boot.git

buildman: Fix incorrect arguemnt in GetUpstream()

This causes an error when trying to build a local branch which has a local
branch as its upstream.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
index c593070d67..4c2c35bf9a 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