Make git config optional to allow multiple calls to enter_chroot at the same time.

enter_chroot.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to enter the chroot environment
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
 . "$(dirname "$0")/common.sh"
 
 # Script must be run outside the chroot and as a regular user.
 assert_outside_chroot
 assert_not_root_user
 
 # Define command line flags
 # See http://code.google.com/p/shflags/wiki/Documentation10x
 DEFINE_string chroot "$DEFAULT_CHROOT_DIR" \
   "The destination dir for the chroot environment." "d"
 DEFINE_string trunk "$GCLIENT_ROOT" \
   "The source trunk to bind mount within the chroot." "s"
 DEFINE_string build_number "" \
   "The build-bot build number (when called by buildbot only)." "b"
 DEFINE_string chrome_root "" \
   "The root of your chrome browser source. Should contain a 'src' subdir."
 DEFINE_string chrome_root_mount "/home/$USER/chrome_root" \
   "The mount point of the chrome broswer source in the chroot."
 
+DEFINE_boolean git_config $FLAGS_TRUE \
+  "Config git to work with your user/pass in the chroot."
 DEFINE_boolean official_build $FLAGS_FALSE \
   "Set CHROMEOS_OFFICIAL=1 for release builds."
 DEFINE_boolean mount $FLAGS_FALSE "Only set up mounts."
 DEFINE_boolean unmount $FLAGS_FALSE "Only tear down mounts."
 DEFINE_boolean ssh_agent $FLAGS_TRUE "Import ssh agent."
 
 # More useful help
 FLAGS_HELP="USAGE: $0 [flags] [VAR=value] [-- command [arg1] [arg2] ...]
 
 One or more VAR=value pairs can be specified to export variables into
@@ skipping 279 matching lines @@
   info "mounting ~/.subversion into chroot"
   MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}/home/${USER}/.subversion")"
   if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]; then
     mkdir -p "$MOUNTED_PATH"
     sudo mount --bind "$HOME/.subversion" "$MOUNTED_PATH" || \
       die "Could not mount $MOUNTED_PATH"
   fi
 fi
 
 # Configure committer username and email in chroot .gitconfig
-git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all user.name \
-  "$(cd /tmp; git var GIT_COMMITTER_IDENT | sed -e 's/ *<.*//')"
-git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all user.email \
-  "$(cd /tmp; git var GIT_COMMITTER_IDENT | sed -e 's/.*<\([^>]*\)>.*/\1/')"
+if [ $FLAGS_git_config -eq $FLAGS_TRUE ]; then
+  git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all \
+    user.name "$(cd /tmp; git var GIT_COMMITTER_IDENT | sed -e 's/ *<.*//')"
+  git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all \
+    user.email "$(cd /tmp; git var GIT_COMMITTER_IDENT | \
+      sed -e 's/.*<\([^>]*\)>.*/\1/')"
+fi
 
 # Run command or interactive shell.  Also include the non-chrooted path to
 # the source trunk for scripts that may need to print it (e.g.
 # build_image.sh).
 sudo -- chroot "$FLAGS_chroot" sudo -i -u $USER $CHROOT_PASSTHRU \
   EXTERNAL_TRUNK_PATH="${FLAGS_trunk}" LANG=C SSH_AGENT_PID="${SSH_AGENT_PID}" \
   SSH_AUTH_SOCK="${SSH_AUTH_SOCK}" "$@"
 
 # Remove trap and explicitly unmount
 trap - EXIT
 teardown_env