diff options
author | Victor Hsieh <victorhsieh@google.com> | 2023-04-10 18:12:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-10 18:12:55 +0000 |
commit | 130b3b94864ed367261111bef8f5d05b18cd81ce (patch) | |
tree | 17e5e26de0f068bbaca85f4c799bd8a32450a8bc | |
parent | 22a3d2bdfdd899c0d07fe104f516f1460010404e (diff) | |
parent | 3b8b7debd28ef95e476a0786b114649428ff677c (diff) | |
download | minijail-130b3b94864ed367261111bef8f5d05b18cd81ce.tar.gz |
PREUPLOAD hook to nudge sending code review to upstream am: 852af6ac35 am: df9c5bdcf8 am: a4c700d1ba am: 3b8b7debd2
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2528601
Change-Id: I182341d1f047148d1c2a646a627595d5d3ec427f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | PREUPLOAD.cfg | 3 | ||||
-rwxr-xr-x | tools/repo_upload_warning | 21 |
2 files changed, 24 insertions, 0 deletions
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index 254a062..c7d9e54 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg @@ -3,3 +3,6 @@ clang_format = true [Builtin Hooks Options] clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c + +[Hook Scripts] +repo_upload_warning = ./tools/repo_upload_warning ${PREUPLOAD_COMMIT} diff --git a/tools/repo_upload_warning b/tools/repo_upload_warning new file mode 100755 index 0000000..3333eba --- /dev/null +++ b/tools/repo_upload_warning @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +if git log -n 1 --format='%B' $1 | grep -q -E "^Ignore-Upstream-First: .+" ; then + # Change is explicitly marked as ok to skip upstream + exit 0 +elif git log -n 1 --format='%s' $1 | grep -q -E "^(UPSTREAM|Upstream): .+" ; then + # Change is explicitly marked as coming from the upstream + exit 0 +fi + +echo "WARNING: Here is not the upstream." +echo "" +echo "Do not submit changes to this repository directly. Please submit changes to upstream" +echo "from https://chromium-review.googlesource.com/q/project:chromiumos/platform/minijail" +echo "" +echo "If the change is from the upstream, please prepend \"UPSTREAM: \" to the subject." +echo "" +echo "If indeed necessary, please add \"Ignore-Upstream-First: <reason>\" to commit message" +echo "to bypass." + +exit 1 |