summaryrefslogtreecommitdiffstats
path: root/tools/buildman
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-03-12 18:50:31 -0700
committerSimon Glass <sjg@chromium.org>2016-03-17 21:27:39 -0600
commitd4c8572b7187cc21ca39d185fd19813e69fbd515 (patch)
tree2c3562338849c535e5ec6ecb530927161fbf54f1 /tools/buildman
parent59b35ddd2684bc2f81352d8cd14037752d9b639b (diff)
downloadu-boot-d4c8572b7187cc21ca39d185fd19813e69fbd515.tar.gz
u-boot-d4c8572b7187cc21ca39d185fd19813e69fbd515.tar.xz
u-boot-d4c8572b7187cc21ca39d185fd19813e69fbd515.zip
buildman: Allow branch names which conflict with directories
At present if you try to use buildman with the branch 'test' it will complain that it is unsure whether you mean the branch or the directory. This is a feature of the 'git log' command that buildman uses. Fix it by resolving the ambiguity. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'tools/buildman')
-rw-r--r--tools/buildman/func_test.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py
index 75eb3a97bb..a0bd46cbfb 100644
--- a/tools/buildman/func_test.py
+++ b/tools/buildman/func_test.py
@@ -255,6 +255,8 @@ class TestFunctional(unittest.TestCase):
self.assertEqual(gitutil.use_no_decorate, True)
def _HandleCommandGitLog(self, args):
+ if args[-1] == '--':
+ args = args[:-1]
if '-n0' in args:
return command.CommandResult(return_code=0)
elif args[-1] == 'upstream/master..%s' % self._test_branch: