diff options
| author | Pete Wyckoff <pw@padd.com> | 2009-02-27 18:53:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-08 04:32:07 (GMT) |
| commit | 3b167396b416541f7559f3141392d56b93ea049c (patch) | |
| tree | 344ef3ec6f837a4cf755574e5528bd8f0d1fffb1 /contrib | |
| parent | ca31f0b5c2fe379324920094ef1d242dce062737 (diff) | |
| download | git-3b167396b416541f7559f3141392d56b93ea049c.zip git-3b167396b416541f7559f3141392d56b93ea049c.tar.gz git-3b167396b416541f7559f3141392d56b93ea049c.tar.bz2 | |
git-p4: remove tabs from usermap file
Some users have tabs in their names, oddly enough. This
causes problems when loading the usercache from disk,
as split separates the fields on the wrong tabs. When
fast-import's parse_ident() tries to parse the committer
field, it is unhappy about the unbalanced <..> angle brackets.
It is easy enough to convert the tabs to single spaces.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 3832f60..342529d 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -1142,7 +1142,7 @@ class P4Sync(Command): s = '' for (key, val) in self.users.items(): - s += "%s\t%s\n" % (key, val) + s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1)) open(self.getUserCacheFilename(), "wb").write(s) self.userMapFromPerforceServer = True |