summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-01-29 11:35:16 -0700
committerSimon Glass <sjg@chromium.org>2015-02-15 14:34:06 -0700
commit71edbe5cdaf1516f070cf6c0910910b3240b0bf5 (patch)
tree0d1d37170f70030b6cc0ed729e7ad37a27898d61
parentbd2a4888b123713adec271d6c8040ca9f609aa2f (diff)
downloadu-boot-imx-71edbe5cdaf1516f070cf6c0910910b3240b0bf5.zip
u-boot-imx-71edbe5cdaf1516f070cf6c0910910b3240b0bf5.tar.gz
u-boot-imx-71edbe5cdaf1516f070cf6c0910910b3240b0bf5.tar.bz2
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>
-rw-r--r--tools/patman/gitutil.py2
1 files changed, 1 insertions, 1 deletions
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 @@ 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