diff options
| author | Patrick Georgi <patrick@coreboot.org> | 2022-01-10 22:41:03 +0100 |
|---|---|---|
| committer | Patrick Georgi <patrick@coreboot.org> | 2022-06-03 18:44:51 +0000 |
| commit | 73107890857984a830811ef9231fc4518c478388 (patch) | |
| tree | 6bcbd453a0735220bdd8304654df40fede8f19c8 /util | |
| parent | 0effeb576e4706aec223d18a3aa4b60657637fc9 (diff) | |
util/scripts/cross-repo-cherrypick: Modify output format
As far as I know the Chromium OS team is the only user of this script,
so align its output with that of other tools used there:
- Replace "Original-Commit-Id" with "GitOrigin-RevId"
- Reuse Change-Id instead of moving it to the Original- prefix, which
leads to the creation of a new Change ID.
Change-Id: I8c39c512901c83a64f00aa48a539e6621f827242
Signed-off-by: Patrick Georgi <patrick@coreboot.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60979
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/scripts/cross-repo-cherrypick | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick index c640e33f65..7442b9ba15 100755 --- a/util/scripts/cross-repo-cherrypick +++ b/util/scripts/cross-repo-cherrypick @@ -50,19 +50,22 @@ GUID="$(git config user.name) <$(git config user.email)>" (printf "${MESSAGE_PREFIX}"; commit_message) | tac | awk '/^$/ { if (end==0) { - print "Original-Commit-Id: '"${CID}"'\nSigned-off-by: '"${GUID}"'"; + print "GitOrigin-RevId: '"${CID}"'\nSigned-off-by: '"${GUID}"'"; '"${SPLICE_CMD}"' } end=1 }; /^(BUG|BRANCH|TEST)=/ { if (end==0) { - print "Original-Commit-Id: '"${CID}"'\nSigned-off-by: '"${GUID}"'"; + print "GitOrigin-RevId: '"${CID}"'\nSigned-off-by: '"${GUID}"'"; print ""; } end=1 }; /^Cq-Depend:/ { print $0; next + }; /^Change-Id:/ { + print $0; + next }; { if (end==0) print "Original-" $0; |