Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0: import-zips: fix thinko
git-mirror · Mar 30, 2009 · 8e4f767 · 8e4f767
2 parents 81db4ab + 63801da
commit 8e4f767
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/contrib/fast-import/import-zips.py b/contrib/fast-import/import-zips.py
@@ -44,7 +44,8 @@ def printlines(list):
 			common_prefix = name[:name.rfind('/') + 1]
 		else:
 			while not name.startswith(common_prefix):
-				common_prefix = name[:name.rfind('/') + 1]
+				last_slash = common_prefix[:-1].rfind('/') + 1
+				common_prefix = common_prefix[:last_slash]
 
 		mark[name] = ':' + str(next_mark)
 		next_mark += 1