diff options
| author | Gaëtan Gilbert | 2020-10-23 13:05:59 +0200 |
|---|---|---|
| committer | Gaëtan Gilbert | 2020-10-23 13:05:59 +0200 |
| commit | 7a8e49ad1693e0928925448b1e4adb39df467ffd (patch) | |
| tree | 664866574a3d94f230355391da5ea7065b000e1e /dev/ci | |
| parent | 16180bf8a37f65acd7d15c5bac634984c813259e (diff) | |
Fix overlay merge command
Git wants an identity and none is setup on the CI.
Diffstat (limited to 'dev/ci')
| -rw-r--r-- | dev/ci/ci-common.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dev/ci/ci-common.sh b/dev/ci/ci-common.sh index d6f68fb0e9..b85261d7fc 100644 --- a/dev/ci/ci-common.sh +++ b/dev/ci/ci-common.sh @@ -93,7 +93,8 @@ git_download() git checkout "$ref" git log -n 1 if [[ $ov_url ]]; then - git -c pull.rebase=false pull --no-ff "$ov_url" "$ov_ref" + git -c pull.rebase=false -c user.email=nobody@example.invalid -c user.name=Nobody \ + pull --no-ff "$ov_url" "$ov_ref" git log -n 1 HEAD^2 git log -n 1 fi |