diff options
author | Jens Lehmann <Jens.Lehmann@web.de> | 2014-04-05 18:59:36 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-07 10:42:35 -0700 |
commit | c215d3d2826c882feb819e5743287ec74d9ff693 (patch) | |
tree | 982b8ca3923d2b85feea648f7107114e44188bd8 /t/t2107-update-index-basic.sh | |
parent | status/commit: show staged submodules regardless of ignore config (diff) | |
download | tgif-c215d3d2826c882feb819e5743287ec74d9ff693.tar.xz |
commit -m: commit staged submodules regardless of ignore config
The previous commit fixed the problem that the staged but that ignored
submodules did not show up in the status output of the commit command and
weren't committed afterwards either. But when commit doesn't generate the
status output (e.g. when used in a script with '-m') the ignored submodule
will still not be committed. This is because in that case a different code
path is taken which calls index_differs_from() instead of calling the
wt_status functions.
Fix that by calling index_differs_from() from builtin/commit.c with a
diff_options argument value that tells it not ignore any submodule changes
unless the '--ignore-submodules' option is used. Even though this option
isn't yet implemented for cmd_commit() but only for cmd_status() this
prepares cmd_commit() to correctly handle the '--ignore-submodules' option
later. As status and commit share the same ignore_submodule_arg variable
this makes the code more robust against accidental breakage and documents
how to correctly call index_differs_from().
Change the expected result of the test documenting this problem from
failure to success.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2107-update-index-basic.sh')
0 files changed, 0 insertions, 0 deletions