From: Junio C Hamano Date: Mon, 1 Oct 2012 19:58:51 +0000 (-0700) Subject: Merge branch 'os/commit-submodule-ignore' X-Git-Tag: v1.8.0-rc0~4 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/69759917aa4b1efb5bf198e76c3664bed9c70d4d?hp=4dbf436bffdf43f91852e23018fc0e45c1bfdab8 Merge branch 'os/commit-submodule-ignore' "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 4d50484837..a17a5df449 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1419,6 +1419,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;