From: Junio C Hamano <gitster@pobox.com>
To: Tim Olsen <tim@brooklynpenguin.com>
Cc: git@vger.kernel.org
Subject: Re: still getting 'It is a submodule!" in 1.6.2.5
Date: Mon, 04 May 2009 23:43:50 -0700 [thread overview]
Message-ID: <7vy6tc2gnt.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <gtnjq8$317$1@ger.gmane.org> (Tim Olsen's message of "Mon\, 04 May 2009 16\:39\:35 -0400")
Tim Olsen <tim@brooklynpenguin.com> writes:
> Clemens replied with a patch [2], but I don't think it got into git's git.
>
> Junio replied with two versions of a patch [3, 4], of which one of them
> appears to have made it into git's git as commit
> 7dae8b21c2fe39a59661c709f0dc17090dafa5a4
>
> 1.6.2.5 was then released yesterday which has commit
> 7dae8b21c2fe39a59661c709f0dc17090dafa5a4.
But that is not the one you want. 7dae8b2 (diff -c -p: do not die on
submodules, 2009-04-29) is to allow viewing of such a merge correctly; To
make the merge automatically, you'd need 0c44c94 (merge-recursive: do not
die on a conflicting submodule, 2009-04-29), which is on 'master', but not
on 1.6.2.X (and likely will never be).
Could you be running 1.6.3-rcX instead of 1.6.2.X? In general, the tip of
the 'master' is always as stable as any released version, if not more.
next prev parent reply other threads:[~2009-05-05 7:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-04 20:39 still getting 'It is a submodule!" in 1.6.2.5 Tim Olsen
2009-05-05 6:43 ` Junio C Hamano [this message]
2009-05-05 14:23 ` Tim Olsen
2009-05-05 15:23 ` Tim Olsen
2009-05-06 7:31 ` Matthias Andree
[not found] ` <20090506180925.6117@nanako3.lavabit.com>
2009-05-06 9:57 ` Matthias Andree
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=7vy6tc2gnt.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=tim@brooklynpenguin.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.
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).