summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-06 13:38:19 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-06 13:38:19 -0700
commit3efeb513281ed59cc4c62be53256fd59832caa23 (patch)
tree03503031e7e0f43454127ba52e3e69643795659e /git-p4.py
parent4cea655a470bdea8dfd9468c6b5b7f667ba9bf02 (diff)
parent09667d013c91124ac0ff870322e184f0de53744f (diff)
downloadgit-3efeb513281ed59cc4c62be53256fd59832caa23.tar.gz
Merge branch 'ao/p4-has-branch-prefix-fix'
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 b6593cf9a1..b123aa2726 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