Commit 71edbe5c authored by Simon Glass's avatar Simon Glass

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: default avatarSimon Glass <>
Reported-by: default avatarMasahiro Yamada <>
parent bd2a4888
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment