mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
commit: pay attention to submodule.$name.ignore in .gitmodules
"git status" does not list a submodule with uncommitted working tree files as modified when "submodule.$name.ignore" is set to "dirty" in in-tree ".gitmodules" file. Both status and commit honor the setting in $GIT_DIR/config, but "commit" does not pick it up from .gitmodules, which is inconsistent. Teach "git commit" to pay attention to the setting in .gitmodules as well. Signed-off-by: Orgad Shaneh <orgads@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
87b50542a0
commit
8f6811efed
1 changed files with 1 additions and 0 deletions
|
@ -1256,6 +1256,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
|
|||
struct wt_status s;
|
||||
|
||||
wt_status_prepare(&s);
|
||||
gitmodules_config();
|
||||
git_config(git_commit_config, &s);
|
||||
in_merge = file_exists(git_path("MERGE_HEAD"));
|
||||
s.in_merge = in_merge;
|
||||
|
|
Loading…
Reference in a new issue