Ignore git config errors that may occur in enter_chroot.

enter_chroot.sh

 #!/bin/bash
 
 # Copyright (c) 2011 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
 
 # --- BEGIN COMMON.SH BOILERPLATE ---
 # Load common CrOS utilities.  Inside the chroot this file is installed in
@@ skipping 26 matching lines @@
   "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."
 DEFINE_boolean verbose $FLAGS_FALSE "Print out actions taken"
 
 # More useful help
 FLAGS_HELP="USAGE: $0 [flags] [VAR=value] [-- command [arg1] [arg2] ...]
 
@@ skipping 296 matching lines @@
 CHROOT_PASSTHRU="${CHROOT_PASSTHRU} \
 CHROMEOS_RELEASE_APPID=${CHROMEOS_RELEASE_APPID:-"{DEV-BUILD}"}"
 
 if [ -d "$HOME/.subversion" ]; then
   TARGET="/home/${USER}/.subversion"
   mkdir -p "${FLAGS_chroot}${TARGET}"
   ensure_mounted "${HOME}/.subversion" "--bind" "${TARGET}"
 fi
 
 # Configure committer username and email in chroot .gitconfig
-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
+git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all \
+  user.name "$(cd /tmp; git var GIT_COMMITTER_IDENT | sed -e 's/ *<.*//')" ||
+    true
+git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all \
+  user.email "$(cd /tmp; git var GIT_COMMITTER_IDENT | \
+    sed -e 's/.*<\([^>]*\)>.*/\1/')" ||
+      true
 
 # 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