From: Paul Mackerras <paulus@samba.org>
Date: Sun, 15 Jun 2014 04:57:13 GMT
Subject: Re: [PATCH] gitk: show staged submodules regardless of ignore config
Message-ID: <20140615045713.GD21978@iris.ozlabs.ibm.com>
In-Reply-To: <xmqqtx7xpwz6.fsf@gitster.dls.corp.google.com>

On Fri, Jun 06, 2014 at 02:08:29PM -0700, Junio C Hamano wrote:
> From: Jens Lehmann <Jens.Lehmann@web.de>
> Date: Tue, 8 Apr 2014 21:36:08 +0200
> 
> 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>

Thanks, applied.

Paul.