diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-11-09 08:31:27 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-09 08:31:27 +0300 |
commit | 8cc633286a4803025d84b77c808a2c7ad8616f2f (patch) | |
tree | 624047e4917cd5113dad8f487dd8dec21985c775 /merge-recursive.c | |
parent | bde13700105a1c945819578ce8d5c0627d52c741 (diff) | |
parent | 0d1e0e7801bb2ae22036ad09f9f5cec17e08c48b (diff) |
Merge branch 'bw/diff-opt-impl-to-bitfields'
A single-word "unsigned flags" in the diff options is being split
into a structure with many bitfields.
* bw/diff-opt-impl-to-bitfields:
diff: make struct diff_flags members lowercase
diff: remove DIFF_OPT_CLR macro
diff: remove DIFF_OPT_SET macro
diff: remove DIFF_OPT_TST macro
diff: remove touched flags
diff: add flag to indicate textconv was set via cmdline
diff: convert flags to be stored in bitfields
add, reset: use DIFF_OPT_SET macro to set a diff flag
Diffstat (limited to 'merge-recursive.c')
-rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 24c5c26a6a..2ca8444c65 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -540,8 +540,8 @@ static struct string_list *get_renames(struct merge_options *o, return renames; diff_setup(&opts); - DIFF_OPT_SET(&opts, RECURSIVE); - DIFF_OPT_CLR(&opts, RENAME_EMPTY); + opts.flags.recursive = 1; + opts.flags.rename_empty = 0; opts.detect_rename = DIFF_DETECT_RENAME; opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit : o->diff_rename_limit >= 0 ? o->diff_rename_limit : |