From: Paul Mackerras <paulus@samba.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] gitk: show staged submodules regardless of ignore config
Date: Sun, 15 Jun 2014 14:57:13 +1000 [thread overview]
Message-ID: <20140615045713.GD21978@iris.ozlabs.ibm.com> (raw)
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.
next prev parent reply other threads:[~2014-06-15 4:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-06 21:08 [PATCH] gitk: show staged submodules regardless of ignore config Junio C Hamano
2014-06-15 4:57 ` Paul Mackerras [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-08 19:36 Jens Lehmann
2014-04-15 22:34 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140615045713.GD21978@iris.ozlabs.ibm.com \
--to=paulus@samba.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.