From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Mar 2019 00:59:59 +0000 (+0900)
Subject: Merge branch 'jk/diff-no-index-initialize'
X-Git-Tag: v2.22.0-rc0~159
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=12e5bdd9c4bfa0131b00b20be2cc48a8e2b08a2d

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
---

12e5bdd9c4bfa0131b00b20be2cc48a8e2b08a2d
diff --cc diff.h
index 0478abe07d,6e6a6730f5..c9db9825bb
--- a/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);
  
  /*