undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix common path "calculation" from logs of multiple branches.

Browse Source 
Need to use min instead of max for prev/cur to avoid out-of-bounds
string access. Also treat "i" as index of the last match instead of
a length because in case of a complete match of the two strings
i was off by one.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
Simon Hausmann 2007-06-07 09:37:13 +02:00
parent 845b42cb6c
commit 583e170706
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/fast-import/git-p4
View File

@ -1059,11 +1059,12 @@ class P4Sync(Command):
else: else:
paths = [] paths = []
for (prev, cur) in zip(self.previousDepotPaths, depotPaths): for (prev, cur) in zip(self.previousDepotPaths, depotPaths):
for i in range(0, max(len(cur), len(prev))): for i in range(0, min(len(cur), len(prev))):
if cur[i] <> prev[i]: if cur[i] <> prev[i]:
i = i - 1
break break
paths.append (cur[:i]) paths.append (cur[:i + 1])
self.previousDepotPaths = paths self.previousDepotPaths = paths