From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Jul 2016 17:44:16 +0000 (-0700)
Subject: Merge branch 'ao/p4-has-branch-prefix-fix' into maint
X-Git-Tag: v2.9.1~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8e3e28b2f320d27242a2728e48fad27f5f7f2f21?hp=ce22ea22e863e100529334b02b2899780d2c9dcc

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 b6593cf9a1..b123aa2726 100755
--- 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