diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2009-03-29 22:42:27 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-29 19:56:26 -0700 |
| commit | 63801da88d8638eb6cf26d6305a721ad3731e216 (patch) | |
| tree | 9440c1c2fc847ed7841446ef627dc0f51c1575a1 | |
| parent | e8bd78c3fcba35b8344ea6bab6218b793e507ea3 (diff) | |
| download | git-63801da88d8638eb6cf26d6305a721ad3731e216.tar.gz git-63801da88d8638eb6cf26d6305a721ad3731e216.tar.xz | |
import-zips: fix thinko
Embarrassingly, the common prefix calculation did not work properly, due
to a mistake in the assignment: instead of assigning the dirname of the
current file name, the dirname of the current common prefix needs to
be assigned to common prefix, when the current prefix does not match the
current file name.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 |