diff-lib: honor override_submodule_config flag bit
When `diff.ignoreSubmodules = all` is set and submodule commits are manually staged (e.g. via `git-update-index`), `git-commit` should record the commit with updated submodules. `index_differs_from` is called from `prepare_to_commit` with flags set to `override_submodule_config = 1`. `index_differs_from` then merges the default diff flags and passed flags. When `diff.ignoreSubmodules` is set to "all", `flags` ends up having both `override_submodule_config` and `ignore_submodules` set to 1. This results in `git-commit` ignoring staged commits. This patch restores original `flags.ignore_submodule` if `flags.override_submodule_config` is set. Signed-off-by: Josip Sokcevic <sokcevic@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
fe86abd751
commit
5768478edc
@ -669,8 +669,15 @@ int index_differs_from(struct repository *r,
|
||||
setup_revisions(0, NULL, &rev, &opt);
|
||||
rev.diffopt.flags.quick = 1;
|
||||
rev.diffopt.flags.exit_with_status = 1;
|
||||
if (flags)
|
||||
if (flags) {
|
||||
diff_flags_or(&rev.diffopt.flags, flags);
|
||||
/*
|
||||
* Now that flags are merged, honor override_submodule_config
|
||||
* and ignore_submodules from passed flags.
|
||||
*/
|
||||
if (flags->override_submodule_config)
|
||||
rev.diffopt.flags.ignore_submodules = flags->ignore_submodules;
|
||||
}
|
||||
rev.diffopt.ita_invisible_in_index = ita_invisible_in_index;
|
||||
run_diff_index(&rev, 1);
|
||||
has_changes = rev.diffopt.flags.has_changes;
|
||||
|
Reference in New Issue
Block a user