diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-01-15 21:48:47 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-01-15 21:48:47 -0800 |
commit | 453e149c8a9da871fb3d99a5f12e790cb9c2b1ff (patch) | |
tree | 7aa025e596598e6bde8d6942662464e0b2fb9924 | |
parent | Merge branch 'ab/gettext-charset-comment-fix' (diff) | |
parent | git-p4: fix syncing file types with pattern (diff) | |
download | tgif-453e149c8a9da871fb3d99a5f12e790cb9c2b1ff.tar.xz |
Merge branch 'dl/p4-encode-after-kw-expansion'
Text encoding fix for "git p4".
* dl/p4-encode-after-kw-expansion:
git-p4: fix syncing file types with pattern
-rwxr-xr-x | git-p4.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |