aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2009-02-27 10:53:59 -0800
committerJunio C Hamano <gitster@pobox.com>2009-03-07 20:32:07 -0800
commit3b167396b416541f7559f3141392d56b93ea049c (patch)
tree344ef3ec6f837a4cf755574e5528bd8f0d1fffb1 /contrib
parentca31f0b5c2fe379324920094ef1d242dce062737 (diff)
downloadgit-3b167396b416541f7559f3141392d56b93ea049c.tar.gz
git-3b167396b416541f7559f3141392d56b93ea049c.tar.xz
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-xcontrib/fast-import/git-p42
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 3832f6022..342529db3 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