From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Fri, 13 Jun 2014 17:36:32 GMT
Subject: Re: [PATCH] git-gui: show staged submodules regardless of ignore config
Message-ID: <87k38k66j8.fsf@red.patthoyts.tk>
In-Reply-To: <xmqqppilpwwe.fsf@gitster.dls.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

>From: Jens Lehmann <Jens.Lehmann@web.de>
>Date: Tue, 8 Apr 2014 21:30:51 +0200
>
>Currently setting submodule.<name>.ignore and/or diff.ignoreSubmodules to
>"all" suppresses all output of submodule changes for git-gui. 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
>"Staged Changes (Will Commit)".
>
>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>
>---
>
> * Pat, I've been carrying this in my 'pu' but I would prefer
>   changes to git-gui fed to me through you.  Could you apply this
>   so that I can drop my tentative copy?
>

OK - Applied.

-- 
Pat Thoyts                            http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD