Perl / perl5

🐪 The Perl programming language
https://dev.perl.org/perl5/
Other
1.95k stars 554 forks source link

Fix incorrect commit number for GH 21566 #22620

Closed jkeenan closed 4 weeks ago

jkeenan commented 4 weeks ago

I am trying to review the commits proposed for maintenance release perl-5.38.3. My approach has been to checkout v5.38.2, save it as a local branch, then go through the list of proposed commits found in the votes-5.38.xml in the maint-votes branch, attempting to cherry-pick each commit in turn. I skip over any commit that doesn't cherry-pick cleanly. If a commit does not cherry-pick cleanly, I abort the cherry-pick.

While reviewing these commits, I got up to this entry:

<commit votes="steveh" id="023785124745f932ac9f71762ff0fd93f3536201" issue="21564" pull="21566" desc="don't clear IOK on @{&quot;_&lt;$file&quot;} entries when a dbstate is freed"/>

But when I attempted to cherry-pick it, I got this response:

$ git clean -dfxq; git cherry-pick -x 023785124745f932ac9f71762ff0fd93f3536201
fatal: bad object 023785124745f932ac9f71762ff0fd93f3536201

I examined GH #21566. I believe that the commit that actually merged this p.r. was e4afee5bc9d5b14a4d9a02eff8c153831edd0547. Hence, this p.r.