git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nico -telmich- Schottelius <nico-linux-git@schottelius.org>
To: git@vger.kernel.org
Subject: Changled submodule cannot be "git added"
Date: Tue, 15 Jun 2010 09:25:14 +0200	[thread overview]
Message-ID: <20100615072514.GA3260@schottelius.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1874 bytes --]

And another interesting behaviour of git with submodules:

--------------------------------------------------------------------------------
% git status
# On branch master
# Your branch is ahead of 'origin/master' by 8 commits.
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#   (commit or discard the untracked or modified content in submodules)
#
#       modified:   modules/tftpd_hpa (modified content)
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       modules/ethz_systems_private/
no changes added to commit (use "git add" and/or "git commit -a")
% git add modules/tftpd_hpa
# On branch master
# Your branch is ahead of 'origin/master' by 8 commits.
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#   (commit or discard the untracked or modified content in submodules)
#
#       modified:   modules/tftpd_hpa (modified content)
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       modules/ethz_systems_private/
no changes added to commit (use "git add" and/or "git commit -a")
--------------------------------------------------------------------------------

- Why can modules/tftpd_hpa not be added?
- 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)

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 --]

             reply	other threads:[~2010-06-15  7:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-15  7:25 Nico -telmich- Schottelius [this message]
2010-06-15  7:37 ` Changled submodule cannot be "git added" Nico -telmich- Schottelius
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=20100615072514.GA3260@schottelius.org \
    --to=nico-linux-git@schottelius.org \
    --cc=git@vger.kernel.org \
    /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).