Skip to contentSkip to conversation

Problem trying to pull particular commit from PM tree

DISCUSSION Peter Barada 5 participants 6 messages Nov 18, 2009 – Nov 21, 2009

lore
Share & tools
lore
#0 lore raw

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!

Signature · 2 lines
Peter Barada <[email protected]>
Logic Product Development, Inc.
#1 lore raw
Quoted 12 lines · 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

Quoted 7 lines

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

#2 lore raw
Quoted 15 lines · Tony Lindgren
Quoted 14 lines · 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:

Quoted 7 lines
Quoted 5 lines

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?

Quoted 1 line

Tony

Signature · 2 lines
Peter Barada <[email protected]>
Logic Product Development, Inc.
#3 lore raw
Quoted 30 lines · Peter Barada
Quoted 15 lines · Tony Lindgren
Quoted 14 lines · 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:

Quoted 7 lines
Quoted 5 lines

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.

Quoted 7 lines

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'?

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
#4 lore raw
In reply to Peter Barada
Quoted 30 lines · Peter Barada
Quoted 15 lines · Tony Lindgren
Quoted 14 lines · 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:

Quoted 7 lines
Quoted 5 lines

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.

Quoted 7 lines

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

#5 lore raw

Hi Kevin,

Quoted 8 lines · Kevin Hilman
Quoted 4 lines

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 :)

Signature · 1 line
Kalle Valo