Merge branch 'jk/diff-no-index-initialize'

"git diff --no-index" may still want to access Git goodies like
--ext-diff and --textconv, but so far these have been ignored,
which has been corrected.

* jk/diff-no-index-initialize:
  diff: reuse diff setup for --no-index case

diff --cc builtin/diff.c
Simple merge

diff --cc diff.h
index 0478abe07d11e4e076fdc26ef68174c50a7f6e55,6e6a6730f562ec6107136868f83d569858d6c427..c9db9825bb782fda45f463c3f51600fb3756b7c1
--- 1/diff.h
--- 2/diff.h
+++ b/diff.h
@@@ -438,10 -434,9 +438,10 @@@ int diff_flush_patch_id(struct diff_opt
  
  int diff_result_code(struct diff_options *, int);
  
- void diff_no_index(struct repository *, struct rev_info *, int, const char **);
+ void diff_no_index(struct rev_info *, int, const char **);
  
 -int index_differs_from(const char *def, const struct diff_flags *flags,
 +int index_differs_from(struct repository *r, const char *def,
 +                     const struct diff_flags *flags,
                       int ita_invisible_in_index);
  
  /*