[coreboot-gerrit] Change in coreboot[master]: util/scripts/cross-repo-cherrypick: improve cros-side rewrite

[Patrick Georgi (Code Review)]

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/21534

Change subject: util/scripts/cross-repo-cherrypick: improve cros-side rewrite
......................................................................

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 
---
M util/scripts/cross-repo-cherrypick
1 file changed, 6 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/21534/1

diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick
index 0f2acf8..38d4f46 100755
--- a/util/scripts/cross-repo-cherrypick
+++ b/util/scripts/cross-repo-cherrypick
@@ -65,6 +65,12 @@
    		'"${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;