On 7 January 2015 at 23:18, Tony Cook <[email protected]> wrote: > In perl.git, the branch maint-5.20 has been updated > > <http://perl5.git.perl.org/perl.git/commitdiff/26dc6d091d4df225b3dab6efcf9a74763189622e?hp=e98884d13a56f7b35d6a79a1d442dcdf0439e23b> > > - Log ----------------------------------------------------------------- > commit 26dc6d091d4df225b3dab6efcf9a74763189622e > Author: Yves Orton <[email protected]> > Date: Sun Sep 14 18:55:12 2014 +0200 > > add test for rt122747 > ----------------------------------------------------------------------- >
Thanks for your work cherry-picking some commits into maint-5.20, but I'm puzzled why the familiar "(cherry picked from commit X)" footnote isn't present in your commits. I also notice that the commit cherry-picked above (namely, 409c6472cedc6771a158a61dbbf8154d0246dc5b) doesn't show up as having been cherry-picked if you run "git cherry -v origin/maint-5.20" (it shows up with a "-" rather than a "+", indicating that it hasn't been cherry-picked). I'm not sure if that command only shows up commits that were cherry-picked "cleanly", i.e. not requiring any conflict resolution, but it doesn't look like 409c6472cedc6771a158a61dbbf8154d0246dc5b at least would have caused conflicts anyway. In any case, I generally leave the "(cherry picked from commit X)" footnote in the commit message (even if I've had to resolve conflicts) because the commit id X shows up as a link in both perl5.git.perl.org's web interface and in gitk, which I find helpful in tracing the origins of commits on maint.
