kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2016-07-11 10:44:16 -07:00
parent ce22ea22e8 09667d013c
commit 8e3e28b2f3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-p4.py
View File

@ -2674,7 +2674,7 @@ class P4Sync(Command, P4UserMap):
return True return True
hasPrefix = [p for p in self.branchPrefixes hasPrefix = [p for p in self.branchPrefixes
if p4PathStartsWith(path, p)] if p4PathStartsWith(path, p)]
if hasPrefix and self.verbose: if not hasPrefix and self.verbose:
print('Ignoring file outside of prefix: {0}'.format(path)) print('Ignoring file outside of prefix: {0}'.format(path))
return hasPrefix return hasPrefix