提交 3efeb513 编写于 作者: J Junio C Hamano

Merge branch 'ao/p4-has-branch-prefix-fix'

A bug, which caused "git p4" while running under verbose mode to
report paths that are omitted due to branch prefix incorrectly, has
been fixed; the command said "Ignoring file outside of prefix" for
paths that are _inside_.

* ao/p4-has-branch-prefix-fix:
  git-p4: correct hasBranchPrefix verbose output
...@@ -2674,7 +2674,7 @@ def hasBranchPrefix(self, path): ...@@ -2674,7 +2674,7 @@ def hasBranchPrefix(self, path):
return True return True
hasPrefix = [p for p in self.branchPrefixes hasPrefix = [p for p in self.branchPrefixes
if p4PathStartsWith(path, p)] if p4PathStartsWith(path, p)]
if hasPrefix and self.verbose: if not hasPrefix and self.verbose:
print('Ignoring file outside of prefix: {0}'.format(path)) print('Ignoring file outside of prefix: {0}'.format(path))
return hasPrefix return hasPrefix
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册