From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Stefan Beller <sbeller@google.com>,
juergen.vogl@jku.at, git <git@vger.kernel.org>
Subject: Re: Bug with "git mv" and submodules, and with "git submodule add something --force"
Date: Mon, 22 Oct 2018 11:52:54 +0900 [thread overview]
Message-ID: <xmqqd0s2y9o9.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20181019205837.GA84932@aiede.svl.corp.google.com> (Jonathan Nieder's message of "Fri, 19 Oct 2018 13:58:37 -0700")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Stefan Beller wrote:
>
>> Maybe for now we can do with just an update of the documentation/bugs
>> section and say we cannot move files in and out of submodules?
>
> I think we have some existing logic to prevent "git add"-ing a file
> within a submodule to the superproject, for example.
There is die_path_inside_submodule() that sanity-checks the pathspec
and rejects. But I think that is done primarily to give an error
message and not strictly necesary for correctness.
The real safety of "git add" is its call to dir.c::fill_directory();
it collects untracked paths that match the pathspec so that they can
be added as new paths, but because it won't cross the module
boundary, you won't get such a path in the index to begin with.
> So "git mv" should learn the same trick. And perhaps the trick needs
> to be moved down a layer (e.g. into the index API). Hints?
You would want to be able to remove a submodule and replace it with
a directory, but you can probably do it in two steps, i.e.
git reset --hard
git rm --cached sha1collisiondetection
echo Now a regular dir >sha1collisiondetection/READ.ME
find sha1collisiondetection ! -type d -print0 |
git update-index --add --stdin -z
So from that point of view, forbidding (starting from the same state
of our project) this sequence:
git reset --hard
echo Now a regular dir >sha1collisiondetection/READ.ME
find sha1collisiondetection ! -type d -print0 |
git update-index --add --remove --stdin -z
that would nuke the submodule and replace it with a directory within
which there are files would be OK. Making the latter's default
rejection overridable with ADD_CACHE_OK_TO_REPLACE would also be
fine.
next prev parent reply other threads:[~2018-10-22 2:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-19 12:33 Bug with "git mv" and submodules, and with "git submodule add something --force" Juergen Vogl
2018-10-19 20:40 ` Stefan Beller
2018-10-19 20:58 ` Jonathan Nieder
2018-10-22 2:52 ` Junio C Hamano [this message]
2018-10-22 21:52 ` Stefan Beller
2018-10-24 7:18 ` Junio C Hamano
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=xmqqd0s2y9o9.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=juergen.vogl@jku.at \
--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).