Fix file stashing with external diff tool

Sebastien Chemin · Sebastien Chemin · commit 5206ce244837 · 2016-09-09T16:36:32.000+02:00
When git is configured to use an external diff tool to show diffs
(eg. 'git config diff.external mytool'), the stashing unstaged files
will create an empty file that can't be recovered.

Some modifications are permanently lost...

Just disable the ext-diff of git diff to avoid any issue.

Change-Id: I10a57ac2acbcb1f7219455f1958efd50d8452d6a
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,`