aboutsummaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-11 10:44:16 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-11 10:44:16 -0700
commit8e3e28b2f320d27242a2728e48fad27f5f7f2f21 (patch)
treeb72b262102aa6e2bcfffbbca38f274295925761e /git-p4.py
parentce22ea22e863e100529334b02b2899780d2c9dcc (diff)
parent09667d013c91124ac0ff870322e184f0de53744f (diff)
downloadgit-8e3e28b2f320d27242a2728e48fad27f5f7f2f21.tar.gz
git-8e3e28b2f320d27242a2728e48fad27f5f7f2f21.tar.xz
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
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index b6593cf9a..b123aa272 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2674,7 +2674,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