Rollup merge of rust-lang#127839 - ehuss:safe-directory-docker, r=Mark-Simulacrum

compiler-errors · web-flow · commit 9275b57a8afd · 2024-07-20T19:47:33.000-04:00
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.
diff --git a/src/ci/run.sh b/src/ci/run.sh
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ if [ "$NO_CHANGE_USER" = "" ]; then`
`19`	`19`	`# already be running with the right user.`
`20`	`20`	`#`
`21`	`21`	`# 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`
`23`	`23`
`24`	`24`	`exec su --preserve-environment -c "env PATH=$PATH \"$0\"" user`
`25`	`25`	`fi`