Skip to content

Commit 8e3e28b

Browse files
committed
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
2 parents ce22ea2 + 09667d0 commit 8e3e28b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-p4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2674,7 +2674,7 @@ def hasBranchPrefix(self, path):
26742674
return True
26752675
hasPrefix = [p for p in self.branchPrefixes
26762676
if p4PathStartsWith(path, p)]
2677-
if hasPrefix and self.verbose:
2677+
if not hasPrefix and self.verbose:
26782678
print('Ignoring file outside of prefix: {0}'.format(path))
26792679
return hasPrefix
26802680

0 commit comments

Comments
 (0)