diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-29 23:11:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-29 23:11:23 -0700 |
| commit | f2ad051fd120714cbe9dcee5d94942e0105bb0aa (patch) | |
| tree | e8a7f824d9d272197217cd4d0228732500608998 /contrib | |
| parent | c18f75a1e96ff0f028edf94effd10cf56d892f22 (diff) | |
| parent | 510a309e5e0997c73d97c85332a99d622f06ace6 (diff) | |
| download | git-f2ad051fd120714cbe9dcee5d94942e0105bb0aa.tar.gz git-f2ad051fd120714cbe9dcee5d94942e0105bb0aa.tar.xz | |
Merge branch 'maint'
* maint:
git-svn: fix ls-tree usage with dash-prefixed paths
import-zips: fix thinko
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/import-zips.py | 3 |
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 |