Merge pull request #409 from samsaggace/master

asottile · web-flow · commit 4b90faab272a · 2016-09-09T10:56:47.000-04:00
Fix file stashing with external diff tool
diff --git a/pre_commit/staged_files_only.py b/pre_commit/staged_files_only.py
@@ -23,7 +23,7 @@ def staged_files_only(cmd_runner):
     retcode, diff_stdout_binary, _ = cmd_runner.run(
         [
             'git', 'diff', '--ignore-submodules', '--binary', '--exit-code',
-            '--no-color',
+            '--no-color', '--no-ext-diff',
         ],
         retcode=None,
         encoding=None,

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ def staged_files_only(cmd_runner):`
`23`	`23`	`retcode, diff_stdout_binary, _ = cmd_runner.run(`
`24`	`24`	`[`
`25`	`25`	`'git', 'diff', '--ignore-submodules', '--binary', '--exit-code',`
`26`		`- '--no-color',`
	`26`	`+ '--no-color', '--no-ext-diff',`
`27`	`27`	`],`
`28`	`28`	`retcode=None,`
`29`	`29`	`encoding=None,`