[U-Boot] [PATCH 1/2] buildman: Fix incorrect arguemnt in GetUpstream()

[Simon Glass]

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 at chromium.org>
Reported-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
---

 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
-- 
2.2.0.rc0.207.ga3a616c