git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* "submodule" mistake and a problem
@ 2012-10-01 10:41 Howard Miller
  2012-10-01 11:42 ` Johannes Sixt
  0 siblings, 1 reply; 5+ messages in thread
From: Howard Miller @ 2012-10-01 10:41 UTC (permalink / raw)
  To: git

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 :)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: "submodule" mistake and a problem
  2012-10-01 10:41 "submodule" mistake and a problem Howard Miller
@ 2012-10-01 11:42 ` Johannes Sixt
  2012-10-01 12:05   ` Howard Miller
  0 siblings, 1 reply; 5+ messages in thread
From: Johannes Sixt @ 2012-10-01 11:42 UTC (permalink / raw)
  To: Howard Miller; +Cc: git

Am 10/1/2012 12:41, schrieb Howard Miller:
> - 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)

Perhaps:

  git rm -f --cached path/to/subdir   # remove from index, keep files
  git add path/to/subdir

-- Hannes

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: "submodule" mistake and a problem
  2012-10-01 11:42 ` Johannes Sixt
@ 2012-10-01 12:05   ` Howard Miller
  2012-10-01 16:40     ` Jens Lehmann
  0 siblings, 1 reply; 5+ messages in thread
From: Howard Miller @ 2012-10-01 12:05 UTC (permalink / raw)
  To: Johannes Sixt; +Cc: git

>
> Perhaps:
>
>   git rm -f --cached path/to/subdir   # remove from index, keep files
>   git add path/to/subdir
>
> -- Hannes

Fantastic.... worked perfectly.  I'll write that down somewhere for
the next time I do it :)

Is there a better way of handling sub-modules like that? I've looked
at git submodules but just got into more of a mess. It would be nice
to push a project complete with a (git) submodule upstream but it
seems tricky or impossible.

Thanks :)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: "submodule" mistake and a problem
  2012-10-01 12:05   ` Howard Miller
@ 2012-10-01 16:40     ` Jens Lehmann
  2012-10-01 21:16       ` Howard Miller
  0 siblings, 1 reply; 5+ messages in thread
From: Jens Lehmann @ 2012-10-01 16:40 UTC (permalink / raw)
  To: Howard Miller; +Cc: Johannes Sixt, git

Am 01.10.2012 14:05, schrieb Howard Miller:
>>
>> Perhaps:
>>
>>   git rm -f --cached path/to/subdir   # remove from index, keep files
>>   git add path/to/subdir
>>
>> -- Hannes
> 
> Fantastic.... worked perfectly.  I'll write that down somewhere for
> the next time I do it :)
> 
> Is there a better way of handling sub-modules like that? I've looked
> at git submodules but just got into more of a mess. It would be nice
> to push a project complete with a (git) submodule upstream but it
> seems tricky or impossible.

Git submodules are distinct repositories by design, so you'd have to
create an upstream repository for the submodule too to make that work.
But I have the impression that you want to import another repository
into a directory of your repo, so maybe git subtree is what you want.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: "submodule" mistake and a problem
  2012-10-01 16:40     ` Jens Lehmann
@ 2012-10-01 21:16       ` Howard Miller
  0 siblings, 0 replies; 5+ messages in thread
From: Howard Miller @ 2012-10-01 21:16 UTC (permalink / raw)
  To: Jens Lehmann; +Cc: Johannes Sixt, git

I was not aware of git subtree. I'll go and do some reading. Thanks
for the pointer!

On 1 October 2012 17:40, Jens Lehmann <Jens.Lehmann@web.de> wrote:
>
> Am 01.10.2012 14:05, schrieb Howard Miller:
> >>
> >> Perhaps:
> >>
> >>   git rm -f --cached path/to/subdir   # remove from index, keep files
> >>   git add path/to/subdir
> >>
> >> -- Hannes
> >
> > Fantastic.... worked perfectly.  I'll write that down somewhere for
> > the next time I do it :)
> >
> > Is there a better way of handling sub-modules like that? I've looked
> > at git submodules but just got into more of a mess. It would be nice
> > to push a project complete with a (git) submodule upstream but it
> > seems tricky or impossible.
>
> Git submodules are distinct repositories by design, so you'd have to
> create an upstream repository for the submodule too to make that work.
> But I have the impression that you want to import another repository
> into a directory of your repo, so maybe git subtree is what you want.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-10-01 21:16 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-01 10:41 "submodule" mistake and a problem Howard Miller
2012-10-01 11:42 ` Johannes Sixt
2012-10-01 12:05   ` Howard Miller
2012-10-01 16:40     ` Jens Lehmann
2012-10-01 21:16       ` Howard Miller

Code repositories for project(s) associated with this 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).