diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-07-20 19:28:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-20 19:28:58 +0200 |
| commit | 60f38916da3bc7d20004b14cd1c1dcc1d47744d8 (patch) | |
| tree | f30edb333667e7b30780fc903928bc7f95a5f176 /src/ci | |
| parent | ea9b1afc883557a350efda808eb43b8a0aa9afdd (diff) | |
| parent | 572ba97f10e970c5cd0ccfc2f0cd52002c799ee4 (diff) | |
| download | rust-60f38916da3bc7d20004b14cd1c1dcc1d47744d8.tar.gz rust-60f38916da3bc7d20004b14cd1c1dcc1d47744d8.zip | |
Rollup merge of #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 #99967.
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh index 869f75e923d..c8201d9bcfd 100755 --- 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 |