summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xutil/scripts/cross-repo-cherrypick5
1 files changed, 4 insertions, 1 deletions
diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick
index 3fbc46faed..35e4b33502 100755
--- a/util/scripts/cross-repo-cherrypick
+++ b/util/scripts/cross-repo-cherrypick
@@ -54,12 +54,15 @@ GUID="$(git config user.name) <$(git config user.email)>"
'"${SPLICE_CMD}"'
}
end=1
- }; /^(BUG|BRANCH|TEST|CQ-DEPEND)=/ {
+ }; /^(BUG|BRANCH|TEST)=/ {
if (end==0) {
print "Original-Commit-Id: '"${CID}"'\nSigned-off-by: '"${GUID}"'";
print "";
}
end=1
+ }; /^Cq-Depend:/ {
+ print $0;
+ next
}; {
if (end==0)
print "Original-" $0;