]> git.ipfire.org Git - thirdparty/git.git/commit - gitk-git/gitk
gitk: Show staged submodules regardless of ignore config
authorJens Lehmann <Jens.Lehmann@web.de>
Tue, 8 Apr 2014 19:36:08 +0000 (21:36 +0200)
committerPaul Mackerras <paulus@samba.org>
Sun, 15 Jun 2014 01:35:50 +0000 (11:35 +1000)
commit17f9836c8afc8d4b6d6bb91fd0658df090d75c8f
tree59c0ed91aba31be5773da0cf67cc4c2a94404b00
parent019e1630ac16f82fa6322869c8dfc3dee029e7ae
gitk: Show staged submodules regardless of ignore config

Currently setting submodule.<name>.ignore and/or diff.ignoreSubmodules to
"all" suppresses all output of submodule changes for gitk. This is really
confusing, as even when the user chooses to record a new commit for an
ignored submodule by adding it manually this change won't show up under
"Local changes checked in to index but not committed".

Fix that by using the '--ignore-submodules=dirty' option for both callers
of "git diff-index --cached" when the underlying git version supports that
option.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk