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

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

diff --git a/git-p4.py b/git-p4.py
index b6593cf9a19144650cc476fae0243140f4c0a8bb..b123aa2726490403efef7d1aa32161ad05c42a4b 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -2674,7 +2674,7 @@ def hasBranchPrefix(self, path):
             return True
         hasPrefix = [p for p in self.branchPrefixes
                         if p4PathStartsWith(path, p)]
-        if hasPrefix and self.verbose:
+        if not hasPrefix and self.verbose:
             print('Ignoring file outside of prefix: {0}'.format(path))
         return hasPrefix