From: Jens Lehmann <Jens.Lehmann@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
git@vger.kernel.org, Klaus Ethgen <Klaus@Ethgen.de>,
Sven Verdoolaege <skimo@kotnet.org>
Subject: Re: [RFC/PATCH] Re: git submodule -b ... of current HEAD fails
Date: Wed, 29 Dec 2010 01:05:22 +0100 [thread overview]
Message-ID: <4D1A7B42.1050907@web.de> (raw)
In-Reply-To: <7vipydwp50.fsf@alter.siamese.dyndns.org>
Am 28.12.2010 22:42, schrieb Junio C Hamano:
> Jonathan Nieder <jrnieder@gmail.com> writes:
>
>> git submodule add -b $branch $repository
>>
>> fails when HEAD already points to $branch in $repository.
>
> I was reviewing the overall picture before tagging 1.7.4-rc0 and started
> wondering if this was a good change. If repository already had branch
> checked out, and if it was pointing at a commit that was different from
> whatever was taken from origin, shouldn't the command _fail_ to prevent
> the divergent commits from getting lost?
But doesn't this change only affect the case where the submodule is
freshly cloned, so there is no chance of losing local changes?
(But AFAIK the patch doesn't really fix the issue, please see [1] and
Jonathan's followup)
[1] http://thread.gmane.org/gmane.linux.debian.devel.bugs.general/772659/focus=163242
next prev parent reply other threads:[~2010-12-29 0:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20101201171814.GC6439@ikki.ethgen.de>
2010-12-01 18:50 ` [RFC/PATCH] Re: git submodule -b ... of current HEAD fails Jonathan Nieder
2010-12-02 21:11 ` Jens Lehmann
2010-12-03 1:16 ` Mark Levedahl
2010-12-03 1:21 ` Ben Jackson
2010-12-03 7:10 ` Jonathan Nieder
2010-12-04 23:27 ` [PATCH] git submodule: Remove now obsolete tests before cloning a repo Jens Lehmann
2010-12-07 22:57 ` [RFC/PATCH] Re: git submodule -b ... of current HEAD fails Junio C Hamano
2010-12-08 21:35 ` Jens Lehmann
2010-12-08 23:19 ` [PATCH] " Jens Lehmann
2010-12-08 23:45 ` Jonathan Nieder
2010-12-28 21:42 ` [RFC/PATCH] " Junio C Hamano
2010-12-29 0:05 ` Jens Lehmann [this message]
2010-12-29 0:34 ` Junio C Hamano
2010-12-29 9:04 ` Jens Lehmann
2010-12-29 20:53 ` Re* " Junio C Hamano
[not found] ` <4D1BB26D.1010502@web.de>
2010-12-29 22:23 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D1A7B42.1050907@web.de \
--to=jens.lehmann@web.de \
--cc=Klaus@Ethgen.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=skimo@kotnet.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.
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 NNTP newsgroup(s).