commit 71edbe5cdaf1516f070cf6c0910910b3240b0bf5
author Simon Glass <sjg@chromium.org> Thu Jan 29 11:35:16 2015 -0700
committer Simon Glass <sjg@chromium.org> Sun Feb 15 14:34:06 2015 -0700
tree 0d1d37170f70030b6cc0ed729e7ad37a27898d61
parent bd2a4888b123713adec271d6c8040ca9f609aa2f

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>

tools/patman/gitutil.py

diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
index c593070..4c2c35b 100644
--- a/tools/patman/gitutil.py
+++ b/tools/patman/gitutil.py
@@ -129,7 +129,7 @@
         return upstream, msg
 
     if remote == '.':
-        return merge
+        return merge, None
     elif remote and merge:
         leaf = merge.split('/')[-1]
         return '%s/%s' % (remote, leaf), None