blob: 21f2fb1d4085490be0887e87d4918a45f837c24a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
#!/usr/bin/env sh
# cross-repo-cherrypick - rebase helper script
#
# SPDX-License-Identifier: GPL-2.0-only
# Adapt to your remote branch:
BRANCH="origin/main"
# When pulling in patches from another tree from a gerrit repository,
# do the following at the end of a larger cherry-pick series:
# git remote add ...
# git checkout -b upstreaming
# git cherry-pick ...
# git rebase -i --exec util/scripts/cross-repo-cherrypick master
# Alternatively, you can run util/scripts/cross-repo-cherrypick after every
# individual cherry-pick.
# use $0 --cros to add a stub BUG/BRANCH/TEST block
commit_message() {
git log -n 1 | grep "^ " | cut -c5-
}
ORIGIN_HOST=$( commit_message |grep "^Reviewed-on: " |head -1 |cut -d/ -f3 )
case "${ORIGIN_HOST}" in
review.coreboot.org)
BRANCH="origin/main"
MESSAGE_PREFIX="UPSTREAM: "
;;
chromium-review.googlesource.com)
BRANCH="cros/main"
MESSAGE_PREFIX=""
;;
esac
# lines must be backwards due to tac(1)
SPLICE_CMD=""
if test "$1" = "--cros"; then
if test -z "$(commit_message | grep -E '^(BUG|TEST)=')"; then
SPLICE_CMD='print "\nTEST=none\nBRANCH=none\nBUG=none\n"'
fi
fi
CHID=$( commit_message | grep -i "^Change-Id: I" )
CID=$( git log -n1 --grep "^$CHID$" --pretty=%H $BRANCH )
GUID="$(git config user.name) <$(git config user.email)>"
# TBD: Don't add Original- to empty lines, and possibly make script more
# solid for commits with an unexpected order of meta data lines.
(printf "${MESSAGE_PREFIX}"; commit_message) | tac | awk '/^$/ {
if (end==0) {
print "GitOrigin-RevId: '"${CID}"'\nSigned-off-by: '"${GUID}"'";
'"${SPLICE_CMD}"'
}
end=1
}; /^(BUG|BRANCH|TEST)=/ {
if (end==0) {
print "GitOrigin-RevId: '"${CID}"'\nSigned-off-by: '"${GUID}"'";
print "";
}
end=1
}; /^Cq-Depend:/ {
print $0;
next
}; /^Change-Id:/ {
print $0;
next
}; {
if (end==0)
print "Original-" $0;
else
print $0;
}' | tac | git commit --amend -F -
|
