git-p4: correct hasBranchPrefix verbose output
authorAndrew Oakley <aoakley@roku.com>
Wed, 22 Jun 2016 09:26:11 +0000 (10:26 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Jun 2016 16:45:15 +0000 (09:45 -0700)
The logic here was inverted, you got a message saying the file is
ignored for each file that is not ignored.

Signed-off-by: Andrew Oakley <aoakley@roku.com>
Acked-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-p4.py
index 4ad7c6890cf57860a280169e73188a443cdc949c..d58ea0f607b3b75cbc3795413306df5df0843c2e 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -2315,7 +2315,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