diff options
| author | Tom Rini <trini@ti.com> | 2015-02-16 08:37:22 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-16 08:37:22 -0500 |
| commit | 95776391852147ea5c2e8ac01613a20c6583bc33 (patch) | |
| tree | cb12cf255025fc8261cc751731621f6ba0bf1711 /tools/patman/gitutil.py | |
| parent | eca99c02566534940b95ee77b6ea1f098da93adc (diff) | |
| parent | e50ab22984ce90ffcc47bc620ed2caac0bcc02f7 (diff) | |
Merge branch 'sandbox' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'tools/patman/gitutil.py')
| -rw-r--r-- | tools/patman/gitutil.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index c593070d67e..4c2c35bf9ac 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 |