From 77343fd6684e60ac4c181021c6f18d3a0925036f Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 14 Sep 2017 09:48:35 +0200 Subject: util/scripts/cross-repo-cherrypick: improve cros-side rewrite Sometimes the BUG/BRANCH/TEST metadata isn't separated by a newline from the later git/gerrit metadata, which messes up further processing. Add that newline to minimize the amount of human intervention required. Change-Id: I37171bf6764b64e0ab0e81297a03f4d8b7744256 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/21534 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- util/scripts/cross-repo-cherrypick | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'util/scripts/cross-repo-cherrypick') diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick index 0f2acf8eae..38d4f46fe7 100755 --- a/util/scripts/cross-repo-cherrypick +++ b/util/scripts/cross-repo-cherrypick @@ -65,6 +65,12 @@ GUID="$(git config user.name) <$(git config user.email)>" '"${SPLICE_CMD}"' } end=1 + }; /^(BUG|BRANCH|TEST|CQ-DEPEND)=/ { + if (end==0) { + print "Original-Commit-Id: '"${CID}"'\nSigned-off-by: '"${GUID}"'"; + print ""; + } + end=1 }; { if (end==0) print "Original-" $0; -- cgit v1.2.3