From: Julian Ibarz <julian.ibarz@gmail.com>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Jens Lehmann <Jens.Lehmann@web.de>,
git@vger.kernel.org
Subject: Re: Re: Updating a submodule with a compatible version from another submodule version using the parent meta-repository
Date: Sun, 30 Jan 2011 04:44:59 -0500 [thread overview]
Message-ID: <AANLkTimBCeSnR270eWMcrgCVj6rmiRkJizOxQPAPOAnn@mail.gmail.com> (raw)
In-Reply-To: <20110129110807.GA21864@book.hvoigt.net>
Today I have started to implement a proof of concept in C (I know a
script would be better but I am really not good in sh so...). I
struggle with the manipulation of the git API. I have pushed my work
here:
http://gitorious.org/julian_ibarz_git/julian_ibarz_git
in branch submodule_checkout
My work is in:
builtin/submodulecheckout.c
And my questions are prepended by the keyword QUESTION (two questions
for now only).
Any help is welcome.
Thanks,
Julian Ibarz
On Sat, Jan 29, 2011 at 6:08 AM, Heiko Voigt <hvoigt@hvoigt.net> wrote:
> Hi,
>
> On Wed, Jan 26, 2011 at 02:05:43PM -0800, Junio C Hamano wrote:
>> If that version of submodule B is explicitly bound to a commit in the
>> superproject A, you know which version of A and C were recorded, and the
>> problem is solved.
>>
> [...]
>>
>> If you are confident that you didn't introduce different kind of
>> dependency to other submodules while developing your "old_feature" branch
>> in submodule B, one strategy may be to find an ancestor, preferrably the
>> fork point, of your "old_feature" branch that is bound to the superproject
>> A. Then at that point at least you know whoever made that commit in A
>> tested the combination of what was recorded in that commit, together with
>> the version of B and C, and you can go forward from there, replaying the
>> changes you made to the "old_feature" branch in submodule B.
>
> Lets extend your explanation a little further and maybe demonstrate the problem
> Julian is having a little more. I think what Julian searches for is a tool in
> git that does the lookup for you which is AFAIK not that easy currently. It
> seems to be a quite useful feature. Here what I understand Julian wants:
>
> 1. Find the most recent superproject commit X'' in A that records a submodule
> commit X' in B which contains the commit X in B you are searching for.
>
> For this we would need use something similar to git describe --contains
> but instead of using the list of existing tags in B it should use the list
> of commits in B which are recorded in A.
>
> Here a drawing to explain (linear history for simplicity):
>
> superproject A:
>
> O---O---X''---O
> \
> submodule B: \
> \
> O---X---O---X'---O---O
>
> 2. Look up the commit of C which is recorded in X'' of A and check it
> out.
>
> Step 2 is easy but for Step 1 the lookup of X' is missing for the commandline.
> Is there already anything that implements git describe --contains for a defined
> list of commits instead of refs?
>
> Cheers Heiko
>
next prev parent reply other threads:[~2011-01-30 9:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <AANLkTinN1XVsAZXGLqkuhysrJ8-TCtGm4pOu2RfCEVVp@mail.gmail.com>
2011-01-26 18:32 ` Updating a submodule with a compatible version from another submodule version using the parent meta-repository Julian Ibarz
2011-01-26 19:06 ` Jens Lehmann
2011-01-26 19:10 ` Julian Ibarz
2011-01-26 19:39 ` Jens Lehmann
2011-01-26 19:48 ` Julian Ibarz
2011-01-26 20:31 ` Jens Lehmann
2011-01-26 20:43 ` Julian Ibarz
2011-01-26 20:41 ` Junio C Hamano
2011-01-26 20:45 ` Julian Ibarz
2011-01-26 22:05 ` Junio C Hamano
2011-01-29 11:08 ` Heiko Voigt
2011-01-30 9:44 ` Julian Ibarz [this message]
2011-02-03 4:31 ` Julian Ibarz
2011-02-06 18:51 ` Heiko Voigt
2011-02-09 19:36 ` Heiko Voigt
2011-02-12 20:32 ` Julian Ibarz
2011-02-13 13:30 ` Heiko Voigt
2011-02-13 18:59 ` Julian Ibarz
2011-02-14 21:13 ` Heiko Voigt
2011-02-20 1:15 ` Julian Ibarz
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=AANLkTimBCeSnR270eWMcrgCVj6rmiRkJizOxQPAPOAnn@mail.gmail.com \
--to=julian.ibarz@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
/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).