mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.6.1' into maint

Browse Source 
* maint-1.6.1:
  import-zips: fix thinko
This commit is contained in:
Junio C Hamano
2009-03-29 23:11:13 -07:00
parent b8fee3a388 8e4f767ba7
commit 510a309e5e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/fast-import/import-zips.py
View File

@ -44,7 +44,8 @@ for zipfile in argv[1:]:
common_prefix = name[:name.rfind('/') + 1] common_prefix = name[:name.rfind('/') + 1]
else: else:
while not name.startswith(common_prefix): 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) mark[name] = ':' + str(next_mark)
next_mark += 1 next_mark += 1