Skip to content

Commit bd95f47

Browse files
authored
Unrolled build for rust-lang#127839
Rollup merge of rust-lang#127839 - ehuss:safe-directory-docker, r=Mark-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.
2 parents c1a631d + 572ba97 commit bd95f47

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if [ "$NO_CHANGE_USER" = "" ]; then
1919
# already be running with the right user.
2020
#
2121
# For NO_CHANGE_USER done in the small number of Dockerfiles affected.
22-
echo -e '[safe]\n\tdirectory = *' > /home/user/gitconfig
22+
echo -e '[safe]\n\tdirectory = *' > /home/user/.gitconfig
2323

2424
exec su --preserve-environment -c "env PATH=$PATH \"$0\"" user
2525
fi

0 commit comments

Comments
 (0)