aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-29 23:11:03 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-29 23:11:03 -0700
commit8e4f767ba77051aedaac7ef6639ee990778866c7 (patch)
tree3883ab313ee3ba979cd8893684f243dd8b997c82
parent81db4abf84ec7fbebeb08f6ad506138da2e7e4cd (diff)
parent63801da88d8638eb6cf26d6305a721ad3731e216 (diff)
downloadgit-8e4f767ba77051aedaac7ef6639ee990778866c7.tar.gz
git-8e4f767ba77051aedaac7ef6639ee990778866c7.tar.xz
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: import-zips: fix thinko
-rwxr-xr-xcontrib/fast-import/import-zips.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/fast-import/import-zips.py b/contrib/fast-import/import-zips.py
index c674fa2d1..7051a83a5 100755
--- a/contrib/fast-import/import-zips.py
+++ b/contrib/fast-import/import-zips.py
@@ -44,7 +44,8 @@ for zipfile in argv[1:]:
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