diff options
| author | Brandon Williams <bmwill@google.com> | 2017-10-30 19:46:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-31 04:33:08 (GMT) |
| commit | c9f348e926d300c4e254299b92e9bfe1678512d6 (patch) | |
| tree | d3ce0cffceb2723bb06554e7db7ebe872426102d | |
| parent | 2f899857a9f425cb59f8a15c2ea7a52100c51a23 (diff) | |
| download | git-c9f348e926d300c4e254299b92e9bfe1678512d6.zip git-c9f348e926d300c4e254299b92e9bfe1678512d6.tar.gz git-c9f348e926d300c4e254299b92e9bfe1678512d6.tar.bz2 | |
add, reset: use DIFF_OPT_SET macro to set a diff flag
Instead of explicitly setting the 'DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG'
flag, use the 'DIFF_OPT_SET' macro.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/add.c | 2 | ||||
| -rw-r--r-- | builtin/reset.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/add.c b/builtin/add.c index a648cf4..b70e8a7 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -116,7 +116,7 @@ int add_files_to_cache(const char *prefix, rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; rev.diffopt.format_callback = update_callback; rev.diffopt.format_callback_data = &data; - rev.diffopt.flags |= DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG; + DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG); rev.max_count = 0; /* do not compare unmerged paths with stage #2 */ run_diff_files(&rev, DIFF_RACY_IS_MODIFIED); clear_pathspec(&rev.prune_data); diff --git a/builtin/reset.c b/builtin/reset.c index 9cd89b2..ea2fad5 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -166,7 +166,7 @@ static int read_from_tree(const struct pathspec *pathspec, opt.output_format = DIFF_FORMAT_CALLBACK; opt.format_callback = update_index_from_diff; opt.format_callback_data = &intent_to_add; - opt.flags |= DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG; + DIFF_OPT_SET(&opt, OVERRIDE_SUBMODULE_CONFIG); if (do_diff_cache(tree_oid, &opt)) return 1; |