diff --git a/sdk_lib/enter_chroot.sh b/sdk_lib/enter_chroot.sh
index 9796402..77254af 100755
--- a/sdk_lib/enter_chroot.sh
+++ b/sdk_lib/enter_chroot.sh
@@ -272,6 +272,12 @@
   fi
 }
 
+git_config() {
+  USER="${SUDO_USER:-${USER}}" \
+  HOME="${SUDO_HOME:-${HOME}}" \
+  git config "$@"
+}
+
 setup_git() {
   # Copy .gitconfig into chroot so repo and git can be used from inside.
   # This is required for repo to work since it validates the email address.
@@ -294,7 +300,8 @@
 
   # Copy the gitcookies file, updating the user's gitconfig to point to it.
   local gitcookies
-  gitcookies="$(git config -f "${chroot_gitconfig}" --get http.cookiefile)"
+  gitcookies="$(git_config --type path -f "${chroot_gitconfig}" \
+                  --get http.cookiefile)"
   if [[ $? -ne 0 ]]; then
     # Try the default location anyway.
     gitcookies="${SUDO_HOME}/.gitcookies"
@@ -378,7 +385,7 @@
     setup_mount "${FLAGS_trunk}" "--rbind" "${CHROOT_TRUNK_DIR}"
 
     debug "Setting up referenced repositories if required."
-    REFERENCE_DIR=$(git config --file  \
+    REFERENCE_DIR=$(git_config --file  \
       "${FLAGS_trunk}/.repo/manifests.git/config" \
       repo.reference)
     if [ -n "${REFERENCE_DIR}" ]; then