From: Pete Wyckoff <pw@padd.com>
Date: Fri, 27 Feb 2009 18:53:59 +0000 (-0800)
Subject: git-p4: remove tabs from usermap file
X-Git-Tag: v1.6.3-rc0~194
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3b167396b416541f7559f3141392d56b93ea049c;p=git.git

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>
---

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