From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Mar 2009 06:11:23 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.3-rc0~65
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f2ad051fd120714cbe9dcee5d94942e0105bb0aa?hp=c18f75a1e96ff0f028edf94effd10cf56d892f22

Merge branch 'maint'

* maint:
git-svn: fix ls-tree usage with dash-prefixed paths
import-zips: fix thinko
---

diff --git a/contrib/fast-import/import-zips.py b/contrib/fast-import/import-zips.py
index c674fa2d1b..7051a83a59 100755
--- 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