From: Nico -telmich- Schottelius <nico-linux-git@schottelius•org>
To: git@vger•kernel.org
Subject: Re: Changled submodule cannot be "git added"
Date: Tue, 15 Jun 2010 09:37:20 +0200 [thread overview]
Message-ID: <20100615073720.GB3260@schottelius.org> (raw)
In-Reply-To: <20100615072514.GA3260@schottelius.org>
[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]
Nico -telmich- Schottelius [Tue, Jun 15, 2010 at 09:25:14AM +0200]:
> And another interesting behaviour of git with submodules:
>
> --------------------------------------------------------------------------------
> % git status
> # modified: modules/tftpd_hpa (modified content)
Ok, found out that I changed stuff within modules/tftpd_hpa, instead of
merging from the source.
Imho the git status output is a bit misleading, as I assume that
I can git add stuff that's modified.
Perhaps git add should print a warning / error if I try to add the
changed submodule and not silently ignore it.
Regarding the other problem
> - Why does git checkout not remove modules/ethz_systems_private/,
> when switching from the master to the private branch?
> (the module is only registered in the private branch)
I'm still not sure what's the reason for that.
Nico
--
New PGP key: 7ED9 F7D3 6B10 81D7 0EC5 5C09 D7DC C8E4 3187 7DF0
Please resign, if you signed 9885188C or 8D0E27A4.
Currently moving *.schottelius.org to http://www.nico.schottelius.org/ ...
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2010-06-15 7:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-15 7:25 Changled submodule cannot be "git added" Nico -telmich- Schottelius
2010-06-15 7:37 ` Nico -telmich- Schottelius [this message]
2010-06-15 16:05 ` Jens Lehmann
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=20100615073720.GB3260@schottelius.org \
--to=nico-linux-git@schottelius$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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