From: Daniel Levin <redacted>
Date: Wed, 23 Dec 2020 14:37:27 +0000 (+0000)
Subject: git-p4: fix syncing file types with pattern
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=52fc4f195c93eb2b1d1edfae69079646d8c2ea99;p=git.git

git-p4: fix syncing file types with pattern

Example of pattern file type: text+k

Text filtered through the p4 pattern regexp must be converted from
string back to bytes, otherwise 'data' command for the fast-import
will receive extra invalid characters, followed by the fast-import
process error.

CC: Yang Zhao <redacted>
Signed-off-by: Daniel Levin <redacted>
Signed-off-by: Junio C Hamano <redacted>
---

diff --git a/git-p4.py b/git-p4.py
index 4433ca53de..90b02f6b22 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3031,7 +3031,7 @@ class P4Sync(Command, P4UserMap):
             regexp = re.compile(pattern, re.VERBOSE)
             text = ''.join(decode_text_stream(c) for c in contents)
             text = regexp.sub(r'$\1$', text)
-            contents = [ text ]
+            contents = [ encode_text_stream(text) ]
 
         if self.largeFileSystem:
             (git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)