Merge pull request #43 from blueyed/fix-diff-with-mnemonicprefix-2

Fix git-diff with `mnemonicprefix` option

diff_cover/git_diff.py

@@ -27,7 +27,7 @@ def diff_committed(self, compare_branch='origin/master'):
         to stderr.
         """
         return execute([
-            'git', 'diff',
+            'git', '-c', 'diff.mnemonicprefix=no', 'diff',
             "{branch}...HEAD".format(branch=compare_branch),
             '--no-color',
             '--no-ext-diff'
@@ -41,7 +41,8 @@ def diff_unstaged(self):
         Raises a `GitDiffError` if `git diff` outputs anything
         to stderr.
         """
-        return execute(['git', 'diff', '--no-color', '--no-ext-diff'])[0]
+        return execute(['git', '-c', 'diff.mnemonicprefix=no', 'diff',
+                        '--no-color', '--no-ext-diff'])[0]
 
     def diff_staged(self):
         """
@@ -51,4 +52,5 @@ def diff_staged(self):
         Raises a `GitDiffError` if `git diff` outputs anything
         to stderr.
         """
-        return execute(['git', 'diff', '--cached', '--no-color', '--no-ext-diff'])[0]
+        return execute(['git', '-c', 'diff.mnemonicprefix=no', 'diff',
+                        '--cached', '--no-color', '--no-ext-diff'])[0]

diff_cover/tests/test_git_diff.py

@@ -26,7 +26,8 @@ def test_diff_committed(self):
         self.assertEqual(output, 'test output')
 
         # Expect that the correct command was executed
-        expected = ['git', 'diff', 'origin/master...HEAD', '--no-color', '--no-ext-diff']
+        expected = ['git', '-c', 'diff.mnemonicprefix=no', 'diff',
+                    'origin/master...HEAD', '--no-color', '--no-ext-diff']
         self.subprocess.Popen.assert_called_with(
             expected, stdout=self.subprocess.PIPE, stderr=self.subprocess.PIPE
         )
@@ -39,7 +40,8 @@ def test_diff_unstaged(self):
         self.assertEqual(output, 'test output')
 
         # Expect that the correct command was executed
-        expected = ['git', 'diff', '--no-color', '--no-ext-diff']
+        expected = ['git', '-c', 'diff.mnemonicprefix=no', 'diff',
+                    '--no-color', '--no-ext-diff']
         self.subprocess.Popen.assert_called_with(
             expected, stdout=self.subprocess.PIPE, stderr=self.subprocess.PIPE
         )
@@ -52,7 +54,8 @@ def test_diff_staged(self):
         self.assertEqual(output, 'test output')
 
         # Expect that the correct command was executed
-        expected = ['git', 'diff', '--cached', '--no-color', '--no-ext-diff']
+        expected = ['git', '-c', 'diff.mnemonicprefix=no', 'diff', '--cached',
+                    '--no-color', '--no-ext-diff']
         self.subprocess.Popen.assert_called_with(
             expected, stdout=self.subprocess.PIPE, stderr=self.subprocess.PIPE
         )
@@ -67,7 +70,8 @@ def test_diff_committed_compare_branch(self):
         self.assertEqual(output, 'test output')
 
         # Expect that the correct command was executed
-        expected = ['git', 'diff', 'release...HEAD', '--no-color', '--no-ext-diff']
+        expected = ['git', '-c', 'diff.mnemonicprefix=no', 'diff',
+                    'release...HEAD', '--no-color', '--no-ext-diff']
         self.subprocess.Popen.assert_called_with(
             expected, stdout=self.subprocess.PIPE, stderr=self.subprocess.PIPE
         )

diff_cover/tests/test_integration.py

@@ -166,7 +166,7 @@ def _set_git_diff_output(self, stdout, stderr):
         a phony directory.
         """
         def patch_diff(command, **kwargs):
-            if command[0:2] == ['git', 'diff']:
+            if command[0:4] == ['git', '-c', 'diff.mnemonicprefix=no', 'diff']:
                 mock = Mock()
                 mock.communicate.return_value = (stdout, stderr)
                 return mock