I have been trying to use
git log --no-merges --cherry-pick --right-only master...my-branch
git show 16cbd0e47406a4f7acbd6dc13f02d74d0b6a7621 >patcha
git show c53c7c32dcd84bfa7096a50b27738458e84536d5 >patchb
diff patcha patchb
< commit 16cbd0e47406a4f7acbd6dc13f02d74d0b6a7621
> commit c53c7c32dcd84bfa7096a50b27738458e84536d5
git show c53c7c32dcd84bfa7096a50b27738458e84536d5 | git patch-id
git show 16cbd0e47406a4f7acbd6dc13f02d74d0b6a7621 | git patch-id
git log --cherry-pick
Have you merged master into your branch since doing the cherry picks?
--cherry-pick works first by matching the commit id, and then if that fails, looking for the patch id. If you've merged master into your branch, then you'll now have the actual commit on your branch and the cherry-picked version. So it'll find the commit id, and then proceed to report the cherry-picked version.
I've often wondered if git should always check both, but that's probably a considerable performance hit.