From: Jens Lehmann <Jens.Lehmann@web.de>
To: Johan Herland <johan@herland.net>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Andy Parkins <andyparkins@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH 0/2] Add optional parameters to the diff option "--ignore-submodules"
Date: Wed, 09 Jun 2010 08:23:17 +0200 [thread overview]
Message-ID: <4C0F3355.7050202@web.de> (raw)
In-Reply-To: <201006090149.22027.johan@herland.net>
Am 09.06.2010 01:49, schrieb Johan Herland:
> On Wednesday 09 June 2010, Jens Lehmann wrote:
>> There are currently (since 1.7.0) three reasons a submodule is considered
>> dirty:
>>
>> 1) It contains untracked content
>> 2) It contains modified tracked content
>> 3) It contains newer commits than those committed in the superproject
>
> I guess 3) really means that the submodule's HEAD points to a _different_
> (not necessarily _newer_) commit than what's referenced in the superproject.
Sure, please replace my inaccurate description with yours ;-)
>> "all" would ignore 1), 2) & 3)
>> "dirty" would ignore 1) & 2)
>> "untracked" would ignore 1)
>
> ...and just to complete my understanding of this, 3) requires only checking
> the submodule's current HEAD, while 1) and 2) require traversing its work
> tree (i.e. the equivalent of a 'git status'), hence the potential
> expensiveness.
Thats correct.
> Also, I guess 2) includes both staged and unstaged modifications to tracked
> content?
Yes (as it doesn't make a difference to the superproject if modifications
inside the submodule are staged or not there is no distinction made between
those two).
> Thanks for your help. All the ideas in your cover letter seem good to me.
Thank you for your comments, I'll start hacking to show some more patches.
prev parent reply other threads:[~2010-06-09 6:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-08 16:30 [PATCH 0/2] Add optional parameters to the diff option "--ignore-submodules" Jens Lehmann
2010-06-08 16:31 ` [PATCH 1/2] git diff: rename test that had a conflicting name Jens Lehmann
2010-06-08 16:31 ` [PATCH 2/2] Add optional parameters to the diff option "--ignore-submodules" Jens Lehmann
2010-06-24 14:23 ` Brandon Casey
2010-06-24 17:11 ` Jens Lehmann
2010-06-08 17:28 ` [PATCH 0/2] " Junio C Hamano
2010-06-08 20:41 ` Jens Lehmann
2010-06-08 21:02 ` Johannes Schindelin
2010-06-08 23:26 ` Junio C Hamano
2010-06-08 23:36 ` Johannes Schindelin
2010-06-08 22:11 ` Johan Herland
2010-06-08 22:19 ` Jens Lehmann
2010-06-08 23:49 ` Johan Herland
2010-06-09 6:23 ` Jens Lehmann [this message]
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=4C0F3355.7050202@web.de \
--to=jens.lehmann@web.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johan@herland.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).