From: Thomas Braun <thomas.braun@virtuell-zuhause.de>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org
Subject: Re: Branch switching with submodules where the submodule replaces a folder aborts unexpectedly
Date: Thu, 12 Oct 2017 13:48:50 +0200 (CEST) [thread overview]
Message-ID: <591155758.21471.1507808930483@ox.hosteurope.de> (raw)
In-Reply-To: <CAGZ79kYTY6U0eNwvU0PcDyt_QXGyYGm5VkDvWLtuQgQG6BbtFA@mail.gmail.com>
> Stefan Beller <sbeller@google.com> hat am 9. Oktober 2017 um 23:59 geschrieben:
>
>
> On Mon, Oct 9, 2017 at 2:29 PM, Thomas Braun
> <thomas.braun@virtuell-zuhause.de> wrote:
> > Hi,
> >
> > I'm currently in the progress of pulling some subprojects in a git repository of mine into their
> > own repositories and adding these subprojects back as submodules.
> >
> > While doing this I enountered a potential bug as checkout complains on branch switching that a
> > file already exists.
>
> (And I presume you know about --recurse-submodules as a flag for git-checkout)
No I did not know about it. I tend to not know options which don't complete in my shell (patch follows for that).
> This is consistent with our tests, unfortunately.
>
> git/t$ ./t2013-checkout-submodule.sh
> ...
> not ok 15 - git checkout --recurse-submodules: replace submodule with
> a directory # TODO known breakage
> ...
>
> > If I'm misusing git here I'm glad for any advice.
>
> You are not.
Glad to know that.
> Apart from this bug report, would you think that such filtering of
> trees into submodules (and back again) might be an interesting feature
> of Git or are these cases rare and special?
For me not particularly. In my case it is a one time thing going from an embedded project folder to a submodule.
next prev parent reply other threads:[~2017-10-12 11:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-09 21:29 Branch switching with submodules where the submodule replaces a folder aborts unexpectedly Thomas Braun
2017-10-09 21:59 ` Stefan Beller
2017-10-12 11:48 ` Thomas Braun [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-06-19 16:03 Sam Kuper
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=591155758.21471.1507808930483@ox.hosteurope.de \
--to=thomas.braun@virtuell-zuhause.de \
--cc=git@vger.kernel.org \
--cc=sbeller@google.com \
/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).