From: Pat Thoyts <patthoyts@users.sourceforge.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jens Lehmann <Jens.Lehmann@web.de>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] git-gui: show staged submodules regardless of ignore config
Date: Fri, 13 Jun 2014 18:36:32 +0100 [thread overview]
Message-ID: <87k38k66j8.fsf@red.patthoyts.tk> (raw)
In-Reply-To: <xmqqppilpwwe.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Fri, 06 Jun 2014 14:10:09 -0700")
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
next prev parent reply other threads:[~2014-06-13 17:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-06 21:10 [PATCH] git-gui: show staged submodules regardless of ignore config Junio C Hamano
2014-06-13 17:36 ` Pat Thoyts [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-08 19:30 Jens Lehmann
2014-04-15 22:32 ` 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=87k38k66j8.fsf@red.patthoyts.tk \
--to=patthoyts@users.sourceforge.net \
--cc=Jens.Lehmann@web.de \
--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.