[llvm] ca3313d - [utils] Give git a dummy email address when cherry picking.

[Roy Sundahl via llvm-commits]

Author: Roy Sundahl
Date: 2023-03-31T08:52:33-07:00
New Revision: ca3313dade7e34034ed5d5fb0267191266377067

URL: https://github.com/llvm/llvm-project/commit/ca3313dade7e34034ed5d5fb0267191266377067
DIFF: https://github.com/llvm/llvm-project/commit/ca3313dade7e34034ed5d5fb0267191266377067.diff

LOG: [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

Added: 
    

Modified: 
    llvm/utils/docker/build_docker_image.sh
    llvm/utils/docker/scripts/checkout.sh

Removed: 
    


################################################################################
diff  --git a/llvm/utils/docker/build_docker_image.sh b/llvm/utils/docker/build_docker_image.sh
index 2dfea91719223..f2d43934f4cca 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 c34cae84fde2e..8fe7c6141d86b 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 at somewhere.net" git cherry-pick $CHERRY_REV
   done
 
   popd