From 4a01f64c8f67ec74edd2c6c501bce8bf61ad3494 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Thu, 26 May 2016 11:20:32 -0700
Subject: [PATCH] Fix check-merge-conflict against binary files

---
 pre_commit_hooks/check_merge_conflict.py |  14 ++++++++------
 testing/resources/img1.jpg               | Bin 0 -> 843 bytes
 tests/check_merge_conflict_test.py       |   8 ++++++++
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 testing/resources/img1.jpg

diff --git a/pre_commit_hooks/check_merge_conflict.py b/pre_commit_hooks/check_merge_conflict.py
index ec09473..4a98843 100644
--- a/pre_commit_hooks/check_merge_conflict.py
+++ b/pre_commit_hooks/check_merge_conflict.py
@@ -5,10 +5,10 @@ import os.path
 import sys
 
 CONFLICT_PATTERNS = [
-    '<<<<<<< ',
-    '======= ',
-    '=======\n',
-    '>>>>>>> '
+    b'<<<<<<< ',
+    b'======= ',
+    b'=======\n',
+    b'>>>>>>> '
 ]
 WARNING_MSG = 'Merge conflict string "{0}" found in {1}:{2}'
 
@@ -30,11 +30,13 @@ def detect_merge_conflict(argv=None):
 
     retcode = 0
     for filename in args.filenames:
-        with open(filename) as inputfile:
+        with open(filename, 'rb') as inputfile:
             for i, line in enumerate(inputfile):
                 for pattern in CONFLICT_PATTERNS:
                     if line.startswith(pattern):
-                        print(WARNING_MSG.format(pattern, filename, i + 1))
+                        print(WARNING_MSG.format(
+                            pattern.decode(), filename, i + 1,
+                        ))
                         retcode = 1
 
     return retcode
diff --git a/testing/resources/img1.jpg b/testing/resources/img1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..dea42627ad9f5eb8061bf5068117faa3ba22591c
GIT binary patch
literal 843
zcmex=<NpH&0WUXCHwH#V1_nkTWcdG&!P+^<)iK0B$VwqSMK`M;HC>_1P|rX?qqI0P
zFI~aY%U!`Mz|~!$%*;qrN1?DZF(<R6Qo&Zi(tzv#Z3brsW+o;O0s<BwV&!0EWnp3E
zVrOUL;Njxo;pXDz=H(L-;N=tK<K`9+6A%;@5fv5X;TM+>6Oj-S5fuR$!pIEN!@|nR
z%E~Fi%grl7GWdUhL6Cz%fI)znQHg;`kdaxC@&6G9d7vj*8Nq-73K*GyZe(NU;N;>4
zD%dK(z{JSR%*4VBay3wOEl{3;MUYiU(a@1iI53f2sZhkIapFP_Wv7h?MT0JWP%%y_
zYU1P)6PJ*bQdLve(9|+9H8Z!cv~qTFb#wRd^a>6M4GWKmj7m;PO-s+n%qlJ^Ei136
ztZHs)ZENr7?3y%r%G7DoXUv?nXz`Mz%a*TLxoXqqEnBy3-?4Mop~FXx9y@;G<f%)S
zuUx%${l?8(4<9{#^7PsB7cXCZ{Pg+D*Kgl{{QL#-7b62R#9KfT;xROT2?G7a#KOYN
z!VdBmBU3pLGYhh?DjKp0IR>&P778mFHFAhJO<cI~Ag8i%&<D|^qKjN&DkcwAKZ3jl
z_8D;=Ya+{MaE~GUb&G+AnGqOy%z_N|4Ck*#ANtidah-Jc@##kdIxZbMbhT0MUE!7m
zmSyS<>^@zmKAh{eZ~f|<YMN`h##FkRy|n9L(MLALijx*6Y*(NAllqa{`Ga^%{+qSB
zvtrAmqHE)>M{x9gm=v-l>-n?(>?Mmen~E6EX;=IIShdgcqTAxqLYrGVE+%f;HR<7|
pm^B+2ZXP)2P=A<toBy+jJLbQw=H##ZZXwluOT$xF_vifoHv#3OC2{}&

literal 0
HcmV?d00001

diff --git a/tests/check_merge_conflict_test.py b/tests/check_merge_conflict_test.py
index 07805b1..be1d51f 100644
--- a/tests/check_merge_conflict_test.py
+++ b/tests/check_merge_conflict_test.py
@@ -3,12 +3,14 @@ from __future__ import unicode_literals
 
 import io
 import os
+import shutil
 
 import pytest
 
 from pre_commit_hooks.check_merge_conflict import detect_merge_conflict
 from pre_commit_hooks.util import cmd_output
 from testing.util import cwd
+from testing.util import get_resource_path
 from testing.util import write_file
 
 
@@ -109,6 +111,12 @@ def test_merge_conflicts_ok(ok_contents):
     assert detect_merge_conflict(['f1']) == 0
 
 
+@pytest.mark.usefixtures('f1_is_a_conflict_file')
+def test_ignores_binary_files():
+    shutil.copy(get_resource_path('img1.jpg'), 'f1')
+    assert detect_merge_conflict(['f1']) == 0
+
+
 @pytest.mark.usefixtures('in_tmpdir')
 def test_does_not_care_when_not_in_a_merge():
     with io.open('README.md', 'w') as readme_file: