From: Pete Wyckoff Date: Wed, 28 Jan 2009 16:45:40 GMT Subject: [PATCH] git-p4: avoid syncing duplicate changes Message-ID: <20090128164540.GA2137@padd.com> When a particular changeset affects multiple depot paths, it will appear multiple times in the output of "p4 changes". Filter out the duplicates to avoid the extra empty commits that this would otherwise create. Signed-off-by: Pete Wyckoff --- contrib/fast-import/git-p4 | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index a85a7b2..63c8eca 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -444,8 +444,9 @@ def p4ChangesForPaths(depotPaths, changeRange): changes = [] for line in output: - changeNum = line.split(" ")[1] - changes.append(int(changeNum)) + changeNum = int(line.split(" ")[1]) + if changeNum not in changes: + changes.append(changeNum) changes.sort() return changes -- 1.6.0.6