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 <yang.zhao@skyboxlabs.com> Signed-off-by: Daniel Levin <dendy.ua@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/git-p4.py b/git-p4.py index 4433ca5..90b02f6 100755 --- a/git-p4.py +++ b/git-p4.py
@@ -3031,7 +3031,7 @@ def streamOneP4File(self, file, contents): 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)