From: Junio C Hamano Date: Mon, 8 Oct 2012 18:34:34 +0000 (-0700) Subject: Merge branch 'os/commit-submodule-ignore' into maint X-Git-Tag: v1.7.12.3~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ff5702c52d66773ca5f32b46f9669880437e82e8?hp=25c08907a0a178d352b318f8d1de15d2680394ff Merge branch 'os/commit-submodule-ignore' into maint "git status" honored the ignore=dirty settings in .gitmodules but "git commit" didn't. * os/commit-submodule-ignore: commit: pay attention to submodule.$name.ignore in .gitmodules --- diff --git a/builtin/commit.c b/builtin/commit.c index 62028e7b44..7a83cae6ff 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1452,6 +1452,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) usage_with_options(builtin_commit_usage, builtin_commit_options); wt_status_prepare(&s); + gitmodules_config(); git_config(git_commit_config, &s); determine_whence(&s); s.colopts = 0;