Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Disallow external diff helpers when generating diff output.

Fixes textmate/textmate#429
  • Loading branch information...
commit 132724ab03dfc70fc77deca8ef1a359dc8404d80 1 parent a852600
@infininight infininight authored
Showing with 2 additions and 0 deletions.
  1. +2 −0  Support/lib/git.rb
View
2  Support/lib/git.rb
@@ -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)
Please sign in to comment.
Something went wrong with that request. Please try again.