Thread (3 messages) flat view 3 messages, 2 authors, 2016-06-15

Re: git cherry to find equivalent commit IDs?

From: <hidden>
Date: 2016-06-15 22:47:14

On Thu, Aug 13, 2009 at 2:37 PM, Avery Pennarun[off-list ref] wrote:
On Thu, Aug 13, 2009 at 9:13 PM, [off-list ref] wrote:
quoted
For example, commit 3642151 on branch A was a cherry pick of a commit
460050c on master:

$ git branch -a --contains 3642151
 A

$ git branch -a --contains 460050c
* master

$ git cherry -v master 3642151
- 3642151435ce5737debc1213de46dd556475bfad1 fixed bug

I assume that means an equivalent change to 3642151 is already in
master (which it is, as commit 460050c). But I want to find out the
commit ID on master that's equivalent to 3642151 (i.e. something that
tells me it's 460050c).
git show 3642151 | git patch-id

You should get a line with two hashes; the first is the patchid (call
it PATCHID_FROM_ABOVE)

git log -p | git patch-id | grep PATCHID_FROM_ABOVE

This should give you a list of all commits that correspond to that patchid.
That worked perfectly. Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help