From: Christopher Collins <chris@runtime.io>
To: git@vger.kernel.org
Subject: bug: Directory replaced by submodule -> checkout fails
Date: Thu, 17 Oct 2019 16:07:51 -0700 [thread overview]
Message-ID: <20191017230751.GC4049@pseudoephedrine.nightmare-heaven.no-ip.biz> (raw)
Hello all,
### Environment:
$ git --version
git version 2.21.0
### Reproduce:
git clone git@github.com:JuulLabs-OSS/mcuboot.git
cd mcuboot
git submodule init
git submodule update
git checkout ae01f153b11637feaedbc9d9042172fba2e080c0
### Discussion:
In the above sequence, the last step (checkout) fails with this error:
error: The following untracked working tree files would be overwritten by checkout:
ext/mbedtls/include/mbedtls/asn1.h
ext/mbedtls/include/mbedtls/bignum.h
ext/mbedtls/include/mbedtls/check_config.h
ext/mbedtls/include/mbedtls/config.h
ext/mbedtls/include/mbedtls/ecdsa.h
ext/mbedtls/include/mbedtls/ecp.h
ext/mbedtls/include/mbedtls/md.h
ext/mbedtls/include/mbedtls/oid.h
ext/mbedtls/include/mbedtls/pk.h
ext/mbedtls/include/mbedtls/platform.h
ext/mbedtls/include/mbedtls/platform_util.h
ext/mbedtls/include/mbedtls/threading.h
Please move or remove them before you switch branches.
Aborting
In the mcuboot repo, a regular directory was recently replaced with a
submodule. This was done with two separate commits:
1. (b748f6) Rename `ext/mbedtls` --> `ext/mbedtls-asn1`
2. (f984b9) Add submodule `ext/mbedtls`
Git reports an error when you use `git checkout` to "jump over" these
two commits. The sequence above shows what happens when you go from
post-replace to pre-replace (master to ae01f1).
When you do the reverse (pre-replace to post-replace), the checkout
operation succeeds, but git emits the following warning:
warning: unable to rmdir 'sim/mcuboot-sys/mbedtls': Directory not empty
This leaves the repo in a dirty state.
The problem is easy to work around by hand:
rm -rf ext/mbedtls sim/mcuboot-sys/mbedtls
git checkout ae01f153b11637feaedbc9d9042172fba2e080c0
Unfortunately it is not easy for automated tools to work around the
issue.
Thanks,
Chris
next reply other threads:[~2019-10-17 23:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 23:07 Christopher Collins [this message]
2019-10-18 12:02 ` bug: Directory replaced by submodule -> checkout fails Thomas Braun
2019-10-18 16:30 ` Christopher Collins
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=20191017230751.GC4049@pseudoephedrine.nightmare-heaven.no-ip.biz \
--to=chris@runtime.io \
--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).