mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-20 05:43:54 +02:00
Code

Merge branch 'dl/p4-encode-after-kw-expansion' into next 

Text encoding fix for "git p4".

* dl/p4-encode-after-kw-expansion:
  git-p4: fix syncing file types with pattern
This commit is contained in:
Junio C Hamano 2021-01-13 00:51:38 -08:00
parent 0e93f0d529 52fc4f195c
commit 8fce17d998
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-p4.py
View File

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