summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Andrew Oakley <aoakley@roku.com>2016-06-22 10:26:11 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-22 09:45:15 -0700
commit09667d013c91124ac0ff870322e184f0de53744f (patch)
tree57087058656be6180a71fa14aaada018c8d3cd67
parentgit-p4: add option to keep empty commits (diff)
downloadtgif-09667d013c91124ac0ff870322e184f0de53744f.tar.xz
git-p4: correct hasBranchPrefix verbose output
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>
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index 4ad7c6890c..d58ea0f607 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2315,7 +2315,7 @@ class P4Sync(Command, P4UserMap):
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