diff options
| author | Denton Liu <liu.denton@gmail.com> | 2020-09-20 11:22:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-21 04:30:26 (GMT) |
| commit | 4c3fe82ef17a6636c742b95cd292b83b02876e08 (patch) | |
| tree | 51656928a889f2b66241301f1ea87e450f6b8bbb /diff.h | |
| parent | 308d7a7dc99043c90a9eff6916cad1abe0d473aa (diff) | |
| download | git-4c3fe82ef17a6636c742b95cd292b83b02876e08.zip git-4c3fe82ef17a6636c742b95cd292b83b02876e08.tar.gz git-4c3fe82ef17a6636c742b95cd292b83b02876e08.tar.bz2 | |
diff-lib: accept option flags in run_diff_index()
In a future commit, we will teach run_diff_index() to accept more
options via flag bits. For now, change `cached` into a flag in the
`option` bitfield. The behaviour should remain exactly the same.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -585,7 +585,9 @@ const char *diff_aligned_abbrev(const struct object_id *sha1, int); /* report racily-clean paths as modified */ #define DIFF_RACY_IS_MODIFIED 02 int run_diff_files(struct rev_info *revs, unsigned int option); -int run_diff_index(struct rev_info *revs, int cached); + +#define DIFF_INDEX_CACHED 01 +int run_diff_index(struct rev_info *revs, unsigned int option); int do_diff_cache(const struct object_id *, struct diff_options *); int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int); |