Merge branch 'os/commit-submodule-ignore' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Oct 2012 18:34:34 +0000 (11:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Oct 2012 18:34:34 +0000 (11:34 -0700)
"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

builtin/commit.c
index 62028e7b44b206e9722eef750be8c067aae31b32..7a83cae6ff9d0168c3d9be4241e3cd94f1128a23 100644 (file)
@@ -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;