Skip to content

Commit

Permalink
Merge branch 'ao/p4-has-branch-prefix-fix' into maint
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed Jul 11, 2016
2 parents ce22ea2 + 09667d0 commit 8e3e28b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-p4.py
Original file line number Diff line number Diff line change
Expand Up @@ -2674,7 +2674,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

Expand Down

0 comments on commit 8e3e28b

Please sign in to comment.