Merge branch 'gv/p4-multi-path-commit-fix'
"git p4" that tracks multile p4 paths imported a single changelist that touches files in these multiple paths as one commit, followed by many empty commits. This has been fixed. * gv/p4-multi-path-commit-fix: git-p4: fix multi-path changelist empty commits
This commit is contained in:
@ -839,7 +839,7 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
|
||||
die("cannot use --changes-block-size with non-numeric revisions")
|
||||
block_size = None
|
||||
|
||||
changes = []
|
||||
changes = set()
|
||||
|
||||
# Retrieve changes a block at a time, to prevent running
|
||||
# into a MaxResults/MaxScanRows error from the server.
|
||||
@ -858,7 +858,7 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
|
||||
|
||||
# Insert changes in chronological order
|
||||
for line in reversed(p4_read_pipe_lines(cmd)):
|
||||
changes.append(int(line.split(" ")[1]))
|
||||
changes.add(int(line.split(" ")[1]))
|
||||
|
||||
if not block_size:
|
||||
break
|
||||
|
Reference in New Issue
Block a user