From: Howard Miller <howardsmiller@gmail.com>
To: git@vger.kernel.org
Subject: "submodule" mistake and a problem
Date: Mon, 1 Oct 2012 11:41:13 +0100 [thread overview]
Message-ID: <CAHVO_92=5u-i+-d__5k7Uoq5pF4iACq9GuBSj4U5MepbKV_jdA@mail.gmail.com> (raw)
Hi,
I did this and now am confused/stuck...
- I have an existing (long standing) project in git with an upstream in github
- I added a subdirectory which I had forgotten was itself a git
project (i.e. it has its own .git directory)
- I committed the subdirectory (git add /path/to/subdir; git commit -m ....)
- I pushed the latest version upstream
....at this point I realised that only the directory name had been pushed. SO...
- git rm /path/to/subdir resulted in fatal: pathspec
'/path/to/subdir/' did not match any files
- so I deleted it manually, re-copied the directory and removed its
.git directory
...I now cannot add or commit the directory. Git just ignores it. I
have grepped and searched and kind find no reference to this directory
anywhere. I am completely stumped.
Can anybody help? I don't want this to be a git subdirectory, I just
want to be able to add the files (without the .git directory)
Cheers :)
next reply other threads:[~2012-10-01 10:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-01 10:41 Howard Miller [this message]
2012-10-01 11:42 ` "submodule" mistake and a problem Johannes Sixt
2012-10-01 12:05 ` Howard Miller
2012-10-01 16:40 ` Jens Lehmann
2012-10-01 21:16 ` Howard Miller
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHVO_92=5u-i+-d__5k7Uoq5pF4iACq9GuBSj4U5MepbKV_jdA@mail.gmail.com' \
--to=howardsmiller@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).