From ca3313dade7e34034ed5d5fb0267191266377067 Mon Sep 17 00:00:00 2001 From: Roy Sundahl Date: Thu, 23 Mar 2023 08:49:43 -0700 Subject: [PATCH] [utils] Give git a dummy email address when cherry picking. Git wants an email address these days. (Also a nit typo.) Reviewed By: XiaodongLoong Differential Revision: https://reviews.llvm.org/D146728 --- llvm/utils/docker/build_docker_image.sh | 2 +- llvm/utils/docker/scripts/checkout.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/utils/docker/build_docker_image.sh b/llvm/utils/docker/build_docker_image.sh index 2dfea91..f2d4393 100755 --- a/llvm/utils/docker/build_docker_image.sh +++ b/llvm/utils/docker/build_docker_image.sh @@ -96,7 +96,7 @@ while [[ $# -gt 0 ]]; do DOCKER_TAG="$1" shift ;; - -r|--revision|-c|-cherrypick|-b|--branch) + -r|--revision|-c|--cherrypick|-b|--branch) CHECKOUT_ARGS="$CHECKOUT_ARGS $1 $2" shift 2 ;; diff --git a/llvm/utils/docker/scripts/checkout.sh b/llvm/utils/docker/scripts/checkout.sh index c34cae8..8fe7c61 100755 --- a/llvm/utils/docker/scripts/checkout.sh +++ b/llvm/utils/docker/scripts/checkout.sh @@ -83,7 +83,7 @@ function apply_cherrypicks() { # This function is always called on a sorted list of cherrypicks. for CHERRY_REV in $CHERRYPICKS; do echo "Cherry-picking $CHERRY_REV into $CHECKOUT_DIR" - git cherry-pick $CHERRY_REV + EMAIL="someone@somewhere.net" git cherry-pick $CHERRY_REV done popd -- 2.7.4