From: Jens Lehmann <Jens.Lehmann@web.de>
To: Brandon Casey <drafnel@gmail.com>
Cc: Brandon Casey <casey@nrlssc.navy.mil>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, johannes.schindelin@gmx.de
Subject: Re: [PATCH] builtin/describe.c: ignore untracked changes in submodules
Date: Mon, 13 Sep 2010 19:59:27 +0200 (CEST) [thread overview]
Message-ID: <503065167.8606900.1284400767803.JavaMail.fmail@mwmweb047> (raw)
In-Reply-To: <AANLkTinMf-_vk2-gRazf-8FNykZoNbVwmu_+c+5ht8rY@mail.gmail.com>
>Do you agree that there is an inconsistency between how untracked content is
>treated at the super-project level and at the submodule level?
Yes, but I - and others included in that discussion some time ago - could not
come up with a sane and simple solution to that problem.
> Any thoughts
>about how the behavior should be made to be consistent?
The core of this issue is that for git a file is either untracked, modified or clean.
But submodules can have every combination of all these states - as they consist
of multiple files - and additionally their HEAD can differ from the commit recorded
in the superproject. So basically I see two ways to handle that:
a) add new states for an entry to represent all missing combinations of possible
states for submodules and tell all porcelain to handle these.
b) simplify this problem by having a submodule show up as modified when
either of these three conditions are met (and enable the user to choose what
conditions she wants to see and what not).
Obviously a) will complicate all git by a large degree just for the sake of submodules.
I am arguing for b), because submodules itself can be seen as a bunch of files which
don't interest me as single entities until I want to take a closer look. I think the issue
we are discussing here is the price we have to pay for this abstraction. I am very
open to proposals how to better handle that but so far I haven't seen any.
>Perhaps the default setting of submodule.<name>.ignore should be 'untracked'?
I still vote for none. I think the default should be to not have untracked files in
your projects (like you should not have warnings when compiling your project).
If that is not wanted, just use the configuration options git provides to change it.
next prev parent reply other threads:[~2010-09-13 17:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-09 19:12 [PATCH] builtin/describe.c: ignore untracked changes in submodules Brandon Casey
2010-09-10 0:21 ` Junio C Hamano
2010-09-10 18:40 ` Jens Lehmann
2010-09-12 19:10 ` Brandon Casey
2010-09-13 17:59 ` Jens Lehmann [this message]
[not found] ` <1258122337.8606899.1284400767503.JavaMail.fmail@mwmweb047>
2010-09-13 18:18 ` Jens Lehmann
2010-09-13 23:14 ` Junio C Hamano
2010-09-14 20:30 ` Jens Lehmann
[not found] ` <1464835923.7527323.1284144028047.JavaMail.fmail@mwmweb047>
2010-09-11 18:11 ` Jens Lehmann
2010-09-11 19:13 ` Junio C Hamano
2010-09-11 20:23 ` Jens Lehmann
2010-09-12 17:44 ` Junio C Hamano
2010-09-12 20:07 ` Junio C Hamano
2010-09-12 2:22 ` yj2133011
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=503065167.8606900.1284400767803.JavaMail.fmail@mwmweb047 \
--to=jens.lehmann@web.de \
--cc=casey@nrlssc.navy.mil \
--cc=drafnel@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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).