From d4c8572b7187cc21ca39d185fd19813e69fbd515 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 12 Mar 2016 18:50:31 -0700 Subject: [PATCH] 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 Reviewed-by: Joe Hershberger --- tools/buildman/func_test.py | 2 ++ tools/patman/gitutil.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index 75eb3a9..a0bd46c 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: diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 5f1b4f6..e088bae 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -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():