From: Junio C Hamano <gitster@pobox.com>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: Adam Spiers <git@adamspiers.org>,
Git Mailing List <git@vger.kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH] update-index: allow overwriting existing submodule index entries
Date: Mon, 11 Jun 2012 08:03:29 -0700 [thread overview]
Message-ID: <7v3961ao1q.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20120609142658.GB16268@book.hvoigt.net> (Heiko Voigt's message of "Sat, 9 Jun 2012 16:27:00 +0200")
Heiko Voigt <hvoigt@hvoigt.net> writes:
> In commit e01105 Linus introduced gitlinks to update-index. He explains
> that he thinks it is not the right thing to replace a gitlink with
> something else.
>
> That commit is from the very first beginnings of submodule support.
> Since then we have gotten a lot closer to being able to remove a
> submodule without losing its history. This check prevents such a use
> case, so I think this assumption has changed.
Yeah, I think we should remove it if only to make it consistent with
"add" (if anything, the Porcelain level "add" should be the one that
is more strict and the plumbing level should be able to let you
shoot in the foot, not the other way around), but we need to make
sure "closer to" becomes reality. Can we remove and the resurrect
automatically when checking out a branch with a submodule when you
are on a branch with a directory and vice versa?
next prev parent reply other threads:[~2012-06-11 15:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-01 10:31 Bug in git citool when staging symlink as replacement for submodule Adam Spiers
2012-06-09 13:47 ` [PATCH] git-gui: recognize submodule diff when replaced by file Heiko Voigt
2012-06-09 14:27 ` [PATCH] update-index: allow overwriting existing submodule index entries Heiko Voigt
2012-06-11 15:03 ` Junio C Hamano [this message]
2012-06-11 21:23 ` Jens Lehmann
2012-06-12 20:33 ` Heiko Voigt
2012-06-12 21:18 ` Jens Lehmann
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=7v3961ao1q.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@adamspiers.org \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.net \
--cc=torvalds@linux-foundation.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).