summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-27 00:11:43 -0800
committerJunio C Hamano <gitster@pobox.com>2016-12-27 00:11:43 -0800
commitd7dcd52a42fc3d93c503da626fb669b3eee46ddc (patch)
treec9867e67b59abaa2cf450fa8ee3ab48a8ab835d3 /git-p4.py
parent5a5d3f1f1255559080f754fb202887f1566d8db3 (diff)
parent9943e5b9799336460ecbbeb86e544cc4a1ad1254 (diff)
downloadgit-d7dcd52a42fc3d93c503da626fb669b3eee46ddc.tar.gz
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
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-p4.py b/git-p4.py
index 16e3a18e73..b78af08cd2 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -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