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
This commit is contained in:
Junio C Hamano 2016-07-06 13:38:19 -07:00
Родитель 4cea655a47 09667d013c
Коммит 3efeb51328
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -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