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

gitster · gitster · commit 3efeb513281e · 2016-07-06T13:38:19.000-07:00
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
@@ -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
 
