diff options
| author |  Orgad Shaneh <orgads@gmail.com> | 2012-09-23 09:37:47 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-09-24 09:28:36 -0700 |
| commit | 8f6811efed5451c72aac53f8ee12b1edcd426a73 (patch) | |
| tree | a45344bfe278fa516673d05d1345e468333d0941 | |
| parent | Git 1.7.3 (diff) | |
| download | tgif-8f6811efed5451c72aac53f8ee12b1edcd426a73.tar.xz | |
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>
| -rw-r--r-- | builtin/commit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 66fdd22024..3cb1ef73ad 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -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; |