Skip to content

Commit

Permalink
Rollup merge of rust-lang#127839 - ehuss:safe-directory-docker, r=Mar…
Browse files Browse the repository at this point in the history
…k-Simulacrum

Fix git safe-directory path for docker images

This fixes the path for configuring the git safe.directory setting inside docker images. AFAIK, `~/gitconfig` without a dot is not something that git uses ([ref](https://git-scm.com/docs/git-config)). This was needed in my environment to avoid the ` fatal: detected dubious ownership in repository at '/checkout'` error. For context, this was added in rust-lang#99967.
  • Loading branch information
matthiaskrgr authored Jul 20, 2024
2 parents ea9b1af + 572ba97 commit 60f3891
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if [ "$NO_CHANGE_USER" = "" ]; then
# already be running with the right user.
#
# For NO_CHANGE_USER done in the small number of Dockerfiles affected.
echo -e '[safe]\n\tdirectory = *' > /home/user/gitconfig
echo -e '[safe]\n\tdirectory = *' > /home/user/.gitconfig

exec su --preserve-environment -c "env PATH=$PATH \"$0\"" user
fi
Expand Down

0 comments on commit 60f3891

Please sign in to comment.