Problem trying to pull particular commit from PM tree

Problem trying to pull particular commit from PM tree

[Peter Barada]

Is it possible to back up in time on the PM tree to find a particular
commit, even across rebasings?  I'm interested in the commit used by TI
to base their AM3517 work on which is:

[Commit:ef25c2a0e0]: OMAP3: PM: defconfig: enable SRF by default.

I tried:

git clone git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
git checkout -b pm origin/pm
git reset --hard ef25c2a0

But that came back with:

fatal: ambiguous argument 'ef25c2a0': unknown revision or path not in
the working tree.

My git 'fu' is pretty weak.  Any ideas why this doesn't work?
Thanks in advance!

-- 
Peter Barada <peterb@logicpd.com>
Logic Product Development, Inc.

Re: Problem trying to pull particular commit from PM tree

[Tony Lindgren]

* Peter Barada <peterb@logicpd.com> [091118 06:20]:
> Is it possible to back up in time on the PM tree to find a particular
> commit, even across rebasings?  I'm interested in the commit used by TI
> to base their AM3517 work on which is:
> 
> [Commit:ef25c2a0e0]: OMAP3: PM: defconfig: enable SRF by default.
> 
> I tried:
> 
> git clone git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
> git checkout -b pm origin/pm
> git reset --hard ef25c2a0
> 
> But that came back with:
> 
> fatal: ambiguous argument 'ef25c2a0': unknown revision or path not in
> the working tree.
> 
> My git 'fu' is pretty weak.  Any ideas why this doesn't work?
> Thanks in advance!

Maybe ef25c2a0e0 is some TI internal commit?

Tony

Re: Problem trying to pull particular commit from PM tree

[Gary Thomas]

On 11/18/2009 02:58 PM, Peter Barada wrote:
> On Wed, 2009-11-18 at 08:57 -0800, Tony Lindgren wrote:
>> * Peter Barada<peterb@logicpd.com>  [091118 06:20]:
>>> Is it possible to back up in time on the PM tree to find a particular
>>> commit, even across rebasings?  I'm interested in the commit used by TI
>>> to base their AM3517 work on which is:
>>>
>>> [Commit:ef25c2a0e0]: OMAP3: PM: defconfig: enable SRF by default.
>>>
>>> I tried:
>>>
>>> git clone git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
>>> git checkout -b pm origin/pm
>>> git reset --hard ef25c2a0
>>>
>>> But that came back with:
>>>
>>> fatal: ambiguous argument 'ef25c2a0': unknown revision or path not in
>>> the working tree.
>>>
>>> My git 'fu' is pretty weak.  Any ideas why this doesn't work?
>>> Thanks in advance!
>>
>> Maybe ef25c2a0e0 is some TI internal commit?
>
> I wouldn't think so.  Their comment in the release notes is:
>
> This release package includes a series of patches on top of the "pm"
> branch maintained at
> "http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=shortlog;h=pm". Baseline: [Commit:ef25c2a0e0]: OMAP3: PM: defconfig: enable SRF by default.
>
> 1) How can I search the linux-omap git world to see if the commit string
> exists?
>
> 2) When trees are rebased, are the previous commits in the tree lost -
> i.e. if tree A has commits A', A'', etc, and is rebased on tree B(which
> does not have the commits A', A'' in it), are the commits A', A'', etc
> lost?

Did you try specifying the entire key 'ef25c2a0e0', not just 'ef25c2a0'?

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

Re: Problem trying to pull particular commit from PM tree

[Peter Barada]

On Wed, 2009-11-18 at 08:57 -0800, Tony Lindgren wrote:
> * Peter Barada <peterb@logicpd.com> [091118 06:20]:
> > Is it possible to back up in time on the PM tree to find a particular
> > commit, even across rebasings?  I'm interested in the commit used by TI
> > to base their AM3517 work on which is:
> > 
> > [Commit:ef25c2a0e0]: OMAP3: PM: defconfig: enable SRF by default.
> > 
> > I tried:
> > 
> > git clone git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
> > git checkout -b pm origin/pm
> > git reset --hard ef25c2a0
> > 
> > But that came back with:
> > 
> > fatal: ambiguous argument 'ef25c2a0': unknown revision or path not in
> > the working tree.
> > 
> > My git 'fu' is pretty weak.  Any ideas why this doesn't work?
> > Thanks in advance!
> 
> Maybe ef25c2a0e0 is some TI internal commit?

I wouldn't think so.  Their comment in the release notes is:

This release package includes a series of patches on top of the "pm"
branch maintained at
"http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=shortlog;h=pm". Baseline: [Commit:ef25c2a0e0]: OMAP3: PM: defconfig: enable SRF by default.

1) How can I search the linux-omap git world to see if the commit string
exists?

2) When trees are rebased, are the previous commits in the tree lost -
i.e. if tree A has commits A', A'', etc, and is rebased on tree B(which
does not have the commits A', A'' in it), are the commits A', A'', etc
lost?


> Tony
-- 
Peter Barada <peterb@logicpd.com>
Logic Product Development, Inc.

Re: Problem trying to pull particular commit from PM tree

[Kevin Hilman]

Peter Barada <peterb@logicpd.com> writes:

> On Wed, 2009-11-18 at 08:57 -0800, Tony Lindgren wrote:
>> * Peter Barada <peterb@logicpd.com> [091118 06:20]:
>> > Is it possible to back up in time on the PM tree to find a particular
>> > commit, even across rebasings?  I'm interested in the commit used by TI
>> > to base their AM3517 work on which is:
>> > 
>> > [Commit:ef25c2a0e0]: OMAP3: PM: defconfig: enable SRF by default.
>> > 
>> > I tried:
>> > 
>> > git clone git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
>> > git checkout -b pm origin/pm
>> > git reset --hard ef25c2a0
>> > 
>> > But that came back with:
>> > 
>> > fatal: ambiguous argument 'ef25c2a0': unknown revision or path not in
>> > the working tree.
>> > 
>> > My git 'fu' is pretty weak.  Any ideas why this doesn't work?
>> > Thanks in advance!
>> 
>> Maybe ef25c2a0e0 is some TI internal commit?
>
> I wouldn't think so.  Their comment in the release notes is:
>
> This release package includes a series of patches on top of the "pm"
> branch maintained at
> "http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=shortlog;h=pm". Baseline: [Commit:ef25c2a0e0]: OMAP3: PM: defconfig: enable SRF by default.
>
> 1) How can I search the linux-omap git world to see if the commit string
> exists?
>
> 2) When trees are rebased, are the previous commits in the tree lost -
> i.e. if tree A has commits A', A'', etc, and is rebased on tree B(which
> does not have the commits A', A'' in it), are the commits A', A'', etc
> lost?

When a branch is rebased, all the commit IDs in that branch change, so
finding a change by commit ID in a rebased branch (like PM branch) is
impossible.

Kevin

Re: Problem trying to pull particular commit from PM tree

[Kalle Valo]

Hi Kevin,

Kevin Hilman <khilman@deeprootsystems.com> writes:

>> 2) When trees are rebased, are the previous commits in the tree lost -
>> i.e. if tree A has commits A', A'', etc, and is rebased on tree B(which
>> does not have the commits A', A'' in it), are the commits A', A'', etc
>> lost?
>
> When a branch is rebased, all the commit IDs in that branch change, so
> finding a change by commit ID in a rebased branch (like PM branch) is
> impossible.

What you could do is to tag the branch (with a date or something)
every time you rebase, that way git would store the old commits in the
repo. But I doubt it would be worth the effort, but that's one way to
store the history.

Just my 0.02 EUR :)

-- 
Kalle Valo