mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-01-14 13:00:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up calls to .encode() / .decode()

Browse Source
This commit is contained in:
Anthony Sottile
2020-01-12 10:46:33 -08:00
parent b2faf339ce
commit aefbe71765
11 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pre_commit/git.py
View File

@@ -69,7 +69,7 @@ def is_in_merge_conflict() -> bool:
def parse_merge_msg_for_conflicts(merge_msg: bytes) -> List[str]:
# Conflicted files start with tabs
return [
line.lstrip(b'#').strip().decode('UTF-8')
line.lstrip(b'#').strip().decode()
for line in merge_msg.splitlines()
# '#\t' for git 2.4.1
if line.startswith((b'\t', b'#\t'))