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

[rsundahl]

Summary

Git wants an email address these days. (Also a nit typo.)

[thetruestblue]

This is fine... feels a little off.
Is there a script to run the docker container? Couldn't we bring it in there or when we build it?

I don't know use case for docker here. Just for tests? Or are we actually using these scripts for a dev environment we might push? Because in that case this feels wrong.

[rsundahl]

In D146728#4218437, @thetruestblue wrote:

This is fine... feels a little off.
Is there a script to run the docker container? Couldn't we bring it in there or when we build it?

I don't know use case for docker here. Just for tests? Or are we actually using these scripts for a dev environment we might push? Because in that case this feels wrong.

No, it's just a new requirement that doesn't matter when it's being anonymously built in Docker. (This is only a utility function for those interested in Docker builds.)

[XiaodongLoong]

Why we need a dummy address? Did you met any issues?

[thetruestblue]

Can you just do

git cherry-pick -n

aka no commit? shouldn't require an email?

[XiaodongLoong]

In D146728#4235613, @thetruestblue wrote:

Can you just do

git cherry-pick -n

aka no commit? shouldn't require an email?

I don't need an email address.

$ git cherry-pick -n 6c6a905363debe5fc07f44e97d0f9c9308f7db64    // no email settings, no errors
$ git --version
git version 2.20.1

Maybe, this issue is from a certain git version.

[rsundahl]

In D146728#4235579, @XiaodongLoong wrote:

Why we need a dummy address? Did you met any issues?

Yes. The cherry pick failed because git wanted an email address for the commit. Since the commit is an anonymous commit in a container, I chose to provide an anonymous email address.

In D146728#4235613, @thetruestblue wrote:

Can you just do

git cherry-pick -n

aka no commit? shouldn't require an email?

It's true that adding -n will avoid the commit, but doing so would be a functional change (leaving uncommitted changes in the working directory). This might not matter but it's more appropriate to anonymize the email address (since it's an owner-less docker image) and keeping the functionality as it is.

llvm/utils/docker/build_docker_image.sh

-d|--docker-repository)
       DOCKER_REPOSITORY="$1"
       shift
       ;;
     -t|--docker-tag)
       shift
       DOCKER_TAG="$1"
       shift
       ;;
-    -r|--revision|-c|-cherrypick|-b|--branch)
+    -r|--revision|-c|--cherrypick|-b|--branch)
       CHECKOUT_ARGS="$CHECKOUT_ARGS $1 $2"
       shift 2
       ;;
     -i|--install-target)
       SEEN_INSTALL_TARGET=1
       BUILDSCRIPT_ARGS="$BUILDSCRIPT_ARGS $1 $2"
       shift 2
       ;;

llvm/utils/docker/scripts/checkout.sh

function apply_cherrypicks() {
   local CHECKOUT_DIR="$1"
 
   [ "$CHERRYPICKS" == "" ] || echo "Applying cherrypicks"
   pushd "$CHECKOUT_DIR"
 
   # 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="[e-mail]" git cherry-pick $CHERRY_REV
   done
 
   popd
 }
 
 CLANG_BUILD_DIR=/tmp/clang-build
 
 # Get the sources from git.