mirror of
https://github.com/git/git.git
synced 2026-01-27 17:27:19 +09:00
Merge branch 'maint'
* maint: git-svn: fix ls-tree usage with dash-prefixed paths import-zips: fix thinko
This commit is contained in:
commit
f2ad051fd1
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user