mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
add, reset: ensure submodules can be added or reset
Commit aee9c7d65
(Submodules: Add the new "ignore" config option for
diff and status) introduced the ignore configuration option for
submodules so that configured submodules could be omitted from the
status and diff commands. Because this flag is respected in the diff
machinery it has the unintended consequence of potentially prohibiting
users from adding or resetting a submodule, even when a path to the
submodule is explicitly given.
Ensure that submodules can be added or set, even if they are configured
to be ignored, by setting the `DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG` diff
flag.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
9ef23f91fc
commit
5556808690
|
@ -116,6 +116,7 @@ int add_files_to_cache(const char *prefix,
|
||||||
rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
|
rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
|
||||||
rev.diffopt.format_callback = update_callback;
|
rev.diffopt.format_callback = update_callback;
|
||||||
rev.diffopt.format_callback_data = &data;
|
rev.diffopt.format_callback_data = &data;
|
||||||
|
rev.diffopt.flags |= DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG;
|
||||||
rev.max_count = 0; /* do not compare unmerged paths with stage #2 */
|
rev.max_count = 0; /* do not compare unmerged paths with stage #2 */
|
||||||
run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
|
run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
|
||||||
return !!data.add_errors;
|
return !!data.add_errors;
|
||||||
|
|
|
@ -156,6 +156,7 @@ static int read_from_tree(const struct pathspec *pathspec,
|
||||||
opt.output_format = DIFF_FORMAT_CALLBACK;
|
opt.output_format = DIFF_FORMAT_CALLBACK;
|
||||||
opt.format_callback = update_index_from_diff;
|
opt.format_callback = update_index_from_diff;
|
||||||
opt.format_callback_data = &intent_to_add;
|
opt.format_callback_data = &intent_to_add;
|
||||||
|
opt.flags |= DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG;
|
||||||
|
|
||||||
if (do_diff_cache(tree_oid, &opt))
|
if (do_diff_cache(tree_oid, &opt))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
Loading…
Reference in a new issue