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>
This commit is contained in:
Patrick Georgi 2017-09-14 09:48:35 +02:00
parent c661c8eab1
commit 77343fd668
1 changed files with 6 additions and 0 deletions

View File

@ -65,6 +65,12 @@ GUID="$(git config user.name) <$(git config user.email)>"
'"${SPLICE_CMD}"' '"${SPLICE_CMD}"'
} }
end=1 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) if (end==0)
print "Original-" $0; print "Original-" $0;