diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2017-09-14 09:48:35 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2017-09-15 20:57:57 +0000 |
| commit | 77343fd6684e60ac4c181021c6f18d3a0925036f (patch) | |
| tree | ac4d62cb8b7644f6eb3b125124820f56aec87934 | |
| parent | c661c8eab1dab5b19d0528e264d5205641035d61 (diff) | |
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 <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/21534
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
| -rwxr-xr-x | util/scripts/cross-repo-cherrypick | 6 |
1 files changed, 6 insertions, 0 deletions
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; |