From: Jens Lehmann Date: Tue, 8 Apr 2014 19:36:08 +0000 (+0200) Subject: gitk: Show staged submodules regardless of ignore config X-Git-Tag: v2.1.0-rc0~74^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/17f9836c8afc8d4b6d6bb91fd0658df090d75c8f?ds=inline;hp=17f9836c8afc8d4b6d6bb91fd0658df090d75c8f gitk: Show staged submodules regardless of ignore config Currently setting submodule..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 Signed-off-by: Junio C Hamano Signed-off-by: Paul Mackerras ---