cross-repo-cherrypick and re-writing Signed-off-by's
Hi fellow coreboot developers, it was pointed out to me that I didn't do exactly what Chromium developers are used to (i.e. what util/scripts/cross-repo-cherrypick does) when picking patches to flashrom-stable. The major difference is that I didn't prepend Signed-off-by tags with an `Original-`. My reasoning was that it applies to the work in a patch and not the exact commit. We also don't change these tags when clicking Submit in Gerrit which also triggers a cherry- pick. Prepending the `Original-` to all the tags that are automatically added by Gerrit makes perfect sense to me, OTOH. So here's the question: Is there a particular reason that `cross-repo-cherrypick` prepends the Signed-off-by or is that just done because it treats all tags the same? Cheers, Nico
Hey Nico, I believe that the cross-repo-cherrypick script was written more to help with cherry-picking into a downstream repository where the patch may need to be signed off by the owners of that repository. Since both branches are actually in the same repo here, I don't think any change is needed, or actually even desired. My opinion is that if we cherry-pick between branches at coreboot.org and update those tags, what happens when it finally does get cherry-picked to a downstream repo? Original-Original-Signed-off-by? I may be missing something though. I often am. :) Martin On Fri, Jan 13, 2023 at 5:40 PM Nico Huber <nico.h@gmx.de> wrote:
Hi fellow coreboot developers,
it was pointed out to me that I didn't do exactly what Chromium developers are used to (i.e. what util/scripts/cross-repo-cherrypick does) when picking patches to flashrom-stable.
The major difference is that I didn't prepend Signed-off-by tags with an `Original-`. My reasoning was that it applies to the work in a patch and not the exact commit. We also don't change these tags when clicking Submit in Gerrit which also triggers a cherry- pick.
Prepending the `Original-` to all the tags that are automatically added by Gerrit makes perfect sense to me, OTOH. So here's the question: Is there a particular reason that `cross-repo-cherrypick` prepends the Signed-off-by or is that just done because it treats all tags the same?
Cheers, Nico _______________________________________________ coreboot mailing list -- coreboot@coreboot.org To unsubscribe send an email to coreboot-leave@coreboot.org
Hi Martin, thanks for your reply. On 15.01.23 00:36, coreboot org wrote:
Since both branches are actually in the same repo here, I don't think any change is needed, or actually even desired. My opinion is that if we cherry-pick between branches at coreboot.org and update those tags, what happens when it finally does get cherry-picked to a downstream repo? Original-Original-Signed-off-by?
To be fully accurate, it's not the same repo. However, everything is on the same Gerrit instance on coreboot.org. I guess that makes no difference, it's all public and we share the same DCO. Nico
participants (2)
-
coreboot org -
Nico Huber