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>
This commit is contained in:
Simon Glass 2016-03-12 18:50:31 -07:00
parent 59b35ddd26
commit d4c8572b71
2 changed files with 7 additions and 0 deletions

View File

@ -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:

View File

@ -44,6 +44,11 @@ def LogCmd(commit_range, git_dir=None, oneline=False, reverse=False,
cmd.append('-n%d' % count)
if commit_range:
cmd.append(commit_range)
# Add this in case we have a branch with the same name as a directory.
# This avoids messages like this, for example:
# fatal: ambiguous argument 'test': both revision and filename
cmd.append('--')
return cmd
def CountCommitsToBranch():