Permalink
Browse files

Disallow external diff helpers when generating diff output.

Fixes textmate/textmate#429
  • Loading branch information...
1 parent a852600 commit 132724ab03dfc70fc77deca8ef1a359dc8404d80 @infininight infininight committed Sep 17, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0 Support/lib/git.rb
View
@@ -332,6 +332,7 @@ def current_revision
def diff_check_output(options = {})
options = {:file => options} unless options.is_a?(Hash)
params = ["diff"]
+ params << ["--no-ext-diff"]
params << ["--check"]
lr = get_range_arg(options)
@@ -349,6 +350,7 @@ def diff_check(options = {})
def diff(options = {})
options = {:file => options} unless options.is_a?(Hash)
params = ["diff"]
+ params << ["--no-ext-diff"]
params << ["-U", options[:context_lines]] if options[:context_lines]
lr = get_range_arg(options)

0 comments on commit 132724a

Please sign in to comment.